HmsMessageService.onMessageReceived displaying

* Now if an HMS "Data Message" is recieved in the OneSignal format it
will be processed through the normal flow like GCM / FCM messages do.
   -  All features we support for FCM Android notificatons now apply to
         these types.

Author: jkasten2

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

@@ -131,7 +131,7 @@ private void setAbort() {
       return processedResult;
    }
 
-   private static void startGCMService(Context context, Bundle bundle) {
+   static void startGCMService(Context context, Bundle bundle) {
       // If no remote resources have to be downloaded don't create a job which could add some delay.
       if (!NotificationBundleProcessor.hasRemoteResource(bundle)) {
          BundleCompat taskExtras = setCompatBundleForServer(bundle, BundleCompatFactory.getInstance());

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

@@ -1,6 +1,7 @@
 package com.onesignal;
 
 import com.huawei.hms.push.HmsMessageService;
+import com.huawei.hms.push.RemoteMessage;
 
 public class HmsMessageServiceOneSignal extends HmsMessageService {
 
@@ -16,4 +17,17 @@ public void onNewToken(String token) {
         PushRegistratorHMS.fireCallback(token);
     }
 
+    /**
+     * This method is called in the following cases:
+     *   1. "Data messages" - App process is alive when received.
+     *   2. "Notification Message" - foreground_show = false and app is in focus
+     * This method callback must be completed in 10 seconds, start a new Job if more time is needed.
+     *   - This may only be a restriction for #1
+     *   - 10 sec limit didn't seem to hit for #2, even when backgrounding the app after the method starts
+     * @param message RemoteMessage
+     */
+    @Override
+    public void onMessageReceived(RemoteMessage message) {
+        NotificationPayloadProcessorHMS.processDataMessageReceived(this, message.getData());
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.onesignal;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -71,4 +72,20 @@ private static void handleProcessJsonOpenData(@NonNull Activity activity, @NonNu
             OSNotificationFormatHelper.getOSNotificationIdFromJson(jsonData)
         );
     }
+
+    static void processDataMessageReceived(@NonNull Context context, @NonNull String data) {
+        OneSignal.setAppContext(context);
+        Bundle bundle = OSUtils.jsonStringToBundle(data);
+        if (bundle == null)
+            return;
+
+        NotificationBundleProcessor.ProcessedBundleResult processedResult = NotificationBundleProcessor.processBundleFromReceiver(context, bundle);
+
+        // Return if the notification will NOT be handled by normal GcmIntentService display flow.
+        if (processedResult.processed())
+            return;
+
+        // TODO: 4.0.0 or after - What is in GcmBroadcastReceiver should be split into a shared class to support FCM, HMS, and ADM
+        GcmBroadcastReceiver.startGCMService(context, bundle);
+    }
 }

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

@@ -59,6 +59,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Locale;
 import java.util.Set;
 import java.util.UUID;
@@ -633,6 +634,23 @@ static boolean hasConfigChangeFlag(Activity activity, int configChangeFlag) {
       return result;
    }
 
+   static @Nullable Bundle jsonStringToBundle(@NonNull String data) {
+      try {
+         JSONObject jsonObject = new JSONObject(data);
+         Bundle bundle = new Bundle();
+         Iterator iterator = jsonObject.keys();
+         while (iterator.hasNext()) {
+            String key = (String)iterator.next();
+            String value = jsonObject.getString(key);
+            bundle.putString(key, value);
+         }
+         return bundle;
+      } catch (JSONException e) {
+         e.printStackTrace();
+         return null;
+      }
+   }
+
    static boolean shouldLogMissingAppIdError(@Nullable String appId) {
       if (appId != null)
          return false;