[User Model] Transfer Subscription on user create

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/model/MainActivityViewModel.java

@@ -408,9 +408,8 @@ private void setupAppLayout() {
                 @Override
                 public void onSuccess(String update) {
                     if (update != null && !update.isEmpty()) {
-                        OneSignal.login(update, Continue.with(r -> {
-                            refreshState();
-                        }));
+                        OneSignal.login(update);
+                        refreshState();
                     }
                 }
 
@@ -422,9 +421,8 @@ public void onFailure() {
         });
 
         logoutUserButton.setOnClickListener(v -> {
-            OneSignal.logout(Continue.with(r -> {
-                refreshState();
-            }));
+            OneSignal.logout();
+            refreshState();
         });
     }
 
@@ -791,7 +789,7 @@ private void setupLocationSharedSwitch() {
 
     private void setupPromptLocationButton() {
         promptLocationButton.setOnClickListener(v -> {
-            OneSignal.getLocation().requestPermission(true, Continue.none());
+            OneSignal.getLocation().requestPermission(Continue.none());
         });
     }
 
@@ -823,7 +821,7 @@ private void setupSubscriptionSwitch() {
 
     private void setupPromptPushButton() {
         promptPushButton.setOnClickListener(v -> {
-            OneSignal.getNotifications().requestPermission(true, Continue.none());
+            OneSignal.getUser().getPushSubscription().optIn();
         });
     }
 

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/IOneSignal.kt

@@ -104,14 +104,14 @@ interface IOneSignal {
      * trust for the login operation.  Required when identity verification has been enabled. See
      * [Identity Verification | OneSignal](https://documentation.onesignal.com/docs/identity-verification)
      */
-    suspend fun login(externalId: String, jwtBearerToken: String? = null)
-    suspend fun login(externalId: String) = login(externalId, null)
+    fun login(externalId: String, jwtBearerToken: String? = null)
+    fun login(externalId: String) = login(externalId, null)
 
     /**
      * Logout the user previously logged in via [login]. The [User] property now references
      * a new device-scoped user. A device-scoped user has no user identity that can later
      * be retrieved, except through this device as long as the app remains installed and the app
      * data is not cleared.
      */
-    suspend fun logout()
+    fun logout()
 }

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/OneSignal.kt

@@ -145,7 +145,7 @@ object OneSignal {
      * @param externalId The external ID of the user that is to be logged in.
      */
     @JvmStatic
-    suspend fun login(externalId: String) = oneSignal.login(externalId)
+    fun login(externalId: String) = oneSignal.login(externalId)
 
     /**
      * Login to OneSignal under the user identified by the [externalId] provided. The act of
@@ -169,7 +169,7 @@ object OneSignal {
      * [Identity Verification | OneSignal](https://documentation.onesignal.com/docs/identity-verification)
      */
     @JvmStatic
-    suspend fun login(externalId: String, jwtBearerToken: String? = null) = oneSignal.login(externalId, jwtBearerToken)
+    fun login(externalId: String, jwtBearerToken: String? = null) = oneSignal.login(externalId, jwtBearerToken)
 
     /**
      * Logout the user previously logged in via [login]. The [User] property now references
@@ -178,7 +178,7 @@ object OneSignal {
      * data is not cleared.
      */
     @JvmStatic
-    suspend fun logout() = oneSignal.logout()
+    fun logout() = oneSignal.logout()
 
     private val oneSignal: IOneSignal by lazy {
         OneSignalImp()

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/Model.kt

@@ -161,33 +161,33 @@ open class Model(
      */
     protected open fun createListForProperty(property: String, jsonArray: JSONArray): List<*>? = null
 
-    inline fun <reified T : Enum<T>> setEnumProperty(name: String, value: T, tag: String = ModelChangeTags.NORMAL) = setOptEnumProperty(name, value, tag)
-    fun <T> setMapModelProperty(name: String, value: MapModel<T>, tag: String = ModelChangeTags.NORMAL) = setOptMapModelProperty(name, value, tag)
-    fun <T> setListProperty(name: String, value: List<T>, tag: String = ModelChangeTags.NORMAL) = setOptListProperty(name, value, tag)
-    fun setStringProperty(name: String, value: String, tag: String = ModelChangeTags.NORMAL) = setOptStringProperty(name, value, tag)
-    fun setBooleanProperty(name: String, value: Boolean, tag: String = ModelChangeTags.NORMAL) = setOptBooleanProperty(name, value, tag)
-    fun setLongProperty(name: String, value: Long, tag: String = ModelChangeTags.NORMAL) = setOptLongProperty(name, value, tag)
-    fun setDoubleProperty(name: String, value: Double, tag: String = ModelChangeTags.NORMAL) = setOptDoubleProperty(name, value, tag)
-    fun setFloatProperty(name: String, value: Float, tag: String = ModelChangeTags.NORMAL) = setOptFloatProperty(name, value, tag)
-    fun setIntProperty(name: String, value: Int, tag: String = ModelChangeTags.NORMAL) = setOptIntProperty(name, value, tag)
-    fun setBigDecimalProperty(name: String, value: BigDecimal, tag: String = ModelChangeTags.NORMAL) = setOptBigDecimalProperty(name, value, tag)
-    fun setAnyProperty(name: String, value: Any, tag: String = ModelChangeTags.NORMAL) = setOptAnyProperty(name, value, tag)
-
-    inline fun <reified T : Enum<T>> setOptEnumProperty(name: String, value: T?, tag: String = ModelChangeTags.NORMAL) = setOptAnyProperty(name, value?.toString(), tag)
-    fun <T> setOptMapModelProperty(name: String, value: MapModel<T>?, tag: String = ModelChangeTags.NORMAL) = setOptAnyProperty(name, value, tag)
-    fun <T> setOptListProperty(name: String, value: List<T>?, tag: String = ModelChangeTags.NORMAL) = setOptAnyProperty(name, value, tag)
-    fun setOptStringProperty(name: String, value: String?, tag: String = ModelChangeTags.NORMAL) = setOptAnyProperty(name, value, tag)
-    fun setOptBooleanProperty(name: String, value: Boolean?, tag: String = ModelChangeTags.NORMAL) = setOptAnyProperty(name, value, tag)
-    fun setOptLongProperty(name: String, value: Long?, tag: String = ModelChangeTags.NORMAL) = setOptAnyProperty(name, value, tag)
-    fun setOptDoubleProperty(name: String, value: Double?, tag: String = ModelChangeTags.NORMAL) = setOptAnyProperty(name, value, tag)
-    fun setOptFloatProperty(name: String, value: Float?, tag: String = ModelChangeTags.NORMAL) = setOptAnyProperty(name, value, tag)
-    fun setOptIntProperty(name: String, value: Int?, tag: String = ModelChangeTags.NORMAL) = setOptAnyProperty(name, value, tag)
-    fun setOptBigDecimalProperty(name: String, value: BigDecimal?, tag: String = ModelChangeTags.NORMAL) = setOptAnyProperty(name, value?.toString(), tag)
-
-    fun setOptAnyProperty(name: String, value: Any?, tag: String = ModelChangeTags.NORMAL) {
+    inline fun <reified T : Enum<T>> setEnumProperty(name: String, value: T, tag: String = ModelChangeTags.NORMAL, forceChange: Boolean = false) = setOptEnumProperty(name, value, tag, forceChange)
+    fun <T> setMapModelProperty(name: String, value: MapModel<T>, tag: String = ModelChangeTags.NORMAL, forceChange: Boolean = false) = setOptMapModelProperty(name, value, tag, forceChange)
+    fun <T> setListProperty(name: String, value: List<T>, tag: String = ModelChangeTags.NORMAL, forceChange: Boolean = false) = setOptListProperty(name, value, tag, forceChange)
+    fun setStringProperty(name: String, value: String, tag: String = ModelChangeTags.NORMAL, forceChange: Boolean = false) = setOptStringProperty(name, value, tag, forceChange)
+    fun setBooleanProperty(name: String, value: Boolean, tag: String = ModelChangeTags.NORMAL, forceChange: Boolean = false) = setOptBooleanProperty(name, value, tag, forceChange)
+    fun setLongProperty(name: String, value: Long, tag: String = ModelChangeTags.NORMAL, forceChange: Boolean = false) = setOptLongProperty(name, value, tag, forceChange)
+    fun setDoubleProperty(name: String, value: Double, tag: String = ModelChangeTags.NORMAL, forceChange: Boolean = false) = setOptDoubleProperty(name, value, tag, forceChange)
+    fun setFloatProperty(name: String, value: Float, tag: String = ModelChangeTags.NORMAL, forceChange: Boolean = false) = setOptFloatProperty(name, value, tag, forceChange)
+    fun setIntProperty(name: String, value: Int, tag: String = ModelChangeTags.NORMAL, forceChange: Boolean = false) = setOptIntProperty(name, value, tag, forceChange)
+    fun setBigDecimalProperty(name: String, value: BigDecimal, tag: String = ModelChangeTags.NORMAL, forceChange: Boolean = false) = setOptBigDecimalProperty(name, value, tag, forceChange)
+    fun setAnyProperty(name: String, value: Any, tag: String = ModelChangeTags.NORMAL, forceChange: Boolean = false) = setOptAnyProperty(name, value, tag, forceChange)
+
+    inline fun <reified T : Enum<T>> setOptEnumProperty(name: String, value: T?, tag: String = ModelChangeTags.NORMAL, forceChange: Boolean = false) = setOptAnyProperty(name, value?.toString(), tag, forceChange)
+    fun <T> setOptMapModelProperty(name: String, value: MapModel<T>?, tag: String = ModelChangeTags.NORMAL, forceChange: Boolean = false) = setOptAnyProperty(name, value, tag, forceChange)
+    fun <T> setOptListProperty(name: String, value: List<T>?, tag: String = ModelChangeTags.NORMAL, forceChange: Boolean = false) = setOptAnyProperty(name, value, tag, forceChange)
+    fun setOptStringProperty(name: String, value: String?, tag: String = ModelChangeTags.NORMAL, forceChange: Boolean = false) = setOptAnyProperty(name, value, tag, forceChange)
+    fun setOptBooleanProperty(name: String, value: Boolean?, tag: String = ModelChangeTags.NORMAL, forceChange: Boolean = false) = setOptAnyProperty(name, value, tag, forceChange)
+    fun setOptLongProperty(name: String, value: Long?, tag: String = ModelChangeTags.NORMAL, forceChange: Boolean = false) = setOptAnyProperty(name, value, tag, forceChange)
+    fun setOptDoubleProperty(name: String, value: Double?, tag: String = ModelChangeTags.NORMAL, forceChange: Boolean = false) = setOptAnyProperty(name, value, tag, forceChange)
+    fun setOptFloatProperty(name: String, value: Float?, tag: String = ModelChangeTags.NORMAL, forceChange: Boolean = false) = setOptAnyProperty(name, value, tag, forceChange)
+    fun setOptIntProperty(name: String, value: Int?, tag: String = ModelChangeTags.NORMAL, forceChange: Boolean = false) = setOptAnyProperty(name, value, tag, forceChange)
+    fun setOptBigDecimalProperty(name: String, value: BigDecimal?, tag: String = ModelChangeTags.NORMAL, forceChange: Boolean = false) = setOptAnyProperty(name, value?.toString(), tag, forceChange)
+
+    fun setOptAnyProperty(name: String, value: Any?, tag: String = ModelChangeTags.NORMAL, forceChange: Boolean = false) {
         val oldValue = data[name]
 
-        if (oldValue == value) {
+        if (oldValue == value && !forceChange) {
             return
         }
 

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/background/impl/BackgroundManager.kt

@@ -141,7 +141,7 @@ internal class BackgroundManager(
             if (_nextScheduledSyncTimeMs != 0L &&
                 _time.currentTimeMillis + delayMs > _nextScheduledSyncTimeMs
             ) {
-                Logging.verbose("OSSyncService scheduleSyncTask already update scheduled nextScheduledSyncTimeMs: $_nextScheduledSyncTimeMs")
+                Logging.debug("OSSyncService scheduleSyncTask already update scheduled nextScheduledSyncTimeMs: $_nextScheduledSyncTimeMs")
                 return
             }
             if (delayMs < 5000) delayMs = 5000
@@ -180,7 +180,7 @@ internal class BackgroundManager(
 
     @RequiresApi(21)
     private fun scheduleSyncServiceAsJob(delayMs: Long) {
-        Logging.verbose("OSBackgroundSync scheduleSyncServiceAsJob:atTime: $delayMs")
+        Logging.debug("OSBackgroundSync scheduleSyncServiceAsJob:atTime: $delayMs")
         if (isJobIdRunning()) {
             Logging.verbose("OSBackgroundSync scheduleSyncServiceAsJob Scheduler already running!")
             // If a JobScheduler is schedule again while running it will stop current job. We will schedule again when finished.

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/impl/HttpClient.kt

@@ -112,7 +112,7 @@ internal class HttpClient(
                 con.setRequestProperty("Accept", OS_ACCEPT_HEADER)
 
                 val subscriptionId = _configModelStore.model.pushSubscriptionId
-                if(subscriptionId != null && subscriptionId.isNotEmpty()) {
+                if (subscriptionId != null && subscriptionId.isNotEmpty()) {
                     con.setRequestProperty("OneSignal-Subscription-Id", subscriptionId)
                 }
 

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/impl/OperationModelStore.kt

@@ -15,6 +15,7 @@ import com.onesignal.user.internal.operations.SetTagOperation
 import com.onesignal.user.internal.operations.TrackPurchaseOperation
 import com.onesignal.user.internal.operations.TrackSessionEndOperation
 import com.onesignal.user.internal.operations.TrackSessionStartOperation
+import com.onesignal.user.internal.operations.TransferSubscriptionOperation
 import com.onesignal.user.internal.operations.UpdateSubscriptionOperation
 import com.onesignal.user.internal.operations.impl.executors.IdentityOperationExecutor
 import com.onesignal.user.internal.operations.impl.executors.LoginUserOperationExecutor
@@ -45,6 +46,7 @@ internal class OperationModelStore(prefs: IPreferencesService) : ModelStore<Oper
             SubscriptionOperationExecutor.CREATE_SUBSCRIPTION -> CreateSubscriptionOperation()
             SubscriptionOperationExecutor.UPDATE_SUBSCRIPTION -> UpdateSubscriptionOperation()
             SubscriptionOperationExecutor.DELETE_SUBSCRIPTION -> DeleteSubscriptionOperation()
+            SubscriptionOperationExecutor.TRANSFER_SUBSCRIPTION -> TransferSubscriptionOperation()
             LoginUserOperationExecutor.LOGIN_USER -> LoginUserOperation()
             RefreshUserOperationExecutor.REFRESH_USER -> RefreshUserOperation()
             UpdateUserOperationExecutor.SET_TAG -> SetTagOperation()