[User Model] ADM Fixes

* Update example app `AndroidManifest.xml` to point to new ADM bridges.
* Update PushRegistratorADM to not launch a new task and run in calling thread.

Author: brismithers

Examples/OneSignalDemo/app/src/main/AndroidManifest.xml

@@ -46,17 +46,17 @@
         </service>
 
         <service
-            android:name="com.onesignal.ADMMessageHandlerJob"
+            android:name="com.onesignal.notifications.services.ADMMessageHandlerJob"
             android:permission="android.permission.BIND_JOB_SERVICE"
             android:exported="false" />
 
         <!-- This is needed for devices with older ADM versions -->
         <service
-            android:name="com.onesignal.ADMMessageHandler"
+            android:name="com.onesignal.notifications.services.ADMMessageHandler"
             android:exported="false" />
 
         <receiver
-            android:name="com.onesignal.ADMMessageHandler$Receiver"
+            android:name="com.onesignal.notifications.receivers.ADMMessageReceiver"
             android:permission="com.amazon.device.messaging.permission.SEND"
             android:exported="true">
 

OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorADM.kt

@@ -6,9 +6,6 @@ import com.onesignal.core.internal.application.IApplicationService
 import com.onesignal.debug.internal.logging.Logging
 import com.onesignal.notifications.internal.registration.IPushRegistrator
 import com.onesignal.user.internal.subscriptions.SubscriptionStatus
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.withTimeout
 
 internal class PushRegistratorADM(
@@ -17,45 +14,44 @@ internal class PushRegistratorADM(
 
     private var _waiter: WaiterWithValue<String?>? = null
 
-    override suspend fun registerForPush(): IPushRegistrator.RegisterResult = coroutineScope {
+    override suspend fun registerForPush(): IPushRegistrator.RegisterResult {
         var result: IPushRegistrator.RegisterResult? = null
 
         _waiter = WaiterWithValue()
-        launch(Dispatchers.Default) {
-            val adm = ADM(_applicationService.appContext)
-            var registrationId = adm.registrationId
-            if (registrationId != null) {
-                Logging.debug("ADM Already registered with ID:$registrationId")
-                result = IPushRegistrator.RegisterResult(
+
+        val adm = ADM(_applicationService.appContext)
+        var registrationId = adm.registrationId
+        if (registrationId != null) {
+            Logging.debug("ADM Already registered with ID:$registrationId")
+            result = IPushRegistrator.RegisterResult(
+                registrationId,
+                SubscriptionStatus.SUBSCRIBED
+            )
+        } else {
+            adm.startRegister()
+
+            // wait up to 30 seconds for someone to call `fireCallback` with the registration id.
+            // if it comes before we will continue immediately.
+            withTimeout(30000) {
+                registrationId = _waiter?.waitForWake()
+            }
+
+            result = if (registrationId != null) {
+                Logging.error("ADM registered with ID:$registrationId")
+                IPushRegistrator.RegisterResult(
                     registrationId,
                     SubscriptionStatus.SUBSCRIBED
                 )
             } else {
-                adm.startRegister()
-
-                // wait up to 30 seconds for someone to call `fireCallback` with the registration id.
-                // if it comes before we will continue immediately.
-                withTimeout(30000) {
-                    registrationId = _waiter?.waitForWake()
-                }
-
-                result = if (registrationId != null) {
-                    Logging.error("ADM registered with ID:$registrationId")
-                    IPushRegistrator.RegisterResult(
-                        registrationId,
-                        SubscriptionStatus.SUBSCRIBED
-                    )
-                } else {
-                    Logging.error("com.onesignal.ADMMessageHandler timed out, please check that your have the receiver, service, and your package name matches(NOTE: Case Sensitive) per the OneSignal instructions.")
-                    IPushRegistrator.RegisterResult(
-                        null,
-                        SubscriptionStatus.ERROR
-                    )
-                }
+                Logging.error("com.onesignal.ADMMessageHandler timed out, please check that your have the receiver, service, and your package name matches(NOTE: Case Sensitive) per the OneSignal instructions.")
+                IPushRegistrator.RegisterResult(
+                    null,
+                    SubscriptionStatus.ERROR
+                )
             }
         }
 
-        return@coroutineScope result!!
+        return result!!
     }
 
     override suspend fun fireCallback(id: String?) {