Merge branch 'user-model/main' into fix/language_not_set

jennantilla · web-flow · commit 1c184ff6b86d · 2023-09-25T10:56:37.000-07:00
diff --git a/OneSignalSDK/onesignal/core/build.gradle b/OneSignalSDK/onesignal/core/build.gradle
@@ -42,6 +42,8 @@ android {
         jvmTarget = '1.8'
     }
     namespace 'com.onesignal.core'
+
+    kotlinOptions.freeCompilerArgs += ['-module-name', namespace]
 }
 
 tasks.withType(Test) {
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/TimeUtils.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/TimeUtils.kt
@@ -17,7 +17,7 @@ object TimeUtils {
         return offset / 1000
     }
 
-    fun getTimeZoneId(): String? {
+    fun getTimeZoneId(): String {
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             ZoneId.systemDefault().id
         } else {
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/IModelStore.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/IModelStore.kt
@@ -16,7 +16,7 @@ interface IModelStore<TModel> :
      *
      * @param jsonObject The optional [JSONObject] to initialize the new model with.
      */
-    fun create(jsonObject: JSONObject? = null): TModel
+    fun create(jsonObject: JSONObject? = null): TModel?
 
     /**
      * List the models that are owned by this model store.
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/ModelStore.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/ModelStore.kt
@@ -126,7 +126,7 @@ abstract class ModelStore<TModel>(
             val str = _prefs.getString(PreferenceStores.ONESIGNAL, PreferenceOneSignalKeys.MODEL_STORE_PREFIX + name, "[]")
             val jsonArray = JSONArray(str)
             for (index in 0 until jsonArray.length()) {
-                val newModel = create(jsonArray.getJSONObject(index))
+                val newModel = create(jsonArray.getJSONObject(index)) ?: continue
                 _models.add(newModel)
                 // listen for changes to this model
                 newModel.subscribe(this)
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/SingletonModelStore.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/modeling/SingletonModelStore.kt
@@ -24,7 +24,7 @@ open class SingletonModelStore<TModel>(
                 return model
             }
 
-            val createdModel = store.create()
+            val createdModel = store.create() ?: throw Exception("Unable to initialize model from store $store")
             createdModel.id = _singletonId
             store.add(createdModel)
             return createdModel
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/IOperationExecutor.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/IOperationExecutor.kt
@@ -68,4 +68,10 @@ enum class ExecutionResult {
      * retried if authorization can be achieved.
      */
     FAIL_UNAUTHORIZED,
+
+    /**
+     * Used in special login case.
+     * The operation failed due to a conflict and can be handled.
+     */
+    FAIL_CONFLICT,
 }
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/impl/OperationModelStore.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/impl/OperationModelStore.kt
@@ -3,11 +3,13 @@ package com.onesignal.core.internal.operations.impl
 import com.onesignal.common.modeling.ModelStore
 import com.onesignal.core.internal.operations.Operation
 import com.onesignal.core.internal.preferences.IPreferencesService
+import com.onesignal.debug.internal.logging.Logging
 import com.onesignal.user.internal.operations.CreateSubscriptionOperation
 import com.onesignal.user.internal.operations.DeleteAliasOperation
 import com.onesignal.user.internal.operations.DeleteSubscriptionOperation
 import com.onesignal.user.internal.operations.DeleteTagOperation
 import com.onesignal.user.internal.operations.LoginUserOperation
+import com.onesignal.user.internal.operations.LoginUserFromSubscriptionOperation
 import com.onesignal.user.internal.operations.RefreshUserOperation
 import com.onesignal.user.internal.operations.SetAliasOperation
 import com.onesignal.user.internal.operations.SetPropertyOperation
@@ -18,6 +20,7 @@ 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.LoginUserFromSubscriptionOperationExecutor
 import com.onesignal.user.internal.operations.impl.executors.LoginUserOperationExecutor
 import com.onesignal.user.internal.operations.impl.executors.RefreshUserOperationExecutor
 import com.onesignal.user.internal.operations.impl.executors.SubscriptionOperationExecutor
@@ -30,13 +33,15 @@ internal class OperationModelStore(prefs: IPreferencesService) : ModelStore<Oper
         load()
     }
 
-    override fun create(jsonObject: JSONObject?): Operation {
+    override fun create(jsonObject: JSONObject?): Operation? {
         if (jsonObject == null) {
-            throw NullPointerException("jsonObject")
+            Logging.error("null jsonObject sent to OperationModelStore.create")
+            return null
         }
 
         if (!jsonObject.has(Operation::name.name)) {
-            throw IllegalArgumentException("jsonObject must have '${Operation::name.name}' attribute")
+            Logging.error("jsonObject must have '${Operation::name.name}' attribute")
+            return null
         }
 
         // Determine the type of operation based on the name property in the json
@@ -48,6 +53,7 @@ internal class OperationModelStore(prefs: IPreferencesService) : ModelStore<Oper
             SubscriptionOperationExecutor.DELETE_SUBSCRIPTION -> DeleteSubscriptionOperation()
             SubscriptionOperationExecutor.TRANSFER_SUBSCRIPTION -> TransferSubscriptionOperation()
             LoginUserOperationExecutor.LOGIN_USER -> LoginUserOperation()
+            LoginUserFromSubscriptionOperationExecutor.LOGIN_USER_FROM_SUBSCRIPTION_USER -> LoginUserFromSubscriptionOperation()
             RefreshUserOperationExecutor.REFRESH_USER -> RefreshUserOperation()
             UpdateUserOperationExecutor.SET_TAG -> SetTagOperation()
             UpdateUserOperationExecutor.DELETE_TAG -> DeleteTagOperation()
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/impl/OperationRepo.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/impl/OperationRepo.kt
@@ -167,6 +167,7 @@ internal class OperationRepo(
                 }
                 ExecutionResult.FAIL_UNAUTHORIZED, // TODO: Need to provide callback for app to reset JWT. For now, fail with no retry.
                 ExecutionResult.FAIL_NORETRY,
+                ExecutionResult.FAIL_CONFLICT,
                 -> {
                     Logging.error("Operation execution failed without retry: $operations")
                     // on failure we remove the operation from the store and wake any waiters
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/IdentityOperationExecutor.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/IdentityOperationExecutor.kt
@@ -51,10 +51,10 @@ internal class IdentityOperationExecutor(
                 return when (responseType) {
                     NetworkUtils.ResponseStatusType.RETRYABLE ->
                         ExecutionResponse(ExecutionResult.FAIL_RETRY)
-                    NetworkUtils.ResponseStatusType.INVALID,
-                    NetworkUtils.ResponseStatusType.CONFLICT,
-                    ->
+                    NetworkUtils.ResponseStatusType.INVALID ->
                         ExecutionResponse(ExecutionResult.FAIL_NORETRY)
+                    NetworkUtils.ResponseStatusType.CONFLICT ->
+                        ExecutionResponse(ExecutionResult.FAIL_CONFLICT)
                     NetworkUtils.ResponseStatusType.UNAUTHORIZED ->
                         ExecutionResponse(ExecutionResult.FAIL_UNAUTHORIZED)
                     NetworkUtils.ResponseStatusType.MISSING -> {
diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/LoginUserOperationExecutor.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/LoginUserOperationExecutor.kt
@@ -82,9 +82,16 @@ internal class LoginUserOperationExecutor(
 
                     ExecutionResponse(ExecutionResult.SUCCESS_STARTING_ONLY, mapOf(loginUserOp.onesignalId to backendOneSignalId))
                 }
+                ExecutionResult.FAIL_CONFLICT -> {
+                    // When the SetAliasOperation fails with conflict that *most likely* means the externalId provided
+                    // is already associated to a user.  This *expected* condition means we must create a user.
+                    // We hardcode the response of "user-2" in the log to provide information to the SDK consumer
+                    Logging.debug("LoginUserOperationExecutor now handling 409 response with \"code\": \"user-2\" by switching to user with \"external_id\": \"${loginUserOp.externalId}\"")
+                    createUser(loginUserOp, operations)
+                }
                 ExecutionResult.FAIL_NORETRY -> {
-                    // When the SetAliasOperation fails without retry that *most likely* means the externalId provided
-                    // is already associated to a user.  This expected condition means we must create a user.
+                    // Some other failure occurred, still try to recover by creating the user
+                    Logging.error("LoginUserOperationExecutor encountered error. Attempt to recover by switching to user with \"external_id\": \"${loginUserOp.externalId}\"")
                     createUser(loginUserOp, operations)
                 }
                 else -> ExecutionResponse(result.result)
diff --git a/OneSignalSDK/onesignal/in-app-messages/build.gradle b/OneSignalSDK/onesignal/in-app-messages/build.gradle
@@ -42,6 +42,8 @@ android {
         jvmTarget = '1.8'
     }
     namespace 'com.onesignal.inAppMessages'
+
+    kotlinOptions.freeCompilerArgs += ['-module-name', namespace]
 }
 
 tasks.withType(Test) {
diff --git a/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/WebViewManager.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/WebViewManager.kt
@@ -279,13 +279,14 @@ internal class WebViewManager(
             }
             Logging.debug("In app message, showing first one with height: $newHeight")
 
-            messageView!!.setWebView(webView!!)
+            messageView?.setWebView(webView!!)
             if (newHeight != null) {
                 lastPageHeight = newHeight
-                messageView!!.updateHeight(newHeight)
+                messageView?.updateHeight(newHeight)
             }
-            messageView!!.showView(activity)
-            messageView!!.checkIfShouldDismiss()
+            // showView does not return until in-app is dismissed
+            messageView?.showView(activity)
+            messageView?.checkIfShouldDismiss()
         }
     }
 
diff --git a/OneSignalSDK/onesignal/location/build.gradle b/OneSignalSDK/onesignal/location/build.gradle
@@ -42,6 +42,8 @@ android {
         jvmTarget = '1.8'
     }
     namespace 'com.onesignal.location'
+
+    kotlinOptions.freeCompilerArgs += ['-module-name', namespace]
 }
 
 tasks.withType(Test) {
diff --git a/OneSignalSDK/onesignal/notifications/build.gradle b/OneSignalSDK/onesignal/notifications/build.gradle
@@ -42,6 +42,8 @@ android {
         jvmTarget = '1.8'
     }
     namespace 'com.onesignal.notifications'
+
+    kotlinOptions.freeCompilerArgs += ['-module-name', namespace]
 }
 
 tasks.withType(Test) {
diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/common/NotificationGenerationJob.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/common/NotificationGenerationJob.kt
@@ -7,25 +7,17 @@ import org.json.JSONObject
 import java.security.SecureRandom
 
 class NotificationGenerationJob(
-    private var _notification: Notification,
+    inNotification: Notification,
     var jsonPayload: JSONObject,
 ) {
-    var notification: Notification
-        get() = _notification
-        private set(value) {
-            // If there is no android ID on the notification coming in, create one either
-            // copying from the previous one or generating a new one.
-            if (value != null && !value!!.hasNotificationId()) {
-                val curNotification = _notification
-                if (curNotification != null && curNotification.hasNotificationId()) {
-                    value.androidNotificationId = curNotification.androidNotificationId
-                } else {
-                    value.androidNotificationId = SecureRandom().nextInt()
-                }
-            }
+    val notification: Notification = inNotification.setAndroidNotificationId()
 
-            _notification = value
+    private fun Notification.setAndroidNotificationId() = this.also {
+        // If there is no android ID on the notification coming in, generate a new one.
+        if (it != null && !it.hasNotificationId()) {
+            it.androidNotificationId = SecureRandom().nextInt()
         }
+    }
 
     var isRestoring = false
     var isNotificationToDisplay = false
diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/generation/impl/NotificationGenerationProcessor.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/generation/impl/NotificationGenerationProcessor.kt
@@ -116,7 +116,7 @@ internal class NotificationGenerationProcessor(
                         }.join()
                     }
                 } catch (to: TimeoutCancellationException) {
-                    Logging.error("notificationWillShowInForegroundHandler timed out, continuing with wantsToDisplay=$wantsToDisplay.", to)
+                    Logging.info("notificationWillShowInForegroundHandler timed out, continuing with wantsToDisplay=$wantsToDisplay.", to)
                 } catch (t: Throwable) {
                     Logging.error("notificationWillShowInForegroundHandler threw an exception. Displaying normal OneSignal notification.", t)
                 }

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,8 @@ android {`
`42`	`42`	`jvmTarget = '1.8'`
`43`	`43`	`}`
`44`	`44`	`namespace 'com.onesignal.core'`
	`45`	`+`
	`46`	`+ kotlinOptions.freeCompilerArgs += ['-module-name', namespace]`
`45`	`47`	`}`
`46`	`48`
`47`	`49`	`tasks.withType(Test) {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ object TimeUtils {`
`17`	`17`	`return offset / 1000`
`18`	`18`	`}`
`19`	`19`
`20`		`- fun getTimeZoneId(): String? {`
	`20`	`+ fun getTimeZoneId(): String {`
`21`	`21`	`return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {`
`22`	`22`	`ZoneId.systemDefault().id`
`23`	`23`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ interface IModelStore<TModel> :`
`16`	`16`	`*`
`17`	`17`	`* @param jsonObject The optional [JSONObject] to initialize the new model with.`
`18`	`18`	`*/`
`19`		`- fun create(jsonObject: JSONObject? = null): TModel`
	`19`	`+ fun create(jsonObject: JSONObject? = null): TModel?`
`20`	`20`
`21`	`21`	`/**`
`22`	`22`	`* List the models that are owned by this model store.`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ open class SingletonModelStore<TModel>(`
`24`	`24`	`return model`
`25`	`25`	`}`
`26`	`26`
`27`		`- val createdModel = store.create()`
	`27`	`+ val createdModel = store.create() ?: throw Exception("Unable to initialize model from store $store")`
`28`	`28`	`createdModel.id = _singletonId`
`29`	`29`	`store.add(createdModel)`
`30`	`30`	`return createdModel`
Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,7 @@ internal class OperationRepo(`
`167`	`167`	`}`
`168`	`168`	`ExecutionResult.FAIL_UNAUTHORIZED, // TODO: Need to provide callback for app to reset JWT. For now, fail with no retry.`
`169`	`169`	`ExecutionResult.FAIL_NORETRY,`
	`170`	`+ ExecutionResult.FAIL_CONFLICT,`
`170`	`171`	`-> {`
`171`	`172`	`Logging.error("Operation execution failed without retry: $operations")`
`172`	`173`	`// on failure we remove the operation from the store and wake any waiters`