[User Model] Core Unit Tests

Author: brismithers

OneSignalSDK/onesignal/src/main/java/com/onesignal/common/exceptions/BackendException.kt

@@ -12,5 +12,5 @@ class BackendException(
     /**
      * The response, if one exists.
      */
-    val response: String?
+    val response: String? = null
 ) : Exception()

OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/application/impl/ApplicationService.kt

@@ -26,7 +26,7 @@ import com.onesignal.core.internal.application.IApplicationService
 import com.onesignal.debug.internal.logging.Logging
 import java.lang.ref.WeakReference
 
-internal class ApplicationService() : IApplicationService, ActivityLifecycleCallbacks, OnGlobalLayoutListener {
+class ApplicationService() : IApplicationService, ActivityLifecycleCallbacks, OnGlobalLayoutListener {
     private val _activityLifecycleNotifier: IEventProducer<IActivityLifecycleHandler> = EventProducer()
     private val _applicationLifecycleNotifier: IEventProducer<IApplicationLifecycleHandler> = EventProducer()
     private val _systemConditionNotifier: IEventProducer<ISystemConditionHandler> = EventProducer()
@@ -102,6 +102,7 @@ internal class ApplicationService() : IApplicationService, ActivityLifecycleCall
             entryState = AppEntryAction.APP_OPEN
             if (isCurrentActivityNull && isContextActivity) {
                 current = context as Activity?
+                _activityReferences = 1
                 _nextResumeIsFirstActivity = true
             }
         } else {

OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/config/ConfigModel.kt

@@ -54,6 +54,20 @@ class ConfigModel : Model() {
         get() = getProperty(::unsubscribeWhenNotificationsDisabled.name) { false }
         set(value) { setProperty(::unsubscribeWhenNotificationsDisabled.name, value) }
 
+    /**
+     * The timeout in milliseconds for an HTTP connection.
+     */
+    var httpTimeout: Int
+        get() = getProperty(::httpTimeout.name) { 120000 }
+        set(value) { setProperty(::httpTimeout.name, value) }
+
+    /**
+     * The timeout in milliseconds for an HTTP connection GET request.
+     */
+    var httpGetTimeout: Int
+        get() = getProperty(::httpGetTimeout.name) { 60000 }
+        set(value) { setProperty(::httpGetTimeout.name, value) }
+
     /**
      * Maximum time in milliseconds a user can spend out of focus before a new session is created.
      */

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

@@ -11,6 +11,7 @@ import com.onesignal.core.internal.preferences.IPreferencesService
 import com.onesignal.core.internal.preferences.PreferenceOneSignalKeys
 import com.onesignal.core.internal.preferences.PreferenceStores
 import com.onesignal.debug.internal.logging.Logging
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.TimeoutCancellationException
@@ -29,23 +30,23 @@ internal class HttpClient(
     private val _configModelStore: ConfigModelStore
 ) : IHttpClient {
     override suspend fun post(url: String, body: JSONObject): HttpResponse {
-        return makeRequest(url, "POST", body, TIMEOUT, null)
+        return makeRequest(url, "POST", body, _configModelStore.model.httpTimeout, null)
     }
 
     override suspend fun get(url: String, cacheKey: String?): HttpResponse {
-        return makeRequest(url, null, null, GET_TIMEOUT, cacheKey)
+        return makeRequest(url, null, null, _configModelStore.model.httpGetTimeout, cacheKey)
     }
 
     override suspend fun put(url: String, body: JSONObject): HttpResponse {
-        return makeRequest(url, "PUT", body, TIMEOUT, null)
+        return makeRequest(url, "PUT", body, _configModelStore.model.httpTimeout, null)
     }
 
     override suspend fun patch(url: String, body: JSONObject): HttpResponse {
-        return makeRequest(url, "PATCH", body, TIMEOUT, null)
+        return makeRequest(url, "PATCH", body, _configModelStore.model.httpTimeout, null)
     }
 
     override suspend fun delete(url: String): HttpResponse {
-        return makeRequest(url, "DELETE", null, TIMEOUT, null)
+        return makeRequest(url, "DELETE", null, _configModelStore.model.httpTimeout, null)
     }
 
     private suspend fun makeRequest(
@@ -73,6 +74,7 @@ internal class HttpClient(
         }
     }
 
+    @OptIn(DelicateCoroutinesApi::class)
     private suspend fun makeRequestIODispatcher(
         url: String,
         method: String?,
@@ -218,8 +220,6 @@ internal class HttpClient(
     companion object {
         private const val OS_API_VERSION = "1"
         private const val OS_ACCEPT_HEADER = "application/vnd.onesignal.v$OS_API_VERSION+json"
-        private const val GET_TIMEOUT = 60000
-        private const val TIMEOUT = 120000
         private const val THREAD_ID = 10000
     }
 }

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

@@ -1,6 +1,7 @@
 package com.onesignal.core.internal.operations.impl
 
 import com.onesignal.common.threading.WaiterWithValue
+import com.onesignal.common.threading.suspendifyOnThread
 import com.onesignal.core.internal.config.ConfigModelStore
 import com.onesignal.core.internal.operations.ExecutionResult
 import com.onesignal.core.internal.operations.GroupComparisonType
@@ -11,10 +12,6 @@ import com.onesignal.core.internal.startup.IStartableService
 import com.onesignal.core.internal.time.ITime
 import com.onesignal.debug.LogLevel
 import com.onesignal.debug.internal.logging.Logging
-import kotlinx.coroutines.Deferred
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.async
 import kotlinx.coroutines.withTimeoutOrNull
 import java.util.UUID
 
@@ -32,7 +29,6 @@ internal class OperationRepo(
 
     private val _executorsMap: Map<String, IOperationExecutor>
     private val _queue = mutableListOf<OperationQueueItem>()
-    private var _queueJob: Deferred<Unit>? = null
     private val _waiter = WaiterWithValue<Boolean>()
 
     init {
@@ -51,8 +47,9 @@ internal class OperationRepo(
     }
 
     override fun start() {
-        // fire up an async job that will run "forever" so we don't hold up the other startable services.
-        _queueJob = doWorkAsync()
+        suspendifyOnThread {
+            processQueueForever()
+        }
     }
 
     override fun enqueue(operation: Operation, flush: Boolean) {
@@ -82,8 +79,11 @@ internal class OperationRepo(
         _waiter.wake(flush)
     }
 
-    @OptIn(DelicateCoroutinesApi::class)
-    private fun doWorkAsync() = GlobalScope.async {
+    /**
+     * The background processing that will never return.  This should be called on it's own
+     * dedicated thread.
+     */
+    private suspend fun processQueueForever() {
         var lastSyncTime = _time.currentTimeMillis
         var force = false
 
@@ -108,12 +108,10 @@ internal class OperationRepo(
                     force = false
                 }
 
-                if (ops == null) {
-                    continue
+                if (ops != null) {
+                    executeOperations(ops!!)
                 }
 
-                executeOperations(ops!!)
-
                 if (!force) {
                     // potentially delay to prevent this from constant IO if a bunch of
                     // operations are set sequentially.

OneSignalSDK/onesignal/src/main/java/com/onesignal/core/internal/preferences/impl/PreferencesService.kt

@@ -75,7 +75,14 @@ internal class PreferencesService(
             }
         }
 
-        return defValue
+        return when (type) {
+            String::class.java -> defValue as String?
+            Boolean::class.java -> (defValue as Boolean?) ?: false
+            Int::class.java -> (defValue as Int?) ?: 0
+            Long::class.java -> (defValue as Long?) ?: 0
+            Set::class.java -> defValue as Set<String>?
+            else -> null
+        }
     }
 
     private fun save(store: String, key: String, value: Any?) {

OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/IUserBackendService.kt

@@ -62,7 +62,7 @@ class CreateUserResponse(
     val properties: PropertiesObject,
 
     /**
-     * The IDs of the subscriptions for the user.
+     * The subscriptions for the user.
      */
-    val subscriptionIDs: List<String>
+    val subscriptions: List<SubscriptionObject>
 )

OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/PropertiesObject.kt

@@ -3,7 +3,7 @@ package com.onesignal.user.internal.backend
 class PropertiesObject(
     val tags: Map<String, String>? = null,
     val language: String? = null,
-    val timezoneId: UInt? = null,
+    val timezoneId: String? = null,
     val country: String? = null,
     val latitude: Double? = null,
     val longitude: Double? = null,

OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/impl/IdentityBackendService.kt

@@ -1,9 +1,12 @@
 package com.onesignal.user.internal.backend.impl
 
+import com.onesignal.core.internal.http.IHttpClient
 import com.onesignal.user.internal.backend.IIdentityBackendService
 import kotlinx.coroutines.yield
 
-internal class IdentityBackendService : IIdentityBackendService {
+internal class IdentityBackendService(
+    private val _httpClient: IHttpClient
+) : IIdentityBackendService {
     override suspend fun createAlias(appId: String, aliasLabel: String, aliasValue: String, identities: Map<String, String>): Map<String, String> {
         // TODO: To Implement
         yield()

OneSignalSDK/onesignal/src/main/java/com/onesignal/user/internal/backend/impl/UserBackendService.kt

@@ -1,18 +1,21 @@
 package com.onesignal.user.internal.backend.impl
 
+import com.onesignal.core.internal.http.IHttpClient
 import com.onesignal.user.internal.backend.CreateUserResponse
 import com.onesignal.user.internal.backend.ISubscriptionBackendService
 import com.onesignal.user.internal.backend.IUserBackendService
 import com.onesignal.user.internal.backend.IdentityConstants
 import com.onesignal.user.internal.backend.PropertiesDeltasObject
 import com.onesignal.user.internal.backend.PropertiesObject
 import com.onesignal.user.internal.backend.SubscriptionObject
+import com.onesignal.user.internal.backend.SubscriptionObjectType
 import com.onesignal.user.internal.subscriptions.SubscriptionModel
 import org.json.JSONArray
 import org.json.JSONObject
 import java.util.UUID
 
 internal class UserBackendService(
+    private val _httpClient: IHttpClient,
     private val _subscriptionBackend: ISubscriptionBackendService
 ) : IUserBackendService {
 
@@ -43,7 +46,7 @@ internal class UserBackendService(
         val mutIdentities = identities.toMutableMap()
         mutIdentities[IdentityConstants.ONESIGNAL_ID] = UUID.randomUUID().toString()
 
-        return CreateUserResponse(mutIdentities, properties, subscriptionIDs)
+        return CreateUserResponse(mutIdentities, properties, subscriptionIDs.map { SubscriptionObject(it, SubscriptionObjectType.ANDROID_PUSH) })
     }
 
     override suspend fun updateUser(appId: String, aliasLabel: String, aliasValue: String, properties: PropertiesObject, refreshDeviceMetadata: Boolean, propertyiesDelta: PropertiesDeltasObject) {