From 9fd556ca3ab1cef8b6489739704c4b1ff874345d Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 4 Feb 2020 20:16:05 +1100 Subject: [PATCH] Remove Crashlytics --- Podfile | 3 --- Signal.xcodeproj/project.pbxproj | 34 ------------------------------ Signal/GoogleService-Info.plist | 36 -------------------------------- Signal/Signal-Info.plist | 4 ++-- Signal/src/AppDelegate.m | 6 ------ 5 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 Signal/GoogleService-Info.plist diff --git a/Podfile b/Podfile index 54d7be762..68f553d50 100644 --- a/Podfile +++ b/Podfile @@ -73,9 +73,6 @@ target 'Signal' do pod 'GCDWebServer', '~> 3.0', :inhibit_warnings => true pod 'FeedKit', '~> 8.1', :inhibit_warnings => true pod 'CryptoSwift', '~> 1.0', :inhibit_warnings => true - pod 'FirebaseCore', '~> 6.0', :inhibit_warnings => true - pod 'Fabric', '~> 1.10', :inhibit_warnings => true - pod 'Crashlytics', '~> 3.13', :inhibit_warnings => true pod 'NVActivityIndicatorView', '~> 4.7', :inhibit_warnings => true target 'SignalTests' do diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 9bafeeab2..77980091e 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -591,9 +591,6 @@ B886B4A72398B23E00211ABE /* QRCodeVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B886B4A62398B23E00211ABE /* QRCodeVC.swift */; }; B886B4A92398BA1500211ABE /* QRCode.swift in Sources */ = {isa = PBXBuildFile; fileRef = B886B4A82398BA1500211ABE /* QRCode.swift */; }; B88847BC23E10BC6009836D2 /* GroupMembersVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B88847BB23E10BC6009836D2 /* GroupMembersVC.swift */; }; - B891105C2320872800F15FCC /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B891105B2320872800F15FCC /* GoogleService-Info.plist */; }; - B891105E2320872800F15FCC /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B891105B2320872800F15FCC /* GoogleService-Info.plist */; }; - B891105F2320872800F15FCC /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B891105B2320872800F15FCC /* GoogleService-Info.plist */; }; B893063F2383961A005EAA8E /* ScanQRCodeWrapperVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B893063E2383961A005EAA8E /* ScanQRCodeWrapperVC.swift */; }; B894D0712339D6F300B4D94D /* DeviceLinkingModalDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B894D0702339D6F300B4D94D /* DeviceLinkingModalDelegate.swift */; }; B894D0752339EDCF00B4D94D /* NukeDataModal.swift in Sources */ = {isa = PBXBuildFile; fileRef = B894D0742339EDCF00B4D94D /* NukeDataModal.swift */; }; @@ -617,9 +614,6 @@ B90418E6183E9DD40038554A /* DateUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = B90418E5183E9DD40038554A /* DateUtil.m */; }; B9EB5ABD1884C002007CBB57 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B9EB5ABC1884C002007CBB57 /* MessageUI.framework */; }; BFF3FB9730634F37D25903F4 /* Pods_Signal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D17BB5C25D615AB49813100C /* Pods_Signal.framework */; }; - C32B08E82322170B007FD6E5 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C32B08E72322170B007FD6E5 /* GoogleService-Info.plist */; }; - C32B08E92322170B007FD6E5 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C32B08E72322170B007FD6E5 /* GoogleService-Info.plist */; }; - C32B08EA2322170B007FD6E5 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C32B08E72322170B007FD6E5 /* GoogleService-Info.plist */; }; C34C8F7423A7830B00D82669 /* SpaceMono-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C34C8F7323A7830A00D82669 /* SpaceMono-Bold.ttf */; }; CC875800737563D6891B741D /* Pods_SignalTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 748A5CAEDD7C919FC64C6807 /* Pods_SignalTests.framework */; }; D202868116DBE0E7009068E9 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2AEACDB16C426DA00C364C0 /* CFNetwork.framework */; }; @@ -1463,7 +1457,6 @@ B97940251832BD2400BD66CB /* UIUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIUtil.h; sourceTree = ""; }; B97940261832BD2400BD66CB /* UIUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIUtil.m; sourceTree = ""; }; B9EB5ABC1884C002007CBB57 /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; }; - C32B08E72322170B007FD6E5 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; C34C8F7323A7830A00D82669 /* SpaceMono-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SpaceMono-Bold.ttf"; sourceTree = ""; }; D17BB5C25D615AB49813100C /* Pods_Signal.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Signal.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D2179CFB16BB0B3A0006F3AB /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; }; @@ -2914,7 +2907,6 @@ B66DBF4919D5BBC8006EA940 /* Images.xcassets */, B67EBF5C19194AC60084CCFD /* Settings.bundle */, B657DDC91911A40500F45B0C /* Signal.entitlements */, - C32B08E72322170B007FD6E5 /* GoogleService-Info.plist */, C34C8F7323A7830A00D82669 /* SpaceMono-Bold.ttf */, 34074F54203D0722004596AE /* Sounds */, 76EB03C118170B33006006FC /* src */, @@ -3084,7 +3076,6 @@ 451DE9EE1DC1546A00810E42 /* [Carthage] Copy Frameworks */, 453518771FC635DD00210559 /* Embed App Extensions */, 4535189F1FC63DBF00210559 /* Embed Frameworks */, - B837E0912320894F003534C1 /* Set Up Crashlytics */, ); buildRules = ( ); @@ -3278,13 +3269,11 @@ buildActionMask = 2147483647; files = ( 347850321FD7494A007B8332 /* ElegantIcons.ttf in Resources */, - C32B08E92322170B007FD6E5 /* GoogleService-Info.plist in Resources */, 4535186E1FC635DD00210559 /* MainInterface.storyboard in Resources */, 347850551FD749C0007B8332 /* Localizable.strings in Resources */, 347850331FD7494A007B8332 /* fontawesome-webfont.ttf in Resources */, 3478504C1FD7496D007B8332 /* Images.xcassets in Resources */, 347850311FD7494A007B8332 /* dripicons-v2.ttf in Resources */, - B891105E2320872800F15FCC /* GoogleService-Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3292,8 +3281,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - B891105F2320872800F15FCC /* GoogleService-Info.plist in Resources */, - C32B08EA2322170B007FD6E5 /* GoogleService-Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3330,7 +3317,6 @@ FC5CDF3A1A3393DD00B47253 /* warning_white@2x.png in Resources */, B633C58D1A1D190B0059AC12 /* contact_default_feed.png in Resources */, B10C9B621A7049EC00ECA2BF /* play_icon@2x.png in Resources */, - B891105C2320872800F15FCC /* GoogleService-Info.plist in Resources */, B633C5861A1D190B0059AC12 /* call@2x.png in Resources */, B67EBF5D19194AC60084CCFD /* Settings.bundle in Resources */, B10C9B601A7049EC00ECA2BF /* pause_icon@2x.png in Resources */, @@ -3368,7 +3354,6 @@ 45B74A7D2044AAB600CD42F8 /* popcorn-quiet.aifc in Resources */, 45B74A822044AAB600CD42F8 /* pulse.aifc in Resources */, 34B6A90B218BA1D1007C4606 /* typing-animation.gif in Resources */, - C32B08E82322170B007FD6E5 /* GoogleService-Info.plist in Resources */, 45B74A802044AAB600CD42F8 /* pulse-quiet.aifc in Resources */, 45B74A8B2044AAB600CD42F8 /* synth.aifc in Resources */, 45B74A752044AAB600CD42F8 /* synth-quiet.aifc in Resources */, @@ -3632,25 +3617,6 @@ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SignalTests/Pods-SignalTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - B837E0912320894F003534C1 /* Set Up Crashlytics */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "$(SRCROOT)/$(BUILT_PRODUCTS_DIR)/$(INFOPLIST_PATH)", - ); - name = "Set Up Crashlytics"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Fabric/run\"\n"; - }; F4C416F20E3CB0B25DC10C56 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/Signal/GoogleService-Info.plist b/Signal/GoogleService-Info.plist deleted file mode 100644 index 0fc2b6631..000000000 --- a/Signal/GoogleService-Info.plist +++ /dev/null @@ -1,36 +0,0 @@ - - - - - CLIENT_ID - 43512467490-f04dj1ssk2medqq3t33odidvmi9bi9ob.apps.googleusercontent.com - REVERSED_CLIENT_ID - com.googleusercontent.apps.43512467490-f04dj1ssk2medqq3t33odidvmi9bi9ob - API_KEY - AIzaSyDgnrhH4AtRrZXuRIeVMLAs7UhqGTTsVdQ - GCM_SENDER_ID - 43512467490 - PLIST_VERSION - 1 - BUNDLE_ID - com.loki-project.loki-messenger - PROJECT_ID - loki-5a81e - STORAGE_BUCKET - loki-5a81e.appspot.com - IS_ADS_ENABLED - - IS_ANALYTICS_ENABLED - - IS_APPINVITE_ENABLED - - IS_GCM_ENABLED - - IS_SIGNIN_ENABLED - - GOOGLE_APP_ID - 1:43512467490:ios:d1592446dbc04e6e19ba7b - DATABASE_URL - https://loki-5a81e.firebaseio.com - - \ No newline at end of file diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index bed6edaf5..cac13e760 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -5,9 +5,9 @@ BuildDetails CarthageVersion - 0.34.0 + 0.33.0 OSXVersion - 10.15.2 + 10.15.3 WebRTCCommit 1445d719bf05280270e9f77576f80f973fd847f8 M73 diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index 9fbb370b2..926def326 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -46,7 +46,6 @@ #import #import #import -#import @import WebRTC; @import Intents; @@ -353,11 +352,6 @@ static NSTimeInterval launchStartedAt; // if (!self.lokiP2PServer.isRunning) { // NSLog(@"[Loki] Failed to start P2P server."); // } - -#if DEBUG -#else - [FIRApp configure]; -#endif return YES; }