diff --git a/Podfile b/Podfile index d894a4606f..3edfb41742 100644 --- a/Podfile +++ b/Podfile @@ -23,7 +23,6 @@ target 'Trust' do pod 'CryptoSwift', :git=>'https://github.com/krzyzanowskim/CryptoSwift', :branch=>'master' pod 'Fabric' pod 'Crashlytics', '~> 3.10' - pod 'Firebase/Core' pod 'Kingfisher', '~> 4.0' pod 'TrustCore', '~> 0.0.7' pod 'TrustKeystore', '~> 0.4.0' diff --git a/Podfile.lock b/Podfile.lock index dc4fb7c02a..cd47bf3025 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -12,21 +12,6 @@ PODS: - CryptoSwift (0.8.0) - Eureka (4.1.1) - Fabric (1.7.6) - - Firebase/Core (4.13.0): - - FirebaseAnalytics (= 4.2.0) - - FirebaseCore (= 4.0.20) - - FirebaseAnalytics (4.2.0): - - FirebaseCore (~> 4.0) - - FirebaseInstanceID (~> 2.0) - - "GoogleToolboxForMac/NSData+zlib (~> 2.1)" - - nanopb (~> 0.3) - - FirebaseCore (4.0.20): - - "GoogleToolboxForMac/NSData+zlib (~> 2.1)" - - FirebaseInstanceID (2.0.10): - - FirebaseCore (~> 4.0) - - GoogleToolboxForMac/Defines (2.1.3) - - "GoogleToolboxForMac/NSData+zlib (2.1.3)": - - GoogleToolboxForMac/Defines (= 2.1.3) - JdenticonSwift (0.0.1) - JSONRPCKit (2.0.0): - Result (~> 3.0) @@ -39,11 +24,6 @@ PODS: - Moya/Core (10.0.1): - Alamofire (~> 4.1) - Result (~> 3.0) - - nanopb (0.3.8): - - nanopb/decode (= 0.3.8) - - nanopb/encode (= 0.3.8) - - nanopb/decode (0.3.8) - - nanopb/encode (0.3.8) - PromiseKit (6.2.4): - PromiseKit/CorePromise (= 6.2.4) - PromiseKit/Foundation (= 6.2.4) @@ -91,7 +71,6 @@ DEPENDENCIES: - CryptoSwift (from `https://github.com/krzyzanowskim/CryptoSwift`, branch `master`) - Eureka (~> 4.1.1) - Fabric - - Firebase/Core - JdenticonSwift - JSONRPCKit (from `https://github.com/bricklife/JSONRPCKit.git`) - KeychainSwift @@ -123,18 +102,12 @@ SPEC REPOS: - Crashlytics - Eureka - Fabric - - Firebase - - FirebaseAnalytics - - FirebaseCore - - FirebaseInstanceID - - GoogleToolboxForMac - JdenticonSwift - KeychainSwift - Kingfisher - Lokalise - MBProgressHUD - Moya - - nanopb - PromiseKit - R.swift - R.swift.Library @@ -194,11 +167,6 @@ SPEC CHECKSUMS: CryptoSwift: 475ae2a25439f52412686d68b854c0ca724c8dfd Eureka: b88fb930e42c79f8c03c373d0fcdc28c1d6c50ed Fabric: f8d42c893bb187326a7968b62abe55c36a987a46 - Firebase: 5ec5e863d269d82d66b4bf56856726f8fb8f0fb3 - FirebaseAnalytics: 7ef69e76a5142f643aeb47c780e1cdce4e23632e - FirebaseCore: 90cb1c53d69b556f112a1bf72b5fcfaad7650790 - FirebaseInstanceID: 8d20d890d65c917f9f7d9950b6e10a760ad34321 - GoogleToolboxForMac: 2501e2ad72a52eb3dfe7bd9aee7dad11b858bd20 JdenticonSwift: bc532f2761566eb29f26b085e5f72de25bc065ce JSONRPCKit: 22132c575ba2dc6f2f4ae72fda4943a63efca686 KeychainSwift: f9f7910449a0c0fd2cabc889121530dd2c477c33 @@ -206,7 +174,6 @@ SPEC CHECKSUMS: Lokalise: d81f4ccce8cd2c1589bf73bb39fab7781d4f7cbc MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9 Moya: 9e621707ff754eeb51ff3ec51a3d54e517c0733a - nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3 PromiseKit: 625b1fc69944fc839503748101c5968cf54b527b QRCodeReaderViewController: e8f27d035b3e72b1d4b1c61ff66458287e3be0ff R.swift: d6a5ec2f55a8441dc0ed9f1f8b37d7d11ae85c66 @@ -227,6 +194,6 @@ SPEC CHECKSUMS: TrustWeb3Provider: 50fa391bdf170feb43dd4419992931510a5751d8 URLNavigator: af5582fbbb3586c958be16835d799bfdb23a4793 -PODFILE CHECKSUM: 9dda6ef4c80904b7376fa00fdd473b04e9b0006c +PODFILE CHECKSUM: b6ed29b92790ccd93215436a07191d9d287ef870 COCOAPODS: 1.5.2 diff --git a/Trust.xcodeproj/project.pbxproj b/Trust.xcodeproj/project.pbxproj index 86bbc50fc8..97fdb3a958 100644 --- a/Trust.xcodeproj/project.pbxproj +++ b/Trust.xcodeproj/project.pbxproj @@ -342,8 +342,6 @@ 771AA964200D5EDB00D25403 /* WordCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 771AA963200D5EDB00D25403 /* WordCollectionViewCell.swift */; }; 771AA966200D5F1900D25403 /* WordCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 771AA965200D5F1900D25403 /* WordCollectionViewCell.xib */; }; 771ACE0E20A15AC000FB03EE /* SendNFTRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 771ACE0D20A15AC000FB03EE /* SendNFTRow.swift */; }; - 771D0641208AC30800016B72 /* Analytics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 771D0640208AC30800016B72 /* Analytics.swift */; }; - 771D0644208AC34D00016B72 /* AnalyticsEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 771D0643208AC34D00016B72 /* AnalyticsEvent.swift */; }; 771D0646208B3FAD00016B72 /* MonetaryAmountViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 771D0645208B3FAD00016B72 /* MonetaryAmountViewModel.swift */; }; 771D53632050AFC700C79485 /* WalletType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 771D53622050AFC700C79485 /* WalletType.swift */; }; 771D536F2058BB0D00C79485 /* BrowserCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 771D536D2058BB0D00C79485 /* BrowserCoordinator.swift */; }; @@ -405,7 +403,6 @@ 77B806B420779144005FDCBE /* Favicon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77B806B320779144005FDCBE /* Favicon.swift */; }; 77CB8398206B8E1C006F34A8 /* ScanQRCodeCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77CB8397206B8E1C006F34A8 /* ScanQRCodeCoordinator.swift */; }; 77CB839A206CEED7006F34A8 /* Size.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77CB8399206CEED7006F34A8 /* Size.swift */; }; - 77CB83A0206EFE71006F34A8 /* FirebaseInitializer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77CB839F206EFE70006F34A8 /* FirebaseInitializer.swift */; }; 77CB83A2206EFF01006F34A8 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 77CB83A1206EFF00006F34A8 /* GoogleService-Info.plist */; }; 77E0E773201FAD06009B4B31 /* BrowserURLParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77E0E772201FAD05009B4B31 /* BrowserURLParser.swift */; }; 77E81D94203687FB00534C99 /* NotificationsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77E81D93203687FB00534C99 /* NotificationsViewController.swift */; }; @@ -823,8 +820,6 @@ 771AA963200D5EDB00D25403 /* WordCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WordCollectionViewCell.swift; sourceTree = ""; }; 771AA965200D5F1900D25403 /* WordCollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = WordCollectionViewCell.xib; sourceTree = ""; }; 771ACE0D20A15AC000FB03EE /* SendNFTRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendNFTRow.swift; sourceTree = ""; }; - 771D0640208AC30800016B72 /* Analytics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Analytics.swift; sourceTree = ""; }; - 771D0643208AC34D00016B72 /* AnalyticsEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnalyticsEvent.swift; sourceTree = ""; }; 771D0645208B3FAD00016B72 /* MonetaryAmountViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MonetaryAmountViewModel.swift; sourceTree = ""; }; 771D53622050AFC700C79485 /* WalletType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WalletType.swift; sourceTree = ""; }; 771D536D2058BB0D00C79485 /* BrowserCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BrowserCoordinator.swift; sourceTree = ""; }; @@ -888,7 +883,6 @@ 77B806B320779144005FDCBE /* Favicon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Favicon.swift; sourceTree = ""; }; 77CB8397206B8E1C006F34A8 /* ScanQRCodeCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScanQRCodeCoordinator.swift; sourceTree = ""; }; 77CB8399206CEED7006F34A8 /* Size.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Size.swift; sourceTree = ""; }; - 77CB839F206EFE70006F34A8 /* FirebaseInitializer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FirebaseInitializer.swift; sourceTree = ""; }; 77CB83A1206EFF00006F34A8 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 77E0E772201FAD05009B4B31 /* BrowserURLParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BrowserURLParser.swift; sourceTree = ""; }; 77E81D93203687FB00534C99 /* NotificationsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationsViewController.swift; sourceTree = ""; }; @@ -1928,7 +1922,6 @@ 29FC9BC31F830880000209CD /* Core */ = { isa = PBXGroup; children = ( - 771D0642208AC33700016B72 /* Analytics */, 73BD193D206097E600668673 /* Network */, 295B61D21FE7D5AB00642E60 /* Formatters */, 29E9CFD01FE737EE00017744 /* Types */, @@ -1948,7 +1941,6 @@ 2923D9B01FDA49D8000CF3F8 /* Initializer.swift */, 2923D9B21FDA49F8000CF3F8 /* SkipBackupFilesInitializer.swift */, 294DFB971FDF8CBB004CEB56 /* CrashReportInitializer.swift */, - 77CB839F206EFE70006F34A8 /* FirebaseInitializer.swift */, 77B806A42075C33D005FDCBE /* SharedMigrationInitializer.swift */, ); path = Initializers; @@ -2271,15 +2263,6 @@ path = View; sourceTree = ""; }; - 771D0642208AC33700016B72 /* Analytics */ = { - isa = PBXGroup; - children = ( - 771D0640208AC30800016B72 /* Analytics.swift */, - 771D0643208AC34D00016B72 /* AnalyticsEvent.swift */, - ); - path = Analytics; - sourceTree = ""; - }; 771D53612050AFBD00C79485 /* Types */ = { isa = PBXGroup; children = ( @@ -2810,7 +2793,6 @@ "${BUILT_PRODUCTS_DIR}/Branch/Branch.framework", "${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework", "${BUILT_PRODUCTS_DIR}/Eureka/Eureka.framework", - "${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac/GoogleToolboxForMac.framework", "${BUILT_PRODUCTS_DIR}/JSONRPCKit/JSONRPCKit.framework", "${BUILT_PRODUCTS_DIR}/JdenticonSwift/JdenticonSwift.framework", "${BUILT_PRODUCTS_DIR}/KeychainSwift/KeychainSwift.framework", @@ -2833,7 +2815,6 @@ "${BUILT_PRODUCTS_DIR}/TrustKeystore/TrustKeystore.framework", "${BUILT_PRODUCTS_DIR}/TrustWalletSDK/TrustWalletSDK.framework", "${BUILT_PRODUCTS_DIR}/URLNavigator/URLNavigator.framework", - "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( @@ -2843,7 +2824,6 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Branch.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CryptoSwift.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Eureka.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleToolboxForMac.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JSONRPCKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JdenticonSwift.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KeychainSwift.framework", @@ -2866,7 +2846,6 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TrustKeystore.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TrustWalletSDK.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/URLNavigator.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -2961,7 +2940,6 @@ 290B2B5B1F8F551E0053C83E /* LokaliseInitializer.swift in Sources */, 293112371FC9A24600966EEA /* UIGestureRecognizer+Closure.swift in Sources */, 29B6AECB1F7C5FA900EC6DE3 /* PaymentCoordinator.swift in Sources */, - 77CB83A0206EFE71006F34A8 /* FirebaseInitializer.swift in Sources */, 29BDF1A11FEE51A80023A45F /* GasLimitConfiguration.swift in Sources */, 615F10591FCBEF7C008A45AF /* OnboardingPage.swift in Sources */, 29F114EC1FA448F400114A29 /* TokensCoordinator.swift in Sources */, @@ -3035,7 +3013,6 @@ 294DFBA01FE0CADE004CEB56 /* TransactionDetailsViewModel.swift in Sources */, 90DDF48520518AE50016E6D4 /* BookmarkViewModel.swift in Sources */, BBB61E122050993A00428BBD /* BrowserErrorView.swift in Sources */, - 771D0644208AC34D00016B72 /* AnalyticsEvent.swift in Sources */, 29C80D4B1FB51C460037B1E0 /* Decimal.swift in Sources */, 297800521F71FDCF003185C1 /* FormAppearance.swift in Sources */, 77B3BF3C201908ED00EEC15A /* ConfirmCoordinator.swift in Sources */, @@ -3132,7 +3109,6 @@ 29E9CFCD1FE7343C00017744 /* NewTokenViewModel.swift in Sources */, 291F52A21F6B6DCF00B369AB /* EtherClient.swift in Sources */, 299B5E421FD2298E0051361C /* ConfigureTransactionViewController.swift in Sources */, - 771D0641208AC30800016B72 /* Analytics.swift in Sources */, 294DFBA31FE0E2EA004CEB56 /* TransactionValue.swift in Sources */, BB3B86BF204CECBC0061FCBA /* URLNavigable.swift in Sources */, 735AB03D2073BF2100EEEDDD /* TokenBalanceOperation.swift in Sources */, diff --git a/Trust/AppCoordinator.swift b/Trust/AppCoordinator.swift index 14eefd27f5..a98a3a48af 100644 --- a/Trust/AppCoordinator.swift +++ b/Trust/AppCoordinator.swift @@ -81,7 +81,6 @@ class AppCoordinator: NSObject, Coordinator { let initializers: [Initializer] = [ CrashReportInitializer(), - FirebaseInitializer(), LokaliseInitializer(), SkipBackupFilesInitializer(paths: paths), ] diff --git a/Trust/AppDelegate.swift b/Trust/AppDelegate.swift index d601aaa68a..72f5dddfcb 100644 --- a/Trust/AppDelegate.swift +++ b/Trust/AppDelegate.swift @@ -21,7 +21,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele coordinator.start() if !UIApplication.shared.isProtectedDataAvailable { - Analytics.track(.dataProtectionDisabled) + fatalError() } protectionCoordinator.didFinishLaunchingWithOptions() diff --git a/Trust/Browser/Coordinators/BrowserCoordinator.swift b/Trust/Browser/Coordinators/BrowserCoordinator.swift index ba23e1b880..907d55b92f 100644 --- a/Trust/Browser/Coordinators/BrowserCoordinator.swift +++ b/Trust/Browser/Coordinators/BrowserCoordinator.swift @@ -123,16 +123,11 @@ class BrowserCoordinator: NSObject, Coordinator { self.rootViewController.browserViewController.notifyFinish(callbackID: callbackID, value: .success(callback)) self.delegate?.didSentTransaction(transaction: transaction, in: self) } - // analytics event for successfully completed transaction - // can we track by type without separate events for each case above? - Analytics.track(.completedTransactionFromBrowser) case .failure: self.rootViewController.browserViewController.notifyFinish( callbackID: callbackID, value: .failure(DAppError.cancelled) ) - // analytics event for failed transaction - Analytics.track(.failedTransactionFromBrowser) } self.removeCoordinator(coordinator) self.navigationController.dismiss(animated: true, completion: nil) @@ -175,13 +170,8 @@ class BrowserCoordinator: NSObject, Coordinator { callback = DappCallback(id: callbackID, value: .signTypedMessage(data)) } self.rootViewController.browserViewController.notifyFinish(callbackID: callbackID, value: .success(callback)) - // analytics event for succesfully signed message - // can we track by type without separate events for each case above? - Analytics.track(.signedMessageFromBrowser) case .failure: self.rootViewController.browserViewController.notifyFinish(callbackID: callbackID, value: .failure(DAppError.cancelled)) - // analytics event for failed message signing - Analytics.track(.failedSignedMessageFromBrowser) } self.removeCoordinator(coordinator) } diff --git a/Trust/Browser/Factory/WKWebViewConfiguration.swift b/Trust/Browser/Factory/WKWebViewConfiguration.swift index 71c962d80a..8b86543788 100644 --- a/Trust/Browser/Factory/WKWebViewConfiguration.swift +++ b/Trust/Browser/Factory/WKWebViewConfiguration.swift @@ -18,9 +18,7 @@ extension WKWebViewConfiguration { if let filepath = bundle.path(forResource: "trust-min", ofType: "js") { do { js += try String(contentsOfFile: filepath) - } catch { - Analytics.track(.failedToLoadTrustPageProvider) - } + } catch { } } js += diff --git a/Trust/Core/Analytics/Analytics.swift b/Trust/Core/Analytics/Analytics.swift deleted file mode 100644 index 4dee229c37..0000000000 --- a/Trust/Core/Analytics/Analytics.swift +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright SIX DAY LLC. All rights reserved. - -import Foundation -import Firebase - -class Analytics { - - static private var sendLogsAreDisabled: Bool { - let preferences = PreferencesController() - return preferences.get(for: .sendLogs) - } - - static func track(_ event: AnalyticsEvent) { - guard !sendLogsAreDisabled else { return } - Firebase.Analytics.logEvent(event.event, parameters: event.params) - } -} diff --git a/Trust/Core/Analytics/AnalyticsEvent.swift b/Trust/Core/Analytics/AnalyticsEvent.swift deleted file mode 100644 index 7ff280f693..0000000000 --- a/Trust/Core/Analytics/AnalyticsEvent.swift +++ /dev/null @@ -1,99 +0,0 @@ -// Copyright SIX DAY LLC. All rights reserved. - -import Foundation - -enum AnalyticsEvent { - // Acquisition events - case welcomeScreen - // Activation events - creating or importing a wallet - case importedWallet(ImportSelectionType) - case failedImportWallet(ImportSelectionType, Error) - case createdWallet - // Retention events - signing a message or sending a transaction - case completedTransactionFromBrowser - case failedTransactionFromBrowser - case signedMessageFromBrowser - case failedSignedMessageFromBrowser - case sentTransactionFromWallet - case failedTransactionFromWallet(Error) - // Other events - case backedUpWallet - // Trust server events - case failedTrustRequest(Error) - // Realm databse events - case failedToExcludeFromBackup(Error) - // DAPP browser events - case failedToLoadTrustPageProvider - // Security - case dataProtectionDisabled - - var event: String { - switch self { - case .welcomeScreen: - return "welcomeScreen" - case .importedWallet: - return "importedWallet" - case .failedImportWallet: - return "failedImportWallet" - case .createdWallet: - return "createdWallet" - case .completedTransactionFromBrowser: - return "completedTransactionFromBrowser" - case .failedTransactionFromBrowser: - return "failedTransactionFromBrowser" - case .signedMessageFromBrowser: - return "signedMessageFromBrowser" - case .failedSignedMessageFromBrowser: - return "failedSignedMessageFromBrowser" - case .sentTransactionFromWallet: - return "sentTransactionFromWallet" - case .failedTransactionFromWallet: - return "failedTransactionFromWallet" - case .backedUpWallet: - return "backedUpWallet" - case .failedTrustRequest: - return "failedTrustRequest" - case .failedToExcludeFromBackup: - return "failedToExcludeFromBackup" - case .failedToLoadTrustPageProvider: - return "failedToLoadTrustPageProvider" - case .dataProtectionDisabled: - return "dataProtectionDisabled" - } - } - - var params: [String: Any] { - switch self { - case .welcomeScreen: - return [:] - case .importedWallet(let type): - return ["type": type.title] - case .failedImportWallet(let type, let error): - return ["type": type.title, "error": error.prettyError] - case .createdWallet: - return [:] - case .completedTransactionFromBrowser: - return [:] - case .failedTransactionFromBrowser: - return [:] - case .signedMessageFromBrowser: - return [:] - case .failedSignedMessageFromBrowser: - return [:] - case .sentTransactionFromWallet: - return [:] - case .failedTransactionFromWallet(let error): - return ["error": error.prettyError] - case .backedUpWallet: - return [:] - case .failedTrustRequest(let error): - return ["error": error.prettyError] - case .failedToExcludeFromBackup(let error): - return ["error": error.prettyError] - case .failedToLoadTrustPageProvider: - return [:] - case .dataProtectionDisabled: - return [:] - } - } -} diff --git a/Trust/Core/Initializers/FirebaseInitializer.swift b/Trust/Core/Initializers/FirebaseInitializer.swift deleted file mode 100644 index 609c201498..0000000000 --- a/Trust/Core/Initializers/FirebaseInitializer.swift +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright SIX DAY LLC. All rights reserved. - -import Foundation -import Firebase - -struct FirebaseInitializer: Initializer { - - func perform() { - guard !isDebug else { return } - - FirebaseApp.configure() - } -} diff --git a/Trust/Core/Initializers/SkipBackupFilesInitializer.swift b/Trust/Core/Initializers/SkipBackupFilesInitializer.swift index 8ed391e2ef..4c0671beaa 100644 --- a/Trust/Core/Initializers/SkipBackupFilesInitializer.swift +++ b/Trust/Core/Initializers/SkipBackupFilesInitializer.swift @@ -22,7 +22,6 @@ struct SkipBackupFilesInitializer: Initializer { try url.setResourceValue(false, forKey: .isUbiquitousItemKey) return true } catch let error { - Analytics.track(.failedToExcludeFromBackup(error)) return false } } diff --git a/Trust/Export/Coordinators/BackupCoordinator.swift b/Trust/Export/Coordinators/BackupCoordinator.swift index ef1f57a5f3..abce3f37bf 100644 --- a/Trust/Export/Coordinators/BackupCoordinator.swift +++ b/Trust/Export/Coordinators/BackupCoordinator.swift @@ -78,8 +78,6 @@ class BackupCoordinator: Coordinator { navigationController.present(activityViewController, animated: true) { [unowned self] in self.navigationController.hideLoading() } - // analytics event for successful backup - Analytics.track(.backedUpWallet) case .failure(let error): navigationController.hideLoading() navigationController.displayError(error: error) diff --git a/Trust/Tokens/Coordinators/TokensBalanceService.swift b/Trust/Tokens/Coordinators/TokensBalanceService.swift index 81083b07ff..be29fe4134 100644 --- a/Trust/Tokens/Coordinators/TokensBalanceService.swift +++ b/Trust/Tokens/Coordinators/TokensBalanceService.swift @@ -24,7 +24,6 @@ class TokensBalanceService { let biguint = BigUInt(Data(hex: balance)) completion(.success(BigInt(sign: .plus, magnitude: biguint))) case .failure(let error): - Analytics.track(.failedTrustRequest(error)) completion(.failure(AnyError(error))) } } @@ -40,7 +39,6 @@ class TokensBalanceService { case .success(let balance): completion(.success(balance)) case .failure(let error): - Analytics.track(.failedTrustRequest(error)) completion(.failure(AnyError(error))) } } diff --git a/Trust/Tokens/ViewModels/NewTokenViewModel.swift b/Trust/Tokens/ViewModels/NewTokenViewModel.swift index 90e355229b..487cba3c30 100644 --- a/Trust/Tokens/ViewModels/NewTokenViewModel.swift +++ b/Trust/Tokens/ViewModels/NewTokenViewModel.swift @@ -48,7 +48,6 @@ struct NewTokenViewModel { }.done { token in seal.fulfill(token) }.catch { error in - Analytics.track(.failedTrustRequest(error)) seal.reject(error) } } diff --git a/Trust/Tokens/ViewModels/NonFungibleTokenViewModel.swift b/Trust/Tokens/ViewModels/NonFungibleTokenViewModel.swift index 8e4ecb85cb..6b4684ac36 100644 --- a/Trust/Tokens/ViewModels/NonFungibleTokenViewModel.swift +++ b/Trust/Tokens/ViewModels/NonFungibleTokenViewModel.swift @@ -58,7 +58,6 @@ class NonFungibleTokenViewModel { self?.storage.add(tokens: tokens) seal.fulfill(tokens) }.catch { error in - Analytics.track(.failedTrustRequest(error)) seal.reject(error) } } diff --git a/Trust/Tokens/ViewModels/TokensViewModel.swift b/Trust/Tokens/ViewModels/TokensViewModel.swift index a1ca05c36d..1cc48d98c0 100644 --- a/Trust/Tokens/ViewModels/TokensViewModel.swift +++ b/Trust/Tokens/ViewModels/TokensViewModel.swift @@ -122,7 +122,7 @@ class TokensViewModel: NSObject { }.done { [weak self] balance in self?.store.update(balances: [TokensDataStore.etherToken().address: balance.value]) }.catch { error in - Analytics.track(.failedTrustRequest(error)) + NSLog("updateEthBalance \(error)") } } @@ -132,7 +132,7 @@ class TokensViewModel: NSObject { }.done { [weak self] tokens in self?.store.update(tokens: tokens, action: .updateInfo) }.catch { error in - Analytics.track(.failedTrustRequest(error)) + NSLog("tokensInfo \(error)") }.finally { [weak self] in guard let strongSelf = self else { return } let tokens = strongSelf.store.objects @@ -149,7 +149,7 @@ class TokensViewModel: NSObject { }.done { [weak self] tickers in self?.store.saveTickers(tickers: tickers) }.catch { error in - Analytics.track(.failedTrustRequest(error)) + NSLog("prices \(error)") }.finally { [weak self] in self?.delegate?.refresh() } diff --git a/Trust/Transfer/Coordinators/SendTransactionCoordinator.swift b/Trust/Transfer/Coordinators/SendTransactionCoordinator.swift index baebfab264..b4c2a04b44 100644 --- a/Trust/Transfer/Coordinators/SendTransactionCoordinator.swift +++ b/Trust/Transfer/Coordinators/SendTransactionCoordinator.swift @@ -40,12 +40,8 @@ class SendTransactionCoordinator { case .success(let count): let transaction = self.appendNonce(to: transaction, currentNonce: count) self.signAndSend(transaction: transaction, completion: completion) - // analytics event for succesfully sent transaction from wallet - Analytics.track(.sentTransactionFromWallet) case .failure(let error): completion(.failure(AnyError(error))) - // analytics event for failed sent transaction from wallet - Analytics.track(.failedTransactionFromWallet(error)) } } } diff --git a/Trust/Wallet/Coordinators/WalletCoordinator.swift b/Trust/Wallet/Coordinators/WalletCoordinator.swift index 6a09b7e8a6..9fb5a6dbe8 100644 --- a/Trust/Wallet/Coordinators/WalletCoordinator.swift +++ b/Trust/Wallet/Coordinators/WalletCoordinator.swift @@ -57,8 +57,6 @@ class WalletCoordinator: Coordinator { keystore.createAccount(with: password) { result in switch result { case .success(let account): - // analytics event for wallet successfully created - Analytics.track(.createdWallet) self.pushBackup(for: account) case .failure(let error): self.navigationController.displayError(error: error) diff --git a/Trust/Wallet/ViewControllers/ImportWalletViewController.swift b/Trust/Wallet/ViewControllers/ImportWalletViewController.swift index 474a275713..555a1ae944 100644 --- a/Trust/Wallet/ViewControllers/ImportWalletViewController.swift +++ b/Trust/Wallet/ViewControllers/ImportWalletViewController.swift @@ -199,12 +199,8 @@ class ImportWalletViewController: FormViewController { switch result { case .success(let account): self.didImport(account: account) - // analytics event for succesfully imported wallet - Analytics.track(.importedWallet(type)) case .failure(let error): self.displayError(error: error) - // analytics event for failed wallet import - Analytics.track(.failedImportWallet(type, error)) } } } diff --git a/Trust/Welcome/ViewControllers/WelcomeViewController.swift b/Trust/Welcome/ViewControllers/WelcomeViewController.swift index d5fd168e28..f1428d110a 100644 --- a/Trust/Welcome/ViewControllers/WelcomeViewController.swift +++ b/Trust/Welcome/ViewControllers/WelcomeViewController.swift @@ -73,8 +73,6 @@ class WelcomeViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() - Analytics.track(.welcomeScreen) - viewModel.numberOfPages = pages.count view.addSubview(collectionViewController.view)