adding changes which is present in rename-sdk branch and in interna…

…l clickstream

Clickstream.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "Clickstream"
-  s.version          = "2.0.12"
+  s.version          = "2.0.13"
   s.summary          = "Real time Analytics SDK"
   s.description      = "Clickstream is an event agnostic, real-time data ingestion analytics SDK"
 
@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
   s.frameworks    = "UIKit", "Foundation", "CoreTelephony"
   s.dependency    "SwiftProtobuf", "~> 1.10"
   s.dependency    "ReachabilitySwift", "~> 5.0"
-  s.dependency    "GRDB.swift", "~> 5.12"
+  s.dependency    "GRDB.swift", "~> 6.7"
 
   s.default_subspec  = 'Core'
 

LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2016 Ashley Mills
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

Podfile.lock

@@ -24,4 +24,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 2c97fb10dcb1fcd309b15a9c7e84ddc137998638
 
-COCOAPODS: 1.12.0
+COCOAPODS: 1.12.1

Sources/Clickstream/Core/Interface/ClickStream.swift

@@ -107,6 +107,8 @@ public final class Clickstream {
 
     static var updateConnectionStatus: Bool = false
 
+    static var timerCrashFixFlag: Bool = false
+
     /// Use this property to pass application name without any space or special characters.
     static var appPrefix: String = ""
 
@@ -167,6 +169,7 @@ public final class Clickstream {
                                                      eventClassification: ClickstreamEventClassification,
                                                      delegate: ClickstreamDelegate? = nil,
                                                      updateConnectionStatus: Bool = false,
+                                                     timerCrashFixFlag: Bool = false,
                                                      appPrefix: String) throws -> Clickstream? {
         do {
             return try initializeClickstream(
@@ -175,6 +178,7 @@ public final class Clickstream {
                 eventClassification: eventClassification,
                 delegate: delegate,
                 updateConnectionStatus: updateConnectionStatus,
+                timerCrashFixFlag: timerCrashFixFlag,
                 appPrefix: appPrefix)
         } catch {
             print("Cannot initialise Clickstream. Dependencies could not be initialised.",.critical)
@@ -188,6 +192,7 @@ public final class Clickstream {
                                                      eventClassification: ClickstreamEventClassification,
                                                      delegate: ClickstreamDelegate? = nil,
                                                      updateConnectionStatus: Bool = false,
+                                                     timerCrashFixFlag: Bool = false,
                                                      appPrefix: String) throws -> Clickstream? {
         do {
             return try initializeClickstream(
@@ -196,6 +201,7 @@ public final class Clickstream {
                 eventClassification: eventClassification,
                 delegate: delegate,
                 updateConnectionStatus: updateConnectionStatus,
+                timerCrashFixFlag: timerCrashFixFlag,
                 appPrefix: appPrefix)
         } catch {
             print("Cannot initialise Clickstream. Dependencies could not be initialised.",.critical)
@@ -210,6 +216,7 @@ public final class Clickstream {
                                       eventClassification: ClickstreamEventClassification,
                                       delegate: ClickstreamDelegate? = nil,
                                       updateConnectionStatus: Bool = false,
+                                      timerCrashFixFlag: Bool = false,
                                       appPrefix: String) throws -> Clickstream? {
         let semaphore = DispatchSemaphore(value: 1)
         defer {
@@ -223,6 +230,7 @@ public final class Clickstream {
             Clickstream.configurations = configurations
             Clickstream.eventClassifier = eventClassification
             Clickstream.updateConnectionStatus = updateConnectionStatus
+            Clickstream.timerCrashFixFlag = timerCrashFixFlag
             Clickstream.appPrefix = appPrefix.lowercased().replacingOccurrences(of: " ", with: "")
 
             // All the dependency injections pertaining to the clickstream blocks happen here!

Sources/Clickstream/NetworkManager/Infrastructure/Utilities/DispatchSourceTimer+RepeatingTimer.swift

@@ -14,7 +14,13 @@ import Foundation
 /// already resumed (noted by https://github.com/SiftScience/sift-ios/issues/52)
 class RepeatingTimer {
 
-    let timeInterval: TimeInterval
+    static let shared = RepeatingTimer()
+
+    var timeInterval: TimeInterval = 0
+
+    private var suspensionCount = 0
+
+    private init() { }
 
     init(timeInterval: TimeInterval) {
         self.timeInterval = timeInterval
@@ -53,19 +59,33 @@ class RepeatingTimer {
         if state.value == .resumed {
             return
         }
+        suspensionCount -= 1
         state.mutate { state in
             state = .resumed
         }
-        timer.resume()
+        if Clickstream.timerCrashFixFlag {
+            if suspensionCount > 0 {
+                self.timer.resume()
+            }
+        } else {
+            timer.resume()
+        }
     }
 
     func suspend() {
         if state.value == .suspended {
             return
         }
+        suspensionCount += 1
         state.mutate { state in
             state = .suspended
         }
-        timer.suspend()
+        if Clickstream.timerCrashFixFlag {
+            if suspensionCount > 0 {
+                timer.suspend()
+            }
+        } else {
+            timer.suspend()
+        }
     }
 }

Sources/Clickstream/NetworkManager/Infrastructure/Utilities/KeepAliveService.swift

@@ -89,15 +89,28 @@ final class DefaultKeepAliveServiceWithSafeTimer: KeepAliveService {
 
     @discardableResult
     private func makeTimer() -> RepeatingTimer? {
-        let timerDuration = duration*reachability.connectionRetryCoefficient
-        timer = RepeatingTimer(timeInterval: timerDuration)
-        timer?.eventHandler = { [weak self] in
-            guard let checkedSelf = self else { return }
-            checkedSelf.performQueue.async {
-                checkedSelf.subscriber?()
+        if Clickstream.timerCrashFixFlag {
+            let timerDuration = duration*reachability.connectionRetryCoefficient
+            RepeatingTimer.shared.timeInterval = timerDuration
+            self.timer = RepeatingTimer.shared
+            timer?.eventHandler = { [weak self] in
+                guard let checkedSelf = self else { return }
+                checkedSelf.performQueue.async {
+                    checkedSelf.subscriber?()
+                }
+            }
+            return timer
+        } else {
+            let timerDuration = duration*reachability.connectionRetryCoefficient
+            self.timer = RepeatingTimer(timeInterval: timerDuration)
+            timer?.eventHandler = { [weak self] in
+                guard let checkedSelf = self else { return }
+                checkedSelf.performQueue.async {
+                    checkedSelf.subscriber?()
+                }
             }
+            return timer
         }
-        return timer
     }
 
     func stop() {

Sources/EventVisualizer/src/EventDetails/EventDetailsViewModel.swift

@@ -8,6 +8,7 @@
 
 import Foundation
 import SwiftProtobuf
+import UIKit
 
 protocol EventDetailsModelInput: AnyObject {
 

Sources/EventVisualizer/src/Helpers/CollectionMapper.swift

@@ -41,7 +41,7 @@ public extension CollectionMapper {
     func flattenRec(output: inout [String: Any], keyPath: String, value: Any) {
         if let dict = value as? [String: Any] {
             dict.forEach { key, value in
-                let calculatedKey = "\(keyPath).\(key)".replacingOccurrences(of: "_", with: "")
+                let calculatedKey = "\(keyPath).\(key)".replacingOccurrences(of: "_", with: "").replacingOccurrences(of: "storage.", with: "")
                 flattenRec(output: &output, keyPath: calculatedKey, value: value)
             }
         } else {

Sources/EventVisualizer/src/Helpers/EventsHelper.swift

@@ -91,7 +91,9 @@ extension EventsHelper: EventStateViewable {
     ///   - eventBatch: this is the eventBatchGuid for a particular event batch
     ///   - state: this is the state in which the event is in
     public func updateStatus(providedEventGuid: String? = nil, eventBatchID eventBatch: String? = nil, state: EventState) {
-        if let providedEventGuid = providedEventGuid, let foundIndex = indexOfEvent(with: providedEventGuid) {
+        if let providedEventGuid = providedEventGuid,
+            let foundIndex = indexOfEvent(with: providedEventGuid),
+            foundIndex < EventsHelper.shared.eventsCaptured.count {
 
             EventsHelper.shared.eventsCaptured[foundIndex].state = state
             if let eventBatch = eventBatch {
@@ -100,7 +102,9 @@ extension EventsHelper: EventStateViewable {
         } else if let eventBatch = eventBatch {
             let foundIndexs = indexOfEventBatch(with: eventBatch)
             for eventIndex in foundIndexs {
-                EventsHelper.shared.eventsCaptured[eventIndex].state = state
+                if eventIndex < EventsHelper.shared.eventsCaptured.count {
+                    EventsHelper.shared.eventsCaptured[eventIndex].state = state
+                }
             }
         }
     }