new crashlytics sdk

ronan18 · Feb 14, 2020 · 86ad03d · 86ad03d
1 parent 954a4e9
commit 86ad03d
Show file tree

Hide file tree

Showing 15 changed files with 4,861 additions and 3,669 deletions.
diff --git a/Arrival-iOS2.xcodeproj/project.pbxproj b/Arrival-iOS2.xcodeproj/project.pbxproj
@@ -226,6 +226,7 @@
 				E17C82A52DBE2323B5D7E277 /* [CP] Embed Pods Frameworks */,
 				C51B3EE523EE254A0021EBE0 /* Run Script */,
 				C5E5768F23EFEB7500A3A7BD /* ShellScript */,
+				C538A11423F661BD00DDF811 /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -377,7 +378,26 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n\"${PODS_ROOT}/Fabric/run\"\n";
+			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n#\"${PODS_ROOT}/Fabric/run\"\n";
+		};
+		C538A11423F661BD00DDF811 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}",
+				"$(SRCROOT)/$(BUILT_PRODUCTS_DIR)/$(INFOPLIST_PATH)",
+			);
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n\"${PODS_ROOT}/FirebaseCrashlytics/run\"\n";
 		};
 		C5E5768F23EFEB7500A3A7BD /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -394,7 +414,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n\"${PODS_ROOT}/Fabric/upload-symbols\" -gsp \"${PROJECT_DIR}/GoogleService-Info.plist\" -p ios \"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}\"\n";
+			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n#\"${PODS_ROOT}/Fabric/upload-symbols\" -gsp \"${PROJECT_DIR}/GoogleService-Info.plist\" -p ios \"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}\"\n";
 		};
 		E17C82A52DBE2323B5D7E277 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;

diff --git a/Arrival-iOS2/AppData.swift b/Arrival-iOS2/AppData.swift
@@ -642,12 +642,20 @@ class AppData: NSObject, ObservableObject,CLLocationManagerDelegate {
                     if (!result.isEmpty) {
                         print("fetching settings from auth")
                         for data in result as! [NSManagedObject] {
-                            let user = data.value(forKey: "user") as! String
+
                             var sortTrainsByTimeSetting: Bool
+                            let user: String
                             do {
+                                 user = try data.value(forKey: "user") as! String
+                            } catch {
+                                user  =  ""
+                            }
+                            do {
+
                                try  sortTrainsByTimeSetting = data.value(forKey: "sortTrainsByTime") as! Bool
                             } catch {
                                 sortTrainsByTimeSetting = false
+
                             }
 
                             if (sortTrainsByTimeSetting == nil) {
@@ -667,6 +675,8 @@ class AppData: NSObject, ObservableObject,CLLocationManagerDelegate {
                             }
 
                         }
+                    } else {
+                        self.sortTrainsByTime = false
                     }
 
 

diff --git a/Arrival-iOS2/HomeView.swift b/Arrival-iOS2/HomeView.swift
@@ -199,6 +199,9 @@ struct HomeView: View {
             }
             Timer.scheduledTimer(withTimeInterval: 5, repeats: false) { timer in
                 self.locationTimeout = true
+                if (self.appData.fromStation.abbr == "load") {
+                    Analytics.logEvent("locationTimeOut", parameters: [:])
+                }
             }
 
         }

diff --git a/Arrival-iOS2/SettingsView.swift b/Arrival-iOS2/SettingsView.swift
@@ -72,9 +72,10 @@ struct SettingsView: View {
                         Spacer()
                     }
                     Spacer().frame(height: 20)
-                     TermsOfSeriviceView()
+
                     Text(self.appData.aboutText)
                        .multilineTextAlignment(.center).font(.subheadline).foregroundColor(.gray)
+                      TermsOfSeriviceView()
 
 
                 }.padding()

diff --git a/Podfile b/Podfile
@@ -9,8 +9,9 @@ target 'Arrival-iOS2' do
 pod 'Alamofire'
 pod 'SwiftyJSON'
 pod 'Firebase/Analytics'
-pod 'Fabric', '~> 1.10.2'
-pod 'Crashlytics', '~> 3.14.0'
+#pod 'Fabric', '~> 1.10.2'
+#pod 'Crashlytics', '~> 3.14.0'
+pod 'Firebase/Crashlytics'
 pod 'Firebase/Performance'
 pod 'Firebase/RemoteConfig'
 #pod 'Firebase/Messaging'

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,15 +1,15 @@
 PODS:
   - Alamofire (4.9.1)
-  - Crashlytics (3.14.0):
-    - Fabric (~> 1.10.2)
-  - Fabric (1.10.2)
   - Firebase/Analytics (6.16.0):
     - Firebase/Core
   - Firebase/Core (6.16.0):
     - Firebase/CoreOnly
     - FirebaseAnalytics (= 6.2.2)
   - Firebase/CoreOnly (6.16.0):
     - FirebaseCore (= 6.6.1)
+  - Firebase/Crashlytics (6.16.0):
+    - Firebase/CoreOnly
+    - FirebaseCrashlytics (~> 4.0.0-beta.2)
   - Firebase/Performance (6.16.0):
     - Firebase/CoreOnly
     - FirebasePerformance (~> 3.1.9)
@@ -42,6 +42,11 @@ PODS:
     - GoogleUtilities/Logger (~> 6.5)
     - nanopb (~> 0.3.901)
   - FirebaseCoreDiagnosticsInterop (1.2.0)
+  - FirebaseCrashlytics (4.0.0-beta.3):
+    - FirebaseAnalyticsInterop (~> 1.2)
+    - FirebaseCore (~> 6.6)
+    - FirebaseInstanceID (~> 4.3)
+    - PromisesObjC (~> 1.2)
   - FirebaseInstallations (1.1.0):
     - FirebaseCore (~> 6.6)
     - GoogleUtilities/UserDefaults (~> 6.5)
@@ -116,25 +121,23 @@ PODS:
 
 DEPENDENCIES:
   - Alamofire
-  - Crashlytics (~> 3.14.0)
-  - Fabric (~> 1.10.2)
   - Firebase/Analytics
+  - Firebase/Crashlytics
   - Firebase/Performance
   - Firebase/RemoteConfig
   - SwiftyJSON
 
 SPEC REPOS:
   trunk:
     - Alamofire
-    - Crashlytics
-    - Fabric
     - Firebase
     - FirebaseABTesting
     - FirebaseAnalytics
     - FirebaseAnalyticsInterop
     - FirebaseCore
     - FirebaseCoreDiagnostics
     - FirebaseCoreDiagnosticsInterop
+    - FirebaseCrashlytics
     - FirebaseInstallations
     - FirebaseInstanceID
     - FirebasePerformance
@@ -152,15 +155,14 @@ SPEC REPOS:
 
 SPEC CHECKSUMS:
   Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18
-  Crashlytics: 540b7e5f5da5a042647227a5e3ac51d85eed06df
-  Fabric: 706c8b8098fff96c33c0db69cbf81f9c551d0d74
   Firebase: 497158b816d0a86fc31babbd05546fcd7e6083ff
   FirebaseABTesting: 0d10f3cdc3fa00f3f175b5b56c1003c8e888299f
   FirebaseAnalytics: cf95d3aab897612783020fbd98401d5366f135ee
   FirebaseAnalyticsInterop: 3f86269c38ae41f47afeb43ebf32a001f58fcdae
   FirebaseCore: 85064903ed6c28e47fec9c7bd149d94ba1b6b6e7
   FirebaseCoreDiagnostics: 5e78803ab276bc5b50340e3c539c06c3de35c649
   FirebaseCoreDiagnosticsInterop: 296e2c5f5314500a850ad0b83e9e7c10b011a850
+  FirebaseCrashlytics: 81ac4950302353dc6b5f8d5cc287397725b54c97
   FirebaseInstallations: 575cd32f2aec0feeb0e44f5d0110a09e5e60b47b
   FirebaseInstanceID: 6668efc1655a4052c083f287a7141f1ead12f9c2
   FirebasePerformance: 18ac5d515f0da0a96cde94b7fc5b1514b235e2d9
@@ -176,6 +178,6 @@ SPEC CHECKSUMS:
   Protobuf: 0e94afe3b47cb11876eb6aee296638711a24bf75
   SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
 
-PODFILE CHECKSUM: 3c599b9ca305ed56ba810b6ad97aac42b0f8c6d8
+PODFILE CHECKSUM: 6fa05a8bc6d07347e264ca40fd8f5a873b7df6d1
 
 COCOAPODS: 1.8.4
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock