[5.0.0] Push subscription related fixes (3)

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSIdentityOperationExecutor.swift

@@ -193,7 +193,7 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
                         return
                     }
                     // The subscription has been deleted along with the user, so remove the subscription_id but keep the same push subscription model
-                    OneSignalUserManagerImpl.sharedInstance.pushSubscriptionModelStore.getModels()[OS_PUSH_SUBSCRIPTION_MODEL_KEY]?.subscriptionId = nil
+                    OneSignalUserManagerImpl.sharedInstance.pushSubscriptionModel?.subscriptionId = nil
                     OneSignalUserManagerImpl.sharedInstance._logout()
                 } else if responseType == .conflict {
                     self.addRequestQueue.removeAll(where: { $0 == request})

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSPropertyOperationExecutor.swift

@@ -152,7 +152,7 @@ class OSPropertyOperationExecutor: OSOperationExecutor {
                         return
                     }
                     // The subscription has been deleted along with the user, so remove the subscription_id but keep the same push subscription model
-                    OneSignalUserManagerImpl.sharedInstance.pushSubscriptionModelStore.getModels()[OS_PUSH_SUBSCRIPTION_MODEL_KEY]?.subscriptionId = nil
+                    OneSignalUserManagerImpl.sharedInstance.pushSubscriptionModel?.subscriptionId = nil
                     OneSignalUserManagerImpl.sharedInstance._logout()
                 } else if responseType != .retryable {
                     // Fail, no retry, remove from cache and queue

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSSubscriptionModel.swift

@@ -195,12 +195,59 @@ class OSSubscriptionModel: OSModel {
     }
 
     // Properties for push subscription
-    var testType: Int?
-    let deviceOs = UIDevice.current.systemVersion
-    let sdk = ONESIGNAL_VERSION
-    let deviceModel: String? = OSDeviceUtils.getDeviceVariant()
-    let appVersion: String? = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String
-    let netType: Int? = OSNetworkingUtils.getNetType() as? Int
+    var testType: Int? {
+        didSet {
+            guard testType != oldValue else {
+                return
+            }
+            self.set(property: "testType", newValue: testType)
+        }
+    }
+
+    var deviceOs = UIDevice.current.systemVersion {
+        didSet {
+            guard deviceOs != oldValue else {
+                return
+            }
+            self.set(property: "deviceOs", newValue: deviceOs)
+        }
+    }
+
+    var sdk = ONESIGNAL_VERSION {
+        didSet {
+            guard sdk != oldValue else {
+                return
+            }
+            self.set(property: "sdk", newValue: sdk)
+        }
+    }
+
+    var deviceModel: String? = OSDeviceUtils.getDeviceVariant() {
+        didSet {
+            guard deviceModel != oldValue else {
+                return
+            }
+            self.set(property: "deviceModel", newValue: deviceModel)
+        }
+    }
+
+    var appVersion: String? = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String {
+        didSet {
+            guard appVersion != oldValue else {
+                return
+            }
+            self.set(property: "appVersion", newValue: appVersion)
+        }
+    }
+
+    var netType: Int? = OSNetworkingUtils.getNetType() as? Int {
+        didSet {
+            guard netType != oldValue else {
+                return
+            }
+            self.set(property: "netType", newValue: netType)
+        }
+    }
 
     // When a Subscription is initialized, it may not have a subscriptionId until a request to the backend is made.
     init(type: OSSubscriptionType,
@@ -215,7 +262,7 @@ class OSSubscriptionModel: OSModel {
         _reachable = reachable
         _isDisabled = isDisabled
 
-        // Set test_type if subscription model is PUSH
+        // Set test_type if subscription model is PUSH, and update notificationTypes
         if type == .push {
             let releaseMode: OSUIApplicationReleaseMode = OneSignalMobileProvision.releaseMode()
             // Workaround to unsure how to extract the Int value in 1 step...
@@ -228,6 +275,7 @@ class OSSubscriptionModel: OSModel {
             if releaseMode == .UIApplicationReleaseWildcard {
                 self.testType = OSUIApplicationReleaseMode.UIApplicationReleaseWildcard.rawValue
             }
+            notificationTypes = Int(OSNotificationsManager.getNotificationTypes(_isDisabled))
         }
 
         super.init(changeNotifier: changeNotifier)
@@ -242,6 +290,11 @@ class OSSubscriptionModel: OSModel {
         coder.encode(_isDisabled, forKey: "_isDisabled")
         coder.encode(notificationTypes, forKey: "notificationTypes")
         coder.encode(testType, forKey: "testType")
+        coder.encode(deviceOs, forKey: "deviceOs")
+        coder.encode(sdk, forKey: "sdk")
+        coder.encode(deviceModel, forKey: "deviceModel")
+        coder.encode(appVersion, forKey: "appVersion")
+        coder.encode(netType, forKey: "netType")
     }
 
     required init?(coder: NSCoder) {
@@ -259,6 +312,12 @@ class OSSubscriptionModel: OSModel {
         self._isDisabled = coder.decodeBool(forKey: "_isDisabled")
         self.notificationTypes = coder.decodeInteger(forKey: "notificationTypes")
         self.testType = coder.decodeObject(forKey: "testType") as? Int
+        self.deviceOs = coder.decodeObject(forKey: "deviceOs") as? String ?? UIDevice.current.systemVersion
+        self.sdk = coder.decodeObject(forKey: "sdk") as? String ?? ONESIGNAL_VERSION
+        self.deviceModel = coder.decodeObject(forKey: "deviceModel") as? String
+        self.appVersion = coder.decodeObject(forKey: "appVersion") as? String
+        self.netType = coder.decodeObject(forKey: "netType") as? Int
+
         super.init(coder: coder)
     }
 
@@ -290,6 +349,26 @@ class OSSubscriptionModel: OSModel {
             }
         }
     }
+
+    // Using snake_case so we can use this in request bodies
+    public func jsonRepresentation() -> [String: Any] {
+        var json: [String: Any] = [:]
+        json["id"] = self.subscriptionId
+        json["type"] = self.type.rawValue
+        json["token"] = self.address
+        json["enabled"] = self.enabled
+        json["test_type"] = self.testType
+        json["device_os"] = self.deviceOs
+        json["sdk"] = self.sdk
+        json["device_model"] = self.deviceModel
+        json["app_version"] = self.appVersion
+        json["net_type"] = self.netType
+        // notificationTypes defaults to -1 instead of nil, don't send if it's -1
+        if self.notificationTypes != -1 {
+            json["notification_types"] = self.notificationTypes
+        }
+        return json
+    }
 }
 
 // Push Subscription related
@@ -317,15 +396,39 @@ extension OSSubscriptionModel {
     func updateNotificationTypes() {
         notificationTypes = Int(OSNotificationsManager.getNotificationTypes(_isDisabled))
     }
-
+
+    func updateTestType() {
+        let releaseMode: OSUIApplicationReleaseMode = OneSignalMobileProvision.releaseMode()
+        // Workaround to unsure how to extract the Int value in 1 step...
+        if releaseMode == .UIApplicationReleaseDev {
+            self.testType = OSUIApplicationReleaseMode.UIApplicationReleaseDev.rawValue
+        }
+        if releaseMode == .UIApplicationReleaseAdHoc {
+            self.testType = OSUIApplicationReleaseMode.UIApplicationReleaseAdHoc.rawValue
+        }
+        if releaseMode == .UIApplicationReleaseWildcard {
+            self.testType = OSUIApplicationReleaseMode.UIApplicationReleaseWildcard.rawValue
+        }
+    }
+
+    func update() {
+        updateTestType()
+        deviceOs = UIDevice.current.systemVersion
+        sdk = ONESIGNAL_VERSION
+        deviceModel = OSDeviceUtils.getDeviceVariant()
+        appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String
+        netType = OSNetworkingUtils.getNetType() as? Int
+        // sdkType ??
+        // isRooted ??
+    }
+
     enum OSPushPropertyChanged {
         case subscriptionId(String?)
         case reachable(Bool)
         case isDisabled(Bool)
         case address(String?)
     }
 
-    // TODO: Fix when isDisabled is set to true, the push subscription observer is not fired due to known bug.
     func firePushSubscriptionChanged(_ changedProperty: OSPushPropertyChanged) {
         var prevIsOptedIn = true
         var prevIsEnabled = true

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSSubscriptionOperationExecutor.swift

@@ -201,6 +201,13 @@ class OSSubscriptionOperationExecutor: OSOperationExecutor {
         processRequestQueue()
     }
 
+    // Bypasses the operation repo to create a push subscription request
+    func createPushSubscription(subscriptionModel: OSSubscriptionModel, identityModel: OSIdentityModel) {
+        let request = OSRequestCreateSubscription(subscriptionModel: subscriptionModel, identityModel: identityModel)
+        addRequestQueue.append(request)
+        OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_SUBSCRIPTION_EXECUTOR_ADD_REQUEST_QUEUE_KEY, withValue: self.addRequestQueue)
+    }
+
     func processRequestQueue() {
         let requestQueue: [OneSignalRequest] = addRequestQueue + removeRequestQueue + updateRequestQueue
 
@@ -257,7 +264,7 @@ class OSSubscriptionOperationExecutor: OSOperationExecutor {
                         return
                     }
                     // The subscription has been deleted along with the user, so remove the subscription_id but keep the same push subscription model
-                    OneSignalUserManagerImpl.sharedInstance.pushSubscriptionModelStore.getModels()[OS_PUSH_SUBSCRIPTION_MODEL_KEY]?.subscriptionId = nil
+                    OneSignalUserManagerImpl.sharedInstance.pushSubscriptionModel?.subscriptionId = nil
                     OneSignalUserManagerImpl.sharedInstance._logout()
                 } else if responseType != .retryable {
                     // Fail, no retry, remove from cache and queue