diff --git a/Rocket.Chat/AppDelegate.swift b/Rocket.Chat/AppDelegate.swift index 9dd1a219f3..a90b144f9a 100644 --- 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 index 9027c68c9e..0b21167808 100644 --- 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 index e2e13e65c0..5b14f610ad 100644 --- 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 index d674ee0a6c..de585dfe67 100644 --- 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