Merge branch 'fix/arithmetic_overflow_watchos' into develop

MaximeLM · Feb 3, 2021 · 221490e · 221490e
2 parents 132d5c7 + 0584f77
commit 221490e
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 43 deletions.
diff --git a/ATInternet-Apple-SDK-AppExtension.podspec b/ATInternet-Apple-SDK-AppExtension.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 	s.name = "ATInternet-Apple-SDK-AppExtension"
-	s.version = '2.22.2'
+	s.version = '2.22.3'
 	s.summary = "AT Internet mobile analytics solution for Apple devices"
 	s.homepage = "https://github.com/at-internet/atinternet-apple-sdk"
 	s.documentation_url	= 'https://developers.atinternet-solutions.com/apple-en/getting-started-apple-en/operating-principle-apple-en/'

diff --git a/ATInternet-Apple-SDK.podspec b/ATInternet-Apple-SDK.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 	s.name = "ATInternet-Apple-SDK"
-	s.version = '2.22.2'
+	s.version = '2.22.3'
 	s.summary = "AT Internet mobile analytics solution for Apple devices"
 	s.homepage = "https://github.com/at-internet/atinternet-apple-sdk"
 	s.documentation_url	= 'https://developers.atinternet-solutions.com/apple-en/getting-started-apple-en/operating-principle-apple-en/'

diff --git a/ATInternetTracker/Sources/AVMedia.swift b/ATInternetTracker/Sources/AVMedia.swift
@@ -53,8 +53,8 @@ public class AVMedia: RequiredPropertiesDataObject {
     fileprivate var currentCursorPositionMillis: Int = 0
     fileprivate var eventDurationMillis: Int = 0
     fileprivate var sessionDurationMillis: Int = 0
-    fileprivate var startSessionTimeMillis: Int = 0
-    fileprivate var bufferTimeMillis: Int = 0
+    fileprivate var startSessionTimeMillis: Int64 = 0
+    fileprivate var bufferTimeMillis: Int64 = 0
     fileprivate var heartbeatDurations: [Int:Int] = [Int:Int]()
     fileprivate var bufferHeartbeatDurations: [Int:Int] = [Int:Int]()
 
@@ -82,7 +82,7 @@ public class AVMedia: RequiredPropertiesDataObject {
             heartbeat(cursorPosition: -1, extraProps: nil)
 
             if self.autoHeartbeat {
-                let diffMin = (Int(Date().timeIntervalSince1970 * 1000) - self.startSessionTimeMillis) / 60000
+                let diffMin = Int((Int64(Date().timeIntervalSince1970 * 1000) - self.startSessionTimeMillis) / 60000)
                 if let duration = self.heartbeatDurations[diffMin] {
                     heartbeatTimer = Timer.scheduledTimer(timeInterval: TimeInterval(duration), target: self, selector: #selector(self.processAutoHeartbeat), userInfo: nil, repeats: false)
                 } else {
@@ -232,7 +232,7 @@ public class AVMedia: RequiredPropertiesDataObject {
 
     @objc public func heartbeat(cursorPosition: Int, extraProps: [String : Any]?) {
         self.avSynchronizer.sync {
-            self.startSessionTimeMillis = self.startSessionTimeMillis == 0 ? Int(Date().timeIntervalSince1970 * 1000) : self.startSessionTimeMillis
+            self.startSessionTimeMillis = self.startSessionTimeMillis == 0 ? Int64(Date().timeIntervalSince1970 * 1000) : self.startSessionTimeMillis
 
             self.updateDuration()
 
@@ -249,7 +249,7 @@ public class AVMedia: RequiredPropertiesDataObject {
 
     @objc public func bufferHeartbeat(extraProps: [String : Any]?) {
         self.avSynchronizer.sync {
-            self.startSessionTimeMillis = self.startSessionTimeMillis == 0 ? Int(Date().timeIntervalSince1970 * 1000) : self.startSessionTimeMillis
+            self.startSessionTimeMillis = self.startSessionTimeMillis == 0 ? Int64(Date().timeIntervalSince1970 * 1000) : self.startSessionTimeMillis
 
             self.updateDuration()
 
@@ -259,7 +259,7 @@ public class AVMedia: RequiredPropertiesDataObject {
 
     @objc public func rebufferHeartbeat(extraProps: [String : Any]?) {
         self.avSynchronizer.sync {
-            self.startSessionTimeMillis = self.startSessionTimeMillis == 0 ? Int(Date().timeIntervalSince1970 * 1000) : self.startSessionTimeMillis
+            self.startSessionTimeMillis = self.startSessionTimeMillis == 0 ? Int64(Date().timeIntervalSince1970 * 1000) : self.startSessionTimeMillis
 
             self.updateDuration()
 
@@ -271,7 +271,7 @@ public class AVMedia: RequiredPropertiesDataObject {
 
     @objc public func play(cursorPosition: Int, extraProps: [String : Any]?) {
         self.avSynchronizer.sync {
-            self.startSessionTimeMillis = self.startSessionTimeMillis == 0 ? Int(Date().timeIntervalSince1970 * 1000) : self.startSessionTimeMillis
+            self.startSessionTimeMillis = self.startSessionTimeMillis == 0 ? Int64(Date().timeIntervalSince1970 * 1000) : self.startSessionTimeMillis
 
             self.eventDurationMillis = 0
 
@@ -291,7 +291,7 @@ public class AVMedia: RequiredPropertiesDataObject {
 
     @objc public func bufferStart(cursorPosition: Int, extraProps: [String : Any]?) {
         self.avSynchronizer.sync {
-            self.startSessionTimeMillis = self.startSessionTimeMillis == 0 ? Int(Date().timeIntervalSince1970 * 1000) : self.startSessionTimeMillis
+            self.startSessionTimeMillis = self.startSessionTimeMillis == 0 ? Int64(Date().timeIntervalSince1970 * 1000) : self.startSessionTimeMillis
 
             self.updateDuration()
             self.previousCursorPositionMillis = self.currentCursorPositionMillis
@@ -301,8 +301,8 @@ public class AVMedia: RequiredPropertiesDataObject {
 
             if self.isPlaybackStartAlreadyCalled {
                 if self.autoBufferHeartbeat {
-                    self.bufferTimeMillis = self.bufferTimeMillis == 0 ? Int(Date().timeIntervalSince1970 * 1000) : self.bufferTimeMillis
-                    let diffMin = (Int(Date().timeIntervalSince1970 * 1000) - self.bufferTimeMillis) / 60000
+                    self.bufferTimeMillis = self.bufferTimeMillis == 0 ? Int64(Date().timeIntervalSince1970 * 1000) : self.bufferTimeMillis
+                    let diffMin = Int((Int64(Date().timeIntervalSince1970 * 1000) - self.bufferTimeMillis) / 60000)
                     if let duration = self.bufferHeartbeatDurations[diffMin] {
                         heartbeatTimer = Timer.scheduledTimer(timeInterval: TimeInterval(duration), target: self, selector: #selector(self.processAutoRebufferHeartbeat), userInfo: nil, repeats: false)
                     } else {
@@ -312,8 +312,8 @@ public class AVMedia: RequiredPropertiesDataObject {
                 sendEvents(events: createEvent(name: "av.rebuffer.start", withOptions: true, extraProps: extraProps))
             } else {
                 if self.autoBufferHeartbeat {
-                    self.bufferTimeMillis = self.bufferTimeMillis == 0 ? Int(Date().timeIntervalSince1970 * 1000) : self.bufferTimeMillis
-                    let diffMin = (Int(Date().timeIntervalSince1970 * 1000) - self.bufferTimeMillis) / 60000
+                    self.bufferTimeMillis = self.bufferTimeMillis == 0 ? Int64(Date().timeIntervalSince1970 * 1000) : self.bufferTimeMillis
+                    let diffMin = Int((Int64(Date().timeIntervalSince1970 * 1000) - self.bufferTimeMillis) / 60000)
                     if let duration = self.bufferHeartbeatDurations[diffMin] {
                         heartbeatTimer = Timer.scheduledTimer(timeInterval: TimeInterval(duration), target: self, selector: #selector(self.processAutoBufferHeartbeat), userInfo: nil, repeats: false)
                     } else {
@@ -327,7 +327,7 @@ public class AVMedia: RequiredPropertiesDataObject {
 
     @objc public func playbackStart(cursorPosition: Int, extraProps: [String : Any]?) {
         self.avSynchronizer.sync {
-            self.startSessionTimeMillis = self.startSessionTimeMillis == 0 ? Int(Date().timeIntervalSince1970 * 1000) : self.startSessionTimeMillis
+            self.startSessionTimeMillis = self.startSessionTimeMillis == 0 ? Int64(Date().timeIntervalSince1970 * 1000) : self.startSessionTimeMillis
 
             self.updateDuration()
 
@@ -341,7 +341,7 @@ public class AVMedia: RequiredPropertiesDataObject {
 
             stopHeartbeatTimer()
             if self.autoHeartbeat {
-                let diffMin = (Int(Date().timeIntervalSince1970 * 1000) - self.startSessionTimeMillis) / 60000
+                let diffMin = Int((Int64(Date().timeIntervalSince1970 * 1000) - self.startSessionTimeMillis) / 60000)
                 if let duration = self.heartbeatDurations[diffMin] {
                     heartbeatTimer = Timer.scheduledTimer(timeInterval: TimeInterval(duration), target: self, selector: #selector(self.processAutoHeartbeat), userInfo: nil, repeats: false)
                 } else {
@@ -354,7 +354,7 @@ public class AVMedia: RequiredPropertiesDataObject {
 
     @objc public func playbackResumed(cursorPosition: Int, extraProps: [String : Any]?) {
         self.avSynchronizer.sync {
-            self.startSessionTimeMillis = self.startSessionTimeMillis == 0 ? Int(Date().timeIntervalSince1970 * 1000) : self.startSessionTimeMillis
+            self.startSessionTimeMillis = self.startSessionTimeMillis == 0 ? Int64(Date().timeIntervalSince1970 * 1000) : self.startSessionTimeMillis
 
             self.updateDuration()
             self.previousCursorPositionMillis = self.currentCursorPositionMillis
@@ -366,7 +366,7 @@ public class AVMedia: RequiredPropertiesDataObject {
 
             stopHeartbeatTimer()
             if self.autoHeartbeat {
-                let diffMin = (Int(Date().timeIntervalSince1970 * 1000) - self.startSessionTimeMillis) / 60000
+                let diffMin = Int((Int64(Date().timeIntervalSince1970 * 1000) - self.startSessionTimeMillis) / 60000)
                 if let duration = self.heartbeatDurations[diffMin] {
                     heartbeatTimer = Timer.scheduledTimer(timeInterval: TimeInterval(duration), target: self, selector: #selector(self.processAutoHeartbeat), userInfo: nil, repeats: false)
                 } else {
@@ -379,7 +379,7 @@ public class AVMedia: RequiredPropertiesDataObject {
 
     @objc public func playbackPaused(cursorPosition: Int, extraProps: [String : Any]?) {
         self.avSynchronizer.sync {
-            self.startSessionTimeMillis = self.startSessionTimeMillis == 0 ? Int(Date().timeIntervalSince1970 * 1000) : self.startSessionTimeMillis
+            self.startSessionTimeMillis = self.startSessionTimeMillis == 0 ? Int64(Date().timeIntervalSince1970 * 1000) : self.startSessionTimeMillis
 
             self.updateDuration()
             self.previousCursorPositionMillis = self.currentCursorPositionMillis
@@ -396,7 +396,7 @@ public class AVMedia: RequiredPropertiesDataObject {
 
     @objc public func playbackStopped(cursorPosition: Int, extraProps: [String : Any]?) {
         self.avSynchronizer.sync {
-            self.startSessionTimeMillis = self.startSessionTimeMillis == 0 ? Int(Date().timeIntervalSince1970 * 1000) : self.startSessionTimeMillis
+            self.startSessionTimeMillis = self.startSessionTimeMillis == 0 ? Int64(Date().timeIntervalSince1970 * 1000) : self.startSessionTimeMillis
 
             self.updateDuration()
             self.previousCursorPositionMillis = self.currentCursorPositionMillis
@@ -528,14 +528,14 @@ public class AVMedia: RequiredPropertiesDataObject {
 
     @objc func processAutoHeartbeat() {
         self.avSynchronizer.sync {
-            self.startSessionTimeMillis = self.startSessionTimeMillis == 0 ? Int(Date().timeIntervalSince1970 * 1000) : self.startSessionTimeMillis
+            self.startSessionTimeMillis = self.startSessionTimeMillis == 0 ? Int64(Date().timeIntervalSince1970 * 1000) : self.startSessionTimeMillis
 
             self.updateDuration()
 
             self.previousCursorPositionMillis = self.currentCursorPositionMillis
             self.currentCursorPositionMillis += Int(Double(self.eventDurationMillis) * self._playbackSpeed)
 
-            let diffMin = (Int(Date().timeIntervalSince1970 * 1000) - self.startSessionTimeMillis) / 60000
+            let diffMin = Int((Int64(Date().timeIntervalSince1970 * 1000) - self.startSessionTimeMillis) / 60000)
             if let duration = self.heartbeatDurations[diffMin] {
                 heartbeatTimer = Timer.scheduledTimer(timeInterval: TimeInterval(duration), target: self, selector: #selector(self.processAutoHeartbeat), userInfo: nil, repeats: false)
             } else {
@@ -547,12 +547,12 @@ public class AVMedia: RequiredPropertiesDataObject {
 
     @objc func processAutoBufferHeartbeat() {
         self.avSynchronizer.sync {
-            self.startSessionTimeMillis = self.startSessionTimeMillis == 0 ? Int(Date().timeIntervalSince1970 * 1000) : self.startSessionTimeMillis
+            self.startSessionTimeMillis = self.startSessionTimeMillis == 0 ? Int64(Date().timeIntervalSince1970 * 1000) : self.startSessionTimeMillis
 
             self.updateDuration()
 
-            self.bufferTimeMillis = self.bufferTimeMillis == 0 ? Int(Date().timeIntervalSince1970 * 1000) : self.bufferTimeMillis
-            let diffMin = (Int(Date().timeIntervalSince1970 * 1000) - self.bufferTimeMillis) / 60000
+            self.bufferTimeMillis = self.bufferTimeMillis == 0 ? Int64(Date().timeIntervalSince1970 * 1000) : self.bufferTimeMillis
+            let diffMin = Int((Int64(Date().timeIntervalSince1970 * 1000) - self.bufferTimeMillis) / 60000)
             if let duration = self.bufferHeartbeatDurations[diffMin] {
                 heartbeatTimer = Timer.scheduledTimer(timeInterval: TimeInterval(duration), target: self, selector: #selector(self.processAutoBufferHeartbeat), userInfo: nil, repeats: false)
             } else {
@@ -564,14 +564,14 @@ public class AVMedia: RequiredPropertiesDataObject {
 
     @objc func processAutoRebufferHeartbeat() {
         self.avSynchronizer.sync {
-            self.startSessionTimeMillis = self.startSessionTimeMillis == 0 ? Int(Date().timeIntervalSince1970 * 1000) : self.startSessionTimeMillis
+            self.startSessionTimeMillis = self.startSessionTimeMillis == 0 ? Int64(Date().timeIntervalSince1970 * 1000) : self.startSessionTimeMillis
 
             self.updateDuration()
 
             self.previousCursorPositionMillis = self.currentCursorPositionMillis
 
-            self.bufferTimeMillis = self.bufferTimeMillis == 0 ? Int(Date().timeIntervalSince1970 * 1000) : self.bufferTimeMillis
-            let diffMin = (Int(Date().timeIntervalSince1970 * 1000) - self.bufferTimeMillis) / 60000
+            self.bufferTimeMillis = self.bufferTimeMillis == 0 ? Int64(Date().timeIntervalSince1970 * 1000) : self.bufferTimeMillis
+            let diffMin = Int((Int64(Date().timeIntervalSince1970 * 1000) - self.bufferTimeMillis) / 60000)
             if let duration = self.bufferHeartbeatDurations[diffMin] {
                 heartbeatTimer = Timer.scheduledTimer(timeInterval: TimeInterval(duration), target: self, selector: #selector(self.processAutoRebufferHeartbeat), userInfo: nil, repeats: false)
             } else {
@@ -604,7 +604,7 @@ public class AVMedia: RequiredPropertiesDataObject {
     }
 
     private func updateDuration() {
-        self.eventDurationMillis = Int(Date().timeIntervalSince1970 * 1000) - self.startSessionTimeMillis - self.sessionDurationMillis
+        self.eventDurationMillis = Int(Int64(Date().timeIntervalSince1970 * 1000) - self.startSessionTimeMillis) - self.sessionDurationMillis
         self.sessionDurationMillis += self.eventDurationMillis
     }
 

diff --git a/ATInternetTracker/Sources/Info-iOS-Extension.plist b/ATInternetTracker/Sources/Info-iOS-Extension.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.22.2</string>
+	<string>2.22.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/ATInternetTracker/Sources/Info-iOS.plist b/ATInternetTracker/Sources/Info-iOS.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.22.2</string>
+	<string>2.22.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/ATInternetTracker/Sources/Info-tvOS.plist b/ATInternetTracker/Sources/Info-tvOS.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.19.2</string>
+	<string>1.19.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/ATInternetTracker/Sources/Info-watchOS.plist b/ATInternetTracker/Sources/Info-watchOS.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.19.2</string>
+	<string>1.19.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/ATInternetTracker/Sources/Privacy.swift b/ATInternetTracker/Sources/Privacy.swift
@@ -94,7 +94,7 @@ public class Privacy: NSObject {
             userDefaults.removeObject(forKey: IdentifiedVisitorHelperKey.category.rawValue)
         }
         userDefaults.setValue(visitorMode.rawValue, forKey: PrivacyModeKey)
-        userDefaults.setValue((Int(Date().timeIntervalSince1970) * 1000) + (duration * 86400000), forKey: PrivacyModeExpirationTimestampKey)
+        userDefaults.setValue(Int64(Date().timeIntervalSince1970 * 1000) + Int64(duration * 86400000), forKey: PrivacyModeExpirationTimestampKey)
         userDefaults.synchronize()
     }
 
@@ -105,11 +105,12 @@ public class Privacy: NSObject {
      */
     public class func getVisitorMode() -> VisitorMode {
         let userDefaults = UserDefaults.standard
-        let privacyModeExpirationTs = userDefaults.integer(forKey: PrivacyModeExpirationTimestampKey)
-        if ((Int(Date().timeIntervalSince1970) * 1000) >= privacyModeExpirationTs) {
-            userDefaults.setValue(VisitorMode.none.rawValue, forKey: PrivacyModeKey)
-            userDefaults.setValue(-1, forKey: PrivacyModeExpirationTimestampKey)
-            userDefaults.synchronize()
+        if let privacyModeExpirationTs = userDefaults.object(forKey: PrivacyModeExpirationTimestampKey) as? Int64 {
+            if (Int64(Date().timeIntervalSince1970 * 1000) >= privacyModeExpirationTs) {
+                userDefaults.setValue(VisitorMode.none.rawValue, forKey: PrivacyModeKey)
+                userDefaults.setValue(-1, forKey: PrivacyModeExpirationTimestampKey)
+                userDefaults.synchronize()
+            }
         }
         return VisitorMode.init(rawValue: userDefaults.string(forKey: PrivacyModeKey) ?? VisitorMode.none.rawValue) ?? VisitorMode.none
     }

diff --git a/ATInternetTracker/Sources/Sender.swift b/ATInternetTracker/Sources/Sender.swift
@@ -252,7 +252,7 @@ class Sender: Operation {
                             // Si le hit provient du stockage et que l'envoi a réussi, on le supprime de la base
                             if(self.hit.isOffline) {
                                 OfflineHit.sentWithSuccess = true
-                                _ = db.delete(self.hit.url)
+                                _ = db.delete(self.hit.id)
                             }
 
                             self.tracker.delegate?.sendDidEnd?(HitStatus.success, message: self.hit.url)

diff --git a/ATInternetTracker/Sources/TechnicalContext.swift b/ATInternetTracker/Sources/TechnicalContext.swift
@@ -53,9 +53,9 @@ class TechnicalContext: NSObject {
     class var sdkVersion: String {
         get {
             #if os(watchOS) || os(tvOS)
-            return "1.19.2"
+            return "1.19.3"
             #else
-            return "2.22.2"
+            return "2.22.3"
             #endif
         }
     }

diff --git a/ATInternetTracker/Tests/Info-iOS.plist b/ATInternetTracker/Tests/Info-iOS.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.22.2</string>
+	<string>2.22.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>