implementing ADMMessageHandlerJob and updating receiver

Author: emawby

OneSignalSDK/onesignal/src/main/java/com/onesignal/ADMMessageHandler.java

@@ -44,6 +44,18 @@ public class ADMMessageHandler extends ADMMessageHandlerBase {
    public static class Receiver extends ADMMessageReceiver {
       public Receiver() {
          super(ADMMessageHandler.class);
+         boolean ADMLatestAvailable = false;
+         try{
+            Class.forName( "com.amazon.device.messaging.ADMMessageHandlerJobBase" );
+            ADMLatestAvailable = true ;
+         }
+         catch (ClassNotFoundException e)
+         {
+            // Handle the exception.
+         }
+         if (ADMLatestAvailable) {
+            registerJobServiceClass(ADMMessageHandlerJob.class, 1);
+         }
       }
    }
 

OneSignalSDK/onesignal/src/main/java/com/onesignal/ADMMessageHandlerJob.kt

@@ -1,26 +1,46 @@
 package com.onesignal
 
-import android.content.Context
 
+import android.content.Context
 import android.content.Intent
-
-
 import com.amazon.device.messaging.ADMMessageHandlerJobBase
 
 class ADMMessageHandlerJob : ADMMessageHandlerJobBase() {
-    override fun onMessage(p0: Context?, p1: Intent?) {
-        TODO("Not yet implemented")
+
+    override fun onMessage(context: Context?, intent: Intent?) {
+        val bundle = intent!!.extras
+
+        val processedResult = NotificationBundleProcessor.processBundleFromReceiver(context, bundle)
+        // TODO: Figure out the correct replacement or usage of completeWakefulIntent method
+//      FCMBroadcastReceiver.completeWakefulIntent(intent);
+
+        // TODO: Figure out the correct replacement or usage of completeWakefulIntent method
+//      FCMBroadcastReceiver.completeWakefulIntent(intent);
+        if (processedResult.processed()) return
+
+        val payload = NotificationBundleProcessor.bundleAsJSONObject(bundle)
+        val notification = OSNotification(payload)
+
+        val notificationJob = OSNotificationGenerationJob(context)
+        notificationJob.jsonPayload = payload
+        notificationJob.context = context
+        notificationJob.notification = notification
+        NotificationBundleProcessor.processJobForDisplay(notificationJob, true)
     }
 
-    override fun onRegistered(p0: Context?, p1: String?) {
-        TODO("Not yet implemented")
+    override fun onRegistered(context: Context?, newRegistrationId: String?) {
+        OneSignal.Log(OneSignal.LOG_LEVEL.INFO, "ADM registration ID: $newRegistrationId")
+        PushRegistratorADM.fireCallback(newRegistrationId)
     }
 
-    override fun onUnregistered(p0: Context?, p1: String?) {
-        TODO("Not yet implemented")
+    override fun onUnregistered(context: Context?, registrationId: String?) {
+        OneSignal.Log(OneSignal.LOG_LEVEL.INFO, "ADM:onUnregistered: $registrationId")
     }
 
-    override fun onRegistrationError(p0: Context?, p1: String?) {
-        TODO("Not yet implemented")
+    override fun onRegistrationError(context: Context?, error: String?) {
+        OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "ADM:onRegistrationError: $error")
+        if ("INVALID_SENDER" == error) OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "Please double check that you have a matching package name (NOTE: Case Sensitive), api_key.txt, and the apk was signed with the same Keystore and Alias.")
+
+        PushRegistratorADM.fireCallback(null)
     }
 }