From a551f7c0ef67cd0dd57fd24ab38a10db640130ca Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Fri, 6 Mar 2020 11:54:20 +1100 Subject: [PATCH] Use Crashlytics for internal testing --- Podfile | 3 +++ Signal.xcodeproj/project.pbxproj | 32 ++++++++++++++++++++++++---- Signal/GoogleService-Info.plist | 36 ++++++++++++++++++++++++++++++++ Signal/Signal-Info.plist | 8 +++---- Signal/src/AppDelegate.m | 9 +++++++- 5 files changed, 79 insertions(+), 9 deletions(-) create mode 100644 Signal/GoogleService-Info.plist diff --git a/Podfile b/Podfile index 68f553d50..5343918db 100644 --- a/Podfile +++ b/Podfile @@ -73,6 +73,9 @@ 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 # Used for internal testing + pod 'Fabric', '~> 1.10', :inhibit_warnings => true # Used for internal testing + pod 'Crashlytics', '~> 3.13', :inhibit_warnings => true # Used for internal testing pod 'NVActivityIndicatorView', '~> 4.7', :inhibit_warnings => true target 'SignalTests' do diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 597d39279..06bbec059 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -618,6 +618,9 @@ B9EB5ABD1884C002007CBB57 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B9EB5ABC1884C002007CBB57 /* MessageUI.framework */; }; BFF3FB9730634F37D25903F4 /* Pods_Signal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D17BB5C25D615AB49813100C /* Pods_Signal.framework */; }; C34C8F7423A7830B00D82669 /* SpaceMono-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C34C8F7323A7830A00D82669 /* SpaceMono-Bold.ttf */; }; + C3B781FF2411C18600C859D8 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C3B781FE2411C18600C859D8 /* GoogleService-Info.plist */; }; + C3B782022411C80500C859D8 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C3B781FE2411C18600C859D8 /* GoogleService-Info.plist */; }; + C3B782032411C81100C859D8 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C3B781FE2411C18600C859D8 /* GoogleService-Info.plist */; }; C3DFFAC623E96F0D0058DAF8 /* Sheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3DFFAC523E96F0D0058DAF8 /* Sheet.swift */; }; C3DFFAC823E970080058DAF8 /* OpenGroupSuggestionSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3DFFAC723E970080058DAF8 /* OpenGroupSuggestionSheet.swift */; }; CC875800737563D6891B741D /* Pods_SignalTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 748A5CAEDD7C919FC64C6807 /* Pods_SignalTests.framework */; }; @@ -1466,6 +1469,7 @@ 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; }; C34C8F7323A7830A00D82669 /* SpaceMono-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SpaceMono-Bold.ttf"; sourceTree = ""; }; + C3B781FE2411C18600C859D8 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Signal/GoogleService-Info.plist"; sourceTree = SOURCE_ROOT; }; C3DFFAC523E96F0D0058DAF8 /* Sheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sheet.swift; sourceTree = ""; }; C3DFFAC723E970080058DAF8 /* OpenGroupSuggestionSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenGroupSuggestionSheet.swift; sourceTree = ""; }; D17BB5C25D615AB49813100C /* Pods_Signal.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Signal.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -2922,6 +2926,7 @@ B66DBF4919D5BBC8006EA940 /* Images.xcassets */, B67EBF5C19194AC60084CCFD /* Settings.bundle */, B657DDC91911A40500F45B0C /* Signal.entitlements */, + C3B781FE2411C18600C859D8 /* GoogleService-Info.plist */, C34C8F7323A7830A00D82669 /* SpaceMono-Bold.ttf */, 34074F54203D0722004596AE /* Sounds */, 76EB03C118170B33006006FC /* src */, @@ -3091,6 +3096,7 @@ 451DE9EE1DC1546A00810E42 /* [Carthage] Copy Frameworks */, 453518771FC635DD00210559 /* Embed App Extensions */, 4535189F1FC63DBF00210559 /* Embed Frameworks */, + C3B782012411C26000C859D8 /* Set up Crashlytics */, ); buildRules = ( ); @@ -3283,6 +3289,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + C3B782022411C80500C859D8 /* GoogleService-Info.plist in Resources */, 347850321FD7494A007B8332 /* ElegantIcons.ttf in Resources */, 4535186E1FC635DD00210559 /* MainInterface.storyboard in Resources */, 347850551FD749C0007B8332 /* Localizable.strings in Resources */, @@ -3296,6 +3303,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + C3B782032411C81100C859D8 /* GoogleService-Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3303,6 +3311,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + C3B781FF2411C18600C859D8 /* GoogleService-Info.plist in Resources */, 4C63CC00210A620B003AE45C /* SignalTSan.supp in Resources */, 4C6F527C20FFE8400097DEEE /* SignalUBSan.supp in Resources */, 34CF078A203E6B78005C4D61 /* end_call_tone_cept.caf in Resources */, @@ -3632,6 +3641,25 @@ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SignalTests/Pods-SignalTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; + C3B782012411C26000C859D8 /* 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; @@ -4235,7 +4263,6 @@ CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 49; - DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = SUQ8J2PCT7; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -4297,7 +4324,6 @@ CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 49; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = SUQ8J2PCT7; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -4351,7 +4377,6 @@ CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 49; - DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = SUQ8J2PCT7; DYLIB_COMPATIBILITY_VERSION = 1; @@ -4420,7 +4445,6 @@ CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 49; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = SUQ8J2PCT7; DYLIB_COMPATIBILITY_VERSION = 1; diff --git a/Signal/GoogleService-Info.plist b/Signal/GoogleService-Info.plist new file mode 100644 index 000000000..f37b4c636 --- /dev/null +++ b/Signal/GoogleService-Info.plist @@ -0,0 +1,36 @@ + + + + + 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 + + diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index e75634ca7..a7a084e27 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -5,15 +5,15 @@ BuildDetails CarthageVersion - 0.34.0 + 0.33.0 DateTime - Tue Mar 3 05:11:41 UTC 2020 + Fri Mar 6 00:51:56 UTC 2020 OSXVersion - 10.15.2 + 10.15.3 WebRTCCommit 1445d719bf05280270e9f77576f80f973fd847f8 M73 XCodeVersion - 1100.1120 + 1100.1130 CFBundleDevelopmentRegion en diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index 64721d20c..19db0cfee 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -46,6 +46,7 @@ #import #import #import +#import @import WebRTC; @import Intents; @@ -58,6 +59,8 @@ static NSString *const kURLHostVerifyPrefix = @"verify"; static NSTimeInterval launchStartedAt; +static BOOL isInternalTestVersion = NO; + @interface AppDelegate () @property (nonatomic) BOOL hasInitialRootViewController; @@ -353,7 +356,11 @@ static NSTimeInterval launchStartedAt; // if (!self.lokiP2PServer.isRunning) { // NSLog(@"[Loki] Failed to start P2P server."); // } - + + if (isInternalTestVersion) { + [FIRApp configure]; + } + return YES; }