Merge pull request #1184 from OneSignal/fix/implement_ADMMessageHandlerJobBase

Fix/implement adm message handler job base

Author: emawby

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:amazon="http://schemas.amazon.com/apk/res/android"
     package="com.onesignal.sdktest">
 
     <uses-permission android:name="com.android.vending.BILLING" />
@@ -9,6 +10,16 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
 
+    <permission
+        android:name="com.onesignal.sdktest.permission.RECEIVE_ADM_MESSAGE"
+        android:protectionLevel="signature" />
+    <uses-permission android:name="com.onesignal.sdktest.permission.RECEIVE_ADM_MESSAGE" />
+    <!-- This permission allows your app access to receive push notifications from ADM. -->
+    <uses-permission android:name="com.amazon.device.messaging.permission.RECEIVE" />
+
+    <!-- ADM uses WAKE_LOCK to keep the processor from sleeping when a message is received. -->
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
     <application
         android:name=".application.MainApplication"
         android:allowBackup="true"
@@ -19,6 +30,37 @@
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
 
+        <amazon:enable-feature
+            android:name="com.amazon.device.messaging"
+            android:required="false"/>
+
+        <!-- You must replace the names in the service and receiver tags
+    with names that are appropriate to your package. -->
+
+        <service
+            android:name="com.onesignal.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:exported="false" />
+
+        <receiver
+            android:name="com.onesignal.ADMMessageHandler$Receiver"
+            android:permission="com.amazon.device.messaging.permission.SEND" >
+
+            <!-- To interact with ADM, your app must listen for the following intents. -->
+            <intent-filter>
+                <action android:name="com.amazon.device.messaging.intent.REGISTRATION" />
+                <action android:name="com.amazon.device.messaging.intent.RECEIVE" />
+
+                <!-- Replace the name in the category tag with your app's package name. -->
+                <category android:name="com.onesignal.sdktest" />
+            </intent-filter>
+        </receiver>
+
         <meta-data android:name="com.onesignal.NotificationServiceExtension"
             android:value="com.onesignal.sdktest.notification.NotificationServiceExtension" />
 

Examples/OneSignalDemo/app/src/main/assets/api_key.txt

@@ -0,0 +1,2 @@
+Insert Amazon API Key here.
+https://documentation.onesignal.com/docs/generate-an-amazon-api-key

OneSignalSDK/onesignal/consumer-proguard-rules.pro

@@ -55,6 +55,8 @@
 # Proguard ends up removing this class even if it is used in AndroidManifest.xml so force keeping it.
 -keep public class com.onesignal.ADMMessageHandler {*;}
 
+-keep public class com.onesignal.ADMMessageHandlerJob {*;}
+
 -keep class com.onesignal.JobIntentService$* {*;}
 
 -keep class com.onesignal.OneSignalUnityProxy {*;}

OneSignalSDK/onesignal/libs/amazon-device-messaging-1.0.1.jar

@@ -31,6 +31,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 
+import com.amazon.device.messaging.ADMMessageHandlerJobBase;
 import com.amazon.device.messaging.ADMMessageHandlerBase;
 import com.amazon.device.messaging.ADMMessageReceiver;
 
@@ -40,9 +41,24 @@
 //             when "proguard-android-optimize.txt" is used.
 public class ADMMessageHandler extends ADMMessageHandlerBase {
 
+   private static final int JOB_ID = 123891;
+
    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, JOB_ID);
+         }
+         OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "ADM latest available: " + ADMLatestAvailable);
       }
    }
 

OneSignalSDK/onesignal/libs/amazon-device-messaging-1.1.0.jar

@@ -0,0 +1,45 @@
+package com.onesignal
+
+import android.content.Context
+import android.content.Intent
+import com.amazon.device.messaging.ADMMessageHandlerJobBase
+
+class ADMMessageHandlerJob : ADMMessageHandlerJobBase() {
+
+    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);
+
+        if (processedResult.processed()) return
+
+        val payload = NotificationBundleProcessor.bundleAsJSONObject(bundle)
+        val notification = OSNotification(payload)
+
+        val notificationJob = OSNotificationGenerationJob(context).apply {
+            this.jsonPayload = payload
+            this.context = context
+            this.notification = notification
+        }
+
+        NotificationBundleProcessor.processJobForDisplay(notificationJob, true)
+    }
+
+    override fun onRegistered(context: Context?, newRegistrationId: String?) {
+        OneSignal.Log(OneSignal.LOG_LEVEL.INFO, "ADM registration ID: $newRegistrationId")
+        PushRegistratorADM.fireCallback(newRegistrationId)
+    }
+
+    override fun onUnregistered(context: Context?, registrationId: String?) {
+        OneSignal.Log(OneSignal.LOG_LEVEL.INFO, "ADM:onUnregistered: $registrationId")
+    }
+
+    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)
+    }
+}