diff --git a/Podfile b/Podfile index 52f327a56..0b3daa79e 100644 --- a/Podfile +++ b/Podfile @@ -75,6 +75,9 @@ target 'Signal' do pod 'FeedKit', '~> 8.1', :inhibit_warnings => true pod 'CryptoSwift', '~> 1.0', :inhibit_warnings => true pod 'Mixpanel', '~> 3.4', :inhibit_warnings => true + pod 'FirebaseCore', '~> 6.0', :inhibit_warnings => true + pod 'Fabric', '~> 1.10', :inhibit_warnings => true + pod 'Crashlytics', '~> 3.13', :inhibit_warnings => true target 'SignalTests' do inherit! :search_paths diff --git a/Podfile.lock b/Podfile.lock index aecbc3596..c7287e2d9 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -29,6 +29,8 @@ PODS: - CocoaLumberjack (3.5.3): - CocoaLumberjack/Core (= 3.5.3) - CocoaLumberjack/Core (3.5.3) + - Crashlytics (3.13.1): + - Fabric (~> 1.10.1) - CryptoSwift (1.0.0) - Curve25519Kit (2.1.0): - CocoaLumberjack @@ -36,10 +38,17 @@ PODS: - Curve25519Kit/Tests (2.1.0): - CocoaLumberjack - SignalCoreKit + - Fabric (1.10.1) - FeedKit (8.1.1) + - FirebaseCore (6.0.2): + - GoogleUtilities/Environment (~> 6.0) + - GoogleUtilities/Logger (~> 6.0) - GCDWebServer (3.5.2): - GCDWebServer/Core (= 3.5.2) - GCDWebServer/Core (3.5.2) + - GoogleUtilities/Environment (6.2.0) + - GoogleUtilities/Logger (6.2.0): + - GoogleUtilities/Environment - GRKOpenSSLFramework (1.0.2.12) - HKDFKit (0.0.4): - CocoaLumberjack @@ -197,10 +206,13 @@ DEPENDENCIES: - AFNetworking - AxolotlKit (from `https://github.com/signalapp/SignalProtocolKit.git`, branch `master`) - AxolotlKit/Tests (from `https://github.com/signalapp/SignalProtocolKit.git`, branch `master`) + - Crashlytics (~> 3.13) - CryptoSwift (~> 1.0) - Curve25519Kit (from `https://github.com/signalapp/Curve25519Kit`) - Curve25519Kit/Tests (from `https://github.com/signalapp/Curve25519Kit`) + - Fabric (~> 1.10) - FeedKit (~> 8.1) + - FirebaseCore (~> 6.0) - GCDWebServer (~> 3.0) - GRKOpenSSLFramework (from `https://github.com/signalapp/GRKOpenSSLFramework`) - HKDFKit (from `https://github.com/signalapp/HKDFKit.git`) @@ -227,9 +239,13 @@ SPEC REPOS: https://github.com/cocoapods/specs.git: - AFNetworking - CocoaLumberjack + - Crashlytics - CryptoSwift + - Fabric - FeedKit + - FirebaseCore - GCDWebServer + - GoogleUtilities - IGIdenticon - libPhoneNumber-iOS - Mixpanel @@ -301,10 +317,14 @@ SPEC CHECKSUMS: AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057 AxolotlKit: bb02741a93400b915df1be3365ad13d3768b0103 CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947 + Crashlytics: 5aa8e90dcbf2f34898b4f5a0037787531246cca0 CryptoSwift: d81eeaa59dc5a8d03720fe919a6fd07b51f7439f Curve25519Kit: b3e77b7152ebe95fee2b3fb6c955449492bc14f7 + Fabric: f6f21452846788bb44595d73e9909d79d328e617 FeedKit: 3418eed25f0b493b205b4de1b8511ac21d413fa9 + FirebaseCore: b0f0262acebfa540e5f97b3832dbb13186980822 GCDWebServer: ead88cd14596dd4eae4f5830b8877c87c8728990 + GoogleUtilities: 996e0db07153674fd1b54b220fda3a3dc3547cba GRKOpenSSLFramework: 8a3735ad41e7dc1daff460467bccd32ca5d6ae3e HKDFKit: 3b6dbbb9d59c221cc6c52c3aa915700cbf24e376 IGIdenticon: 5790befde4fe56296927c72c0efed3d07b21de8e @@ -325,6 +345,6 @@ SPEC CHECKSUMS: YapDatabase: b418a4baa6906e8028748938f9159807fd039af4 YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54 -PODFILE CHECKSUM: 0666e8fade5ac5ba48d0b3c9cb83b2095d1b3cef +PODFILE CHECKSUM: 1240a47686acf0d2d7e61e6ec3a925fbded184fa COCOAPODS: 1.5.3 diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 082b40de1..2ebf69bb3 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -565,6 +565,9 @@ B82584A02315024B001B41CB /* LokiRSSFeedPoller.swift in Sources */ = {isa = PBXBuildFile; fileRef = B825849F2315024B001B41CB /* LokiRSSFeedPoller.swift */; }; B845B4D4230CD09100D759F0 /* LokiGroupChatPoller.swift in Sources */ = {isa = PBXBuildFile; fileRef = B845B4D3230CD09000D759F0 /* LokiGroupChatPoller.swift */; }; B846365B22B7418B00AF1514 /* Identicon+ObjC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B846365A22B7418B00AF1514 /* Identicon+ObjC.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 */; }; B89841E322B7579F00B1BDC6 /* NewConversationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B89841E222B7579F00B1BDC6 /* NewConversationViewController.swift */; }; B90418E6183E9DD40038554A /* DateUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = B90418E5183E9DD40038554A /* DateUtil.m */; }; B9EB5ABD1884C002007CBB57 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B9EB5ABC1884C002007CBB57 /* MessageUI.framework */; }; @@ -1357,8 +1360,10 @@ B8258491230FA5DA001B41CB /* ScanQRCodeViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ScanQRCodeViewController.h; sourceTree = ""; }; B8258492230FA5E9001B41CB /* ScanQRCodeViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ScanQRCodeViewController.m; sourceTree = ""; }; B825849F2315024B001B41CB /* LokiRSSFeedPoller.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LokiRSSFeedPoller.swift; sourceTree = ""; }; + B837E09223208B61003534C1 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; B845B4D3230CD09000D759F0 /* LokiGroupChatPoller.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LokiGroupChatPoller.swift; sourceTree = ""; }; B846365A22B7418B00AF1514 /* Identicon+ObjC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Identicon+ObjC.swift"; sourceTree = ""; }; + B891105B2320872800F15FCC /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../Downloads/GoogleService-Info.plist"; sourceTree = ""; }; B89841E222B7579F00B1BDC6 /* NewConversationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewConversationViewController.swift; sourceTree = ""; }; B90418E4183E9DD40038554A /* DateUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateUtil.h; sourceTree = ""; }; B90418E5183E9DD40038554A /* DateUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DateUtil.m; sourceTree = ""; }; @@ -2713,6 +2718,7 @@ B66DBF4919D5BBC8006EA940 /* Images.xcassets */, B67EBF5C19194AC60084CCFD /* Settings.bundle */, B657DDC91911A40500F45B0C /* Signal.entitlements */, + B837E09223208B61003534C1 /* GoogleService-Info.plist */, 34074F54203D0722004596AE /* Sounds */, 76EB03C118170B33006006FC /* src */, D221A094169C9E5E00537ABF /* Supporting Files */, @@ -2729,6 +2735,7 @@ B6B6C3C419193F5B00C0B76B /* Translations */, D221A099169C9E5E00537ABF /* main.m */, D221A095169C9E5E00537ABF /* Signal-Info.plist */, + B891105B2320872800F15FCC /* GoogleService-Info.plist */, D221A09B169C9E5E00537ABF /* Signal-Prefix.pch */, ); name = "Supporting Files"; @@ -2880,6 +2887,7 @@ 451DE9EE1DC1546A00810E42 /* [Carthage] Copy Frameworks */, 453518771FC635DD00210559 /* Embed App Extensions */, 4535189F1FC63DBF00210559 /* Embed Frameworks */, + B837E0912320894F003534C1 /* Set Up Crashlytics */, ); buildRules = ( ); @@ -3078,6 +3086,7 @@ 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; }; @@ -3085,6 +3094,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + B891105F2320872800F15FCC /* GoogleService-Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3121,6 +3131,7 @@ 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 */, @@ -3288,6 +3299,7 @@ "${BUILT_PRODUCTS_DIR}/FeedKit/FeedKit.framework", "${BUILT_PRODUCTS_DIR}/GCDWebServer/GCDWebServer.framework", "${PODS_ROOT}/GRKOpenSSLFramework/OpenSSL-iOS/bin/openssl.framework", + "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", "${BUILT_PRODUCTS_DIR}/HKDFKit/HKDFKit.framework", "${BUILT_PRODUCTS_DIR}/IGIdenticon/IGIdenticon.framework", "${BUILT_PRODUCTS_DIR}/Mantle/Mantle.framework", @@ -3317,6 +3329,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FeedKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GCDWebServer.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HKDFKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IGIdenticon.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mantle.framework", @@ -3419,6 +3432,25 @@ 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.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme index dca83d632..0fd35f191 100644 --- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme +++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme @@ -28,7 +28,7 @@ buildForAnalyzing = "YES"> @@ -133,9 +133,9 @@ + + + + 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 2354ceb3f..a96ba59d3 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -6,10 +6,14 @@ CarthageVersion 0.33.0 + DateTime + Thu Sep 5 00:37:14 UTC 2019 OSXVersion 10.14.6 WebRTCCommit 1445d719bf05280270e9f77576f80f973fd847f8 M73 + XCodeVersion + 1000.1030 CFBundleDevelopmentRegion en diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index a9a57e969..7d9f48d46 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -47,6 +47,7 @@ #import #import #import +#import @import WebRTC; @import Intents; @@ -355,6 +356,7 @@ static NSTimeInterval launchStartedAt; NSDictionary *properties = @{ @"configuration" : LKBuildConfiguration.current }; [Mixpanel.sharedInstance track:event properties:properties]; }; + [FIRApp configure]; return YES; }