Merge pull request #2373 from RocketChat/release/3.1.2

[RELEASE] Merge release 3.1.2 into MASTER
RocketChat · Nov 28, 2018 · 830e7c4 · 830e7c4
2 parents 64b4ae9 + a137f12
commit 830e7c4
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 53 deletions.
diff --git a/Rocket.Chat/AppDelegate.swift b/Rocket.Chat/AppDelegate.swift
@@ -33,10 +33,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             AuthManager.persistAuthInformation(auth)
             AuthSettingsManager.shared.updateCachedSettings()
             WindowManager.open(.subscriptions)
-
-            if let user = auth.user {
-                AnalyticsCoordinator.identifyCrashReports(withUser: user)
-            }
         } else {
             WindowManager.open(.auth(serverUrl: "", credentials: nil))
         }

diff --git a/Rocket.Chat/Managers/AppManager.swift b/Rocket.Chat/Managers/AppManager.swift
@@ -190,10 +190,6 @@ extension AppManager {
         SocketManager.disconnect { (_, _) in
             DispatchQueue.main.async {
                 if AuthManager.isAuthenticated() != nil {
-                    if let currentUser = AuthManager.currentUser() {
-                        AnalyticsCoordinator.identifyCrashReports(withUser: currentUser)
-                    }
-
                     WindowManager.open(.subscriptions)
 
                     let server = AuthManager.selectedServerHost()

diff --git a/Rocket.Chat/Managers/Launcher/AnalyticsCoordinator.swift b/Rocket.Chat/Managers/Launcher/AnalyticsCoordinator.swift
@@ -24,9 +24,7 @@ struct AnalyticsCoordinator: LauncherProtocol {
     static func toggleCrashReporting(disabled: Bool) {
         UserDefaults.standard.set(disabled, forKey: kCrashReportingDisabledKey)
 
-        if disabled {
-            anonymizeCrashReports()
-        } else {
+        if !disabled {
             AnalyticsCoordinator().prepareToLaunch(with: nil)
         }
     }
@@ -57,45 +55,5 @@ struct AnalyticsCoordinator: LauncherProtocol {
 
     private func launchFabric() {
         Fabric.with([Crashlytics.self])
-
-        if let currentUser = AuthManager.currentUser() {
-            AnalyticsCoordinator.identifyCrashReports(withUser: currentUser)
-        } else {
-            AnalyticsCoordinator.anonymizeCrashReports()
-        }
-    }
-
-    static func identifyCrashReports(withUser user: User) {
-        guard let id = user.identifier else {
-            return
-        }
-
-        let crashlytics = Crashlytics.sharedInstance()
-        crashlytics.setUserIdentifier(id)
-
-        if let name = user.name {
-            crashlytics.setUserName(name)
-        }
-
-        if let email = user.emails.first?.email {
-            crashlytics.setUserEmail(email)
-        }
-
-        if let serverURL = AuthManager.selectedServerInformation()?[ServerPersistKeys.serverURL] {
-            crashlytics.setObjectValue(serverURL, forKey: ServerPersistKeys.serverURL)
-        }
-
-        if let serverVersion = AuthManager.selectedServerInformation()?[ServerPersistKeys.serverVersion] {
-            crashlytics.setObjectValue(serverVersion, forKey: ServerPersistKeys.serverVersion)
-        }
-    }
-
-    static func anonymizeCrashReports() {
-        let crashlytics = Crashlytics.sharedInstance()
-
-        crashlytics.setUserEmail(nil)
-        crashlytics.setUserName(nil)
-        crashlytics.setUserIdentifier(nil)
-        crashlytics.setObjectValue(nil, forKey: ServerPersistKeys.serverURL)
     }
 }
diff --git a/Rocket.Chat/Managers/Model/AuthManager/AuthManagerSocket.swift b/Rocket.Chat/Managers/Model/AuthManager/AuthManagerSocket.swift
@@ -257,8 +257,6 @@ extension AuthManager {
      */
     static func logout(completion: @escaping VoidCompletion) {
         SocketManager.disconnect { (_, _) in
-            AnalyticsCoordinator.anonymizeCrashReports()
-
             DraftMessageManager.clearServerDraftMessages()
 
             Realm.executeOnMainThread({ (realm) in