Switch to old amplitude version due to leaking

SubvertDev · SubvertDev · commit 3eb3da9dbcad · 2023-09-09T21:10:33.000+03:00
diff --git a/ForPDA.xcodeproj/project.pbxproj b/ForPDA.xcodeproj/project.pbxproj
@@ -18,9 +18,9 @@
 		B8001CDA2A1AA0FE00E7A8A8 /* CookiesService.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8001CD92A1AA0FE00E7A8A8 /* CookiesService.swift */; };
 		B8001CDC2A1ADD4000E7A8A8 /* Cookie.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8001CDB2A1ADD4000E7A8A8 /* Cookie.swift */; };
 		B8001CDF2A1B01D000E7A8A8 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8001CDE2A1B01D000E7A8A8 /* User.swift */; };
+		B802964F2AACE50C00D5B413 /* Amplitude in Frameworks */ = {isa = PBXBuildFile; productRef = B802964E2AACE50C00D5B413 /* Amplitude */; };
 		B809925B293CBF5C0053202C /* SnapKit in Frameworks */ = {isa = PBXBuildFile; productRef = B809925A293CBF5C0053202C /* SnapKit */; };
 		B82B2EB32A87D58D00CB067C /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = B82B2EB22A87D58D00CB067C /* Sentry */; };
-		B82B2EB62A87D5F200CB067C /* AmplitudeSwift in Frameworks */ = {isa = PBXBuildFile; productRef = B82B2EB52A87D5F200CB067C /* AmplitudeSwift */; };
 		B82B2EBE2A89016300CB067C /* Secrets.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82B2EBD2A89016300CB067C /* Secrets.swift */; };
 		B82B2EC12A89059C00CB067C /* AppScheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82B2EC02A89059C00CB067C /* AppScheme.swift */; };
 		B82EFA252A896CBD00C8B2AC /* RouteComposer in Frameworks */ = {isa = PBXBuildFile; productRef = B82EFA242A896CBD00C8B2AC /* RouteComposer */; };
@@ -301,14 +301,14 @@
 				B8D3521B293CBE46008A84EA /* SwiftSoup in Frameworks */,
 				B83E8AC5294A75DA000D59E7 /* SwiftyGif in Frameworks */,
 				B8BD2D79293E1C3F00E12E29 /* MarqueeLabel in Frameworks */,
-				B82B2EB62A87D5F200CB067C /* AmplitudeSwift in Frameworks */,
 				B8BD2D85293E242200E12E29 /* SwipeCellKit in Frameworks */,
 				B82EFA252A896CBD00C8B2AC /* RouteComposer in Frameworks */,
 				B89301192947CF5500D14141 /* SwiftRichString in Frameworks */,
 				B8495D42294CCE1E00F60171 /* SwiftMessages in Frameworks */,
 				B82B2EB32A87D58D00CB067C /* Sentry in Frameworks */,
 				B84CCC52294A6EDA0001EB24 /* Nuke in Frameworks */,
 				B88D3F592A098C600061C6C4 /* SFSafeSymbols in Frameworks */,
+				B802964F2AACE50C00D5B413 /* Amplitude in Frameworks */,
 				B8B55B022A07C948008C93D3 /* Factory in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -815,8 +815,8 @@
 				B8B55B012A07C948008C93D3 /* Factory */,
 				B88D3F582A098C600061C6C4 /* SFSafeSymbols */,
 				B82B2EB22A87D58D00CB067C /* Sentry */,
-				B82B2EB52A87D5F200CB067C /* AmplitudeSwift */,
 				B82EFA242A896CBD00C8B2AC /* RouteComposer */,
+				B802964E2AACE50C00D5B413 /* Amplitude */,
 			);
 			productName = ForPDA;
 			productReference = B8D351F5293CABB6008A84EA /* ForPDA.app */;
@@ -867,8 +867,8 @@
 				B8B55B002A07C948008C93D3 /* XCRemoteSwiftPackageReference "Factory" */,
 				B88D3F572A098C600061C6C4 /* XCRemoteSwiftPackageReference "SFSafeSymbols" */,
 				B82B2EB12A87D58D00CB067C /* XCRemoteSwiftPackageReference "sentry-cocoa" */,
-				B82B2EB42A87D5F200CB067C /* XCRemoteSwiftPackageReference "Amplitude-Swift" */,
 				B82EFA232A896CBD00C8B2AC /* XCRemoteSwiftPackageReference "route-composer" */,
+				B802964D2AACE50C00D5B413 /* XCRemoteSwiftPackageReference "Amplitude-iOS" */,
 			);
 			productRefGroup = B8D351F6293CABB6008A84EA /* Products */;
 			projectDirPath = "";
@@ -1477,6 +1477,14 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
+		B802964D2AACE50C00D5B413 /* XCRemoteSwiftPackageReference "Amplitude-iOS" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/amplitude/Amplitude-iOS";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 8.17.1;
+			};
+		};
 		B8099259293CBF5C0053202C /* XCRemoteSwiftPackageReference "SnapKit" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/SnapKit/SnapKit.git";
@@ -1493,14 +1501,6 @@
 				minimumVersion = 8.9.4;
 			};
 		};
-		B82B2EB42A87D5F200CB067C /* XCRemoteSwiftPackageReference "Amplitude-Swift" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/amplitude/Amplitude-Swift.git";
-			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 0.4.11;
-			};
-		};
 		B82EFA232A896CBD00C8B2AC /* XCRemoteSwiftPackageReference "route-composer" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/ekazaev/route-composer";
@@ -1600,6 +1600,11 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
+		B802964E2AACE50C00D5B413 /* Amplitude */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = B802964D2AACE50C00D5B413 /* XCRemoteSwiftPackageReference "Amplitude-iOS" */;
+			productName = Amplitude;
+		};
 		B809925A293CBF5C0053202C /* SnapKit */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = B8099259293CBF5C0053202C /* XCRemoteSwiftPackageReference "SnapKit" */;
@@ -1610,11 +1615,6 @@
 			package = B82B2EB12A87D58D00CB067C /* XCRemoteSwiftPackageReference "sentry-cocoa" */;
 			productName = Sentry;
 		};
-		B82B2EB52A87D5F200CB067C /* AmplitudeSwift */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = B82B2EB42A87D5F200CB067C /* XCRemoteSwiftPackageReference "Amplitude-Swift" */;
-			productName = AmplitudeSwift;
-		};
 		B82EFA242A896CBD00C8B2AC /* RouteComposer */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = B82EFA232A896CBD00C8B2AC /* XCRemoteSwiftPackageReference "route-composer" */;
diff --git a/ForPDA.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ForPDA.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/ForPDA.xcodeproj/xcshareddata/xcschemes/ForPDA.xcscheme b/ForPDA.xcodeproj/xcshareddata/xcschemes/ForPDA.xcscheme
@@ -68,29 +68,11 @@
             ReferencedContainer = "container:ForPDA.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <CommandLineArguments>
-         <CommandLineArgument
-            argument = "-FIRAnalyticsDebugEnabled"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-FIRDebugEnabled"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-FIRAnalyticsDebugDisabled"
-            isEnabled = "NO">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "-FIRDebugDisabled"
-            isEnabled = "NO">
-         </CommandLineArgument>
-      </CommandLineArguments>
       <EnvironmentVariables>
          <EnvironmentVariable
             key = "OS_ACTIVITY_MODE"
             value = "${DEBUG_ACTIVITY_MODE}"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </EnvironmentVariable>
       </EnvironmentVariables>
    </LaunchAction>
diff --git a/ForPDA/Sources/Application/AppDelegate.swift b/ForPDA/Sources/Application/AppDelegate.swift
@@ -8,29 +8,21 @@
 import UIKit
 import SnapKit
 import Factory
+import Amplitude
 import Sentry
 import Nuke
 import RouteComposer
 
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
     
-    @Injected(\.networkService) private var networkService
     @Injected(\.settingsService) private var settingsService
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-                
-        SentrySDK.start { options in
-            options.dsn = Secrets.for(key: .SENTRY_DSN)
-            options.debug = AppScheme.isDebug
-            options.enabled = !AppScheme.isDebug
-            options.tracesSampleRate = 1.0
-            options.diagnosticLevel = .warning
-            options.attachScreenshot = true
-        }
-        
-        ImagePipeline.shared = ImagePipeline(configuration: .withDataCache)
         
+        configureAmplitude()
+        configureSentry()
+        configureNuke()
         configureCookies()
         
         return true
@@ -44,10 +36,38 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
 }
 
-// MARK: - Cookies
+// MARK: - Configuration
 
 extension AppDelegate {
     
+    // MARK: Amplitude
+    
+    private func configureAmplitude() {
+        Amplitude.instance().defaultTracking.sessions = true
+        Amplitude.instance().initializeApiKey(Secrets.for(key: .AMPLITUDE_TOKEN))
+    }
+    
+    // MARK: Sentry
+    
+    private func configureSentry() {
+        SentrySDK.start { options in
+            options.dsn = Secrets.for(key: .SENTRY_DSN)
+            options.debug = AppScheme.isDebug
+            options.enabled = !AppScheme.isDebug
+            options.tracesSampleRate = 1.0
+            options.diagnosticLevel = .warning
+            options.attachScreenshot = true
+        }
+    }
+    
+    // MARK: Nuke
+
+    private func configureNuke() {
+        ImagePipeline.shared = ImagePipeline(configuration: .withDataCache)
+    }
+    
+    // MARK: Cookies
+    
     func configureCookies() {
         // We need 3 cookies to authorize: anonymous, member_id, pass_hash
         // There's also __fixmid cookie, but it lasts for a second and then removed
diff --git a/ForPDA/Sources/Services/Analytics/AnalyticsService.swift b/ForPDA/Sources/Services/Analytics/AnalyticsService.swift
@@ -7,35 +7,27 @@
 //  swiftlint:disable nesting
 
 import Foundation
-import AmplitudeSwift
+import Amplitude
 
 final class AnalyticsService {
     
     typealias EventDictionary = [String: String]
     
-    private let amplitude = Amplitude(configuration: Configuration(
-        apiKey: Secrets.for(key: .AMPLITUDE_TOKEN),
-        logLevel: .WARN,
-        serverZone: .EU
-    ))
-    
     let isDebug: Bool
     
     init(isDebug: Bool = false) {
         self.isDebug = isDebug
-        amplitude.configuration.optOut = isDebug
     }
     
     // MARK: - Generic Event
     
     private func event(_ name: AnalyticsEvent, parameters: EventDictionary?) {
         guard !isDebug else { return }
-        let event = BaseEvent(
-            eventType: name.rawValue,
-            eventProperties: parameters
-        )
         
-        amplitude.track(event: event)
+        Amplitude.instance().logEvent(
+            name.rawValue,
+            withEventProperties: parameters
+        )
     }
     
     // MARK: - Parameters Cases
diff --git a/ForPDA/Sources/Services/Container.swift b/ForPDA/Sources/Services/Container.swift
@@ -20,9 +20,7 @@ extension Container {
     }
     
     var analyticsService: Factory<AnalyticsService> {
-        Factory(self) { AnalyticsService() }
-            .onDebug { AnalyticsService(isDebug: AppScheme.isDebug) }
-            .singleton
+        Factory(self) { AnalyticsService(isDebug: AppScheme.isDebug) }
     }
     
     var settingsService: Factory<SettingsService> {

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,7 @@ extension Container {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`var analyticsService: Factory<AnalyticsService> {`
`23`		`- Factory(self) { AnalyticsService() }`
`24`		`- .onDebug { AnalyticsService(isDebug: AppScheme.isDebug) }`
`25`		`- .singleton`
	`23`	`+ Factory(self) { AnalyticsService(isDebug: AppScheme.isDebug) }`
`26`	`24`	`}`
`27`	`25`
`28`	`26`	`var settingsService: Factory<SettingsService> {`