Clearinstance added

hyperwallet · Mar 19, 2020 · ba1ca02 · ba1ca02
1 parent 04b4ecf
commit ba1ca02
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/Sources/HttpClient.swift b/Sources/HttpClient.swift
@@ -25,6 +25,10 @@ struct HttpClient {
         self.session = HttpClient.createUrlSession()
     }
 
+    func invalidateSession() {
+        session.invalidateAndCancel()
+    }
+
     func post(with url: String, httpBody: Data, completionHandler: @escaping (Data?, URLResponse?, Error?) -> Void) {
         if let url = URL(string: url) {
             var request = URLRequest(url: url)

diff --git a/Sources/Insights.swift b/Sources/Insights.swift
@@ -106,9 +106,13 @@ public final class Insights: InsightsProtocol {
         self.userToken = userToken
         visitId = UUID().uuidString
     }
-
-    deinit {
+    /// Clears Insights instance.
+    public static func clearInstance() {
+        if let httpClient = instance?.httpClient {
+            httpClient.invalidateSession()
+        }
         removeObserversForTrackingLifecycleEvents()
+        instance = nil
     }
 
     /// Set up the shared instance of the Insights framework
@@ -131,13 +135,15 @@ public final class Insights: InsightsProtocol {
                              sdkVersion: String,
                              apiUrl: String,
                              userToken: String) {
-        instance = Insights(environment: environment,
-                            programToken: programToken,
-                            sdkVersion: sdkVersion,
-                            apiUrl: apiUrl,
-                            userToken: userToken)
-
-        instance?.addObserversForTrackingLifecycleEvents()
+        if instance == nil {
+            instance = Insights(environment: environment,
+                                programToken: programToken,
+                                sdkVersion: sdkVersion,
+                                apiUrl: apiUrl,
+                                userToken: userToken)
+
+            addObserversForTrackingLifecycleEvents()
+        }
     }
 
     public func trackClick(pageName: String, pageGroup: String, link: String, params: [String: String]) {
@@ -168,7 +174,7 @@ public final class Insights: InsightsProtocol {
         }
     }
 
-    private func addObserversForTrackingLifecycleEvents() {
+    private static func addObserversForTrackingLifecycleEvents() {
         let application = UIApplication.shared
         NotificationCenter.default.addObserver(self,
                                                selector: #selector(didEnterBackground(_:)),
@@ -180,7 +186,7 @@ public final class Insights: InsightsProtocol {
                                                object: application)
     }
 
-    private func removeObserversForTrackingLifecycleEvents() {
+    private static func removeObserversForTrackingLifecycleEvents() {
         let application = UIApplication.shared
         NotificationCenter.default.removeObserver(self,
                                                   name: UIApplication.didEnterBackgroundNotification,

diff --git a/Tests/InsightsTests.swift b/Tests/InsightsTests.swift
@@ -13,6 +13,7 @@ final class InsightsTests: XCTestCase {
     override func setUp() {
         super.setUp()
         EventManager.shared.deleteEvents(before: Date().epochMilliseconds())
+        Insights.clearInstance()
         Insights.setup(environment: environment,
                        programToken: programToken,
                        sdkVersion: sdkVersion,