refactor: merge storages

OptimoveCore/Sources/Classes/Extension/Bundle+HostApp.swift

@@ -2,17 +2,28 @@
 
 import Foundation
 
-public extension Bundle {
+extension Bundle {
+    /// Returns the bundle containing the host app.
     /// https://stackoverflow.com/a/27849695
-    static func hostAppBundle() -> Bundle? {
+    static func hostAppBundle() -> Bundle {
         let mainBundle = Bundle.main
         if mainBundle.bundleURL.pathExtension == "appex" {
-            // Peel off two directory levels - SOME_APP.app/PlugIns/SOME_APP_EXTENSION.appex
+            // Peel off two directory levels - APP.app/PlugIns/APP_EXTENSION.appex
             let url = mainBundle.bundleURL.deletingLastPathComponent().deletingLastPathComponent()
             if let hostBundle = Bundle(url: url) {
                 return hostBundle
             }
         }
         return mainBundle
     }
+
+    /// Returns the bundle identifier of the host app.
+    static var hostAppBundleIdentifier: String {
+        return hostAppBundle().bundleIdentifier!
+    }
+
+    /// Returns the app group identifier for the SDK app.
+    static var optimoveAppGroupIdentifier: String {
+        return "group.\(hostAppBundleIdentifier).optimove"
+    }
 }

OptimoveCore/Sources/Classes/Extension/utsname+DeviceModel.swift

@@ -2,7 +2,7 @@
 
 import Foundation
 
-public extension utsname {
+extension utsname {
     var deviceModel: String {
         var systemInfo = self
         uname(&systemInfo)

OptimoveCore/Sources/Classes/MediaHelper.swift

@@ -0,0 +1,36 @@
+//  Copyright © 2022 Optimove. All rights reserved.
+
+import Foundation
+
+public struct MediaHelper {
+    enum Error: LocalizedError {
+        case noMediaUrlFound
+        case invalidPictureUrl(String)
+    }
+
+    let storage: KeyValueStorage
+
+    public init(storage: KeyValueStorage) {
+        self.storage = storage
+    }
+
+    public func getCompletePictureUrl(pictureUrlString: String, width: UInt) throws -> URL {
+        if pictureUrlString.hasPrefix("https://") || pictureUrlString.hasPrefix("http://") {
+            guard let url = URL(string: pictureUrlString) else {
+                throw Error.invalidPictureUrl(pictureUrlString)
+            }
+            return url
+        }
+
+        guard let mediaUrl: String = storage[.mediaURL] else {
+            throw Error.noMediaUrlFound
+        }
+
+        let urlString = "\(mediaUrl)/\(width)x/\(pictureUrlString)"
+        guard let url = URL(string: urlString) else {
+            throw Error.invalidPictureUrl(urlString)
+        }
+
+        return url
+    }
+}

OptimobileShared/OptimobileEvent.swift → OptimoveCore/Sources/Classes/OptimobileEvent.swift

@@ -1,6 +1,6 @@
 //  Copyright © 2023 Optimove. All rights reserved.
 
-enum OptimobileEvent: String, Codable {
+public enum OptimobileEvent: String, Codable {
     case DEEP_LINK_MATCHED = "k.deepLink.matched"
     case DEVICE_UNSUBSCRIBED = "k.push.deviceUnsubscribed"
     case ENGAGE_BEACON_ENTERED_PROXIMITY = "k.engage.beaconEnteredProximity"

OptimoveCore/Sources/Classes/OptimobileHelper.swift

@@ -0,0 +1,55 @@
+//  Copyright © 2022 Optimove. All rights reserved.
+
+import Foundation
+
+public struct OptimobileHelper {
+    static let installIdLock = DispatchSemaphore(value: 1)
+    public static let userIdLock = DispatchSemaphore(value: 1)
+
+    let storage: KeyValueStorage
+
+    public init(storage: KeyValueStorage) {
+        self.storage = storage
+    }
+
+    public func installId() -> String {
+        OptimobileHelper.installIdLock.wait()
+        defer {
+            OptimobileHelper.installIdLock.signal()
+        }
+
+        if let existingID: String = storage[.installUUID] {
+            return existingID
+        }
+
+        let newID = UUID().uuidString
+        storage.set(value: newID, key: .installUUID)
+        return newID
+    }
+
+    /**
+      Returns the identifier for the user currently associated with the Kumulos installation record
+
+      If no user is associated, it returns the Kumulos installation ID
+     */
+    public func currentUserIdentifier() -> String {
+        OptimobileHelper.userIdLock.wait()
+        defer { OptimobileHelper.userIdLock.signal() }
+        if let userId: String = storage[.userID] {
+            return userId
+        }
+
+        return installId()
+    }
+
+    public func getBadge(notification: PushNotification) -> Int? {
+        if let incrementBy = notification.badgeIncrement,
+           let current: Int = storage[.badgeCount]
+        {
+            let badge = current + incrementBy
+            return badge < 0 ? 0 : badge
+        }
+
+        return notification.aps.badge
+    }
+}

OptimobileShared/OptimobileUserDefaultsKey.swift → OptimoveCore/Sources/Classes/OptimobileUserDefaultsKey.swift

@@ -2,17 +2,14 @@
 
 import Foundation
 
-enum OptimobileUserDefaultsKey: String {
+public enum OptimobileUserDefaultsKey: String, CaseIterable {
     case REGION = "KumulosEventsRegion"
     case MEDIA_BASE_URL = "KumulosMediaBaseUrl"
     case INSTALL_UUID = "KumulosUUID"
     case USER_ID = "KumulosCurrentUserID"
     case BADGE_COUNT = "KumulosBadgeCount"
     case PENDING_NOTIFICATIONS = "KumulosPendingNotifications"
     case PENDING_ANALYTICS = "KumulosPendingAnalytics"
-
-    // exist only in standard defaults for app
-    case MIGRATED_TO_GROUPS = "KumulosDidMigrateToAppGroups"
     case IN_APP_LAST_SYNCED_AT = "KumulosMessagesLastSyncedAt"
     case IN_APP_MOST_RECENT_UPDATED_AT = "KumulosInAppMostRecentUpdatedAt"
     case IN_APP_CONSENTED = "KumulosInAppConsented"