Add backguards compatibility

* Keep old onNewToken without bundle param

Author: Jeasmine

Examples/OneSignalDemo/app/src/huawei/java/com/onesignal/sdktest/notification/HmsMessageServiceAppLevel.java

@@ -19,12 +19,21 @@ public class HmsMessageServiceAppLevel extends HmsMessageService {
      */
     @Override
     public void onNewToken(String token, Bundle bundle) {
-        OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "HMS onNewToken refresh token:" + token + " bundle: " + bundle);
+        OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "HmsMessageServiceAppLevel onNewToken refresh token:" + token + " bundle: " + bundle);
 
         // Forward event on to OneSignal SDK
         OneSignalHmsEventBridge.onNewToken(this, token, bundle);
     }
 
+    @Deprecated
+    @Override
+    public void onNewToken(String token) {
+        OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "HmsMessageServiceAppLevel onNewToken refresh token:" + token);
+
+        // Forward event on to OneSignal SDK
+        OneSignalHmsEventBridge.onNewToken(this, token);
+    }
+
     /**
      * This method is called in the following cases:
      * 1. "Data messages" - App process is alive when received.

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

@@ -22,7 +22,6 @@
  */
 public class HmsMessageServiceOneSignal extends HmsMessageService {
 
-
     /**
      * When an app calls the getToken method to apply for a token from the server,
      * if the server does not return the token during current method calling, the server can return the token through this method later.
@@ -33,9 +32,19 @@ public class HmsMessageServiceOneSignal extends HmsMessageService {
      */
     @Override
     public void onNewToken(String token, Bundle bundle) {
+        OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "HmsMessageServiceOneSignal onNewToken refresh token:" + token);
+
         OneSignalHmsEventBridge.onNewToken(this, token, bundle);
     }
 
+    @Deprecated
+    @Override
+    public void onNewToken(String token) {
+        OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "HmsMessageServiceOneSignal onNewToken refresh token:" + token);
+
+        OneSignalHmsEventBridge.onNewToken(this, token);
+    }
+
     /**
      * This method is called in the following cases:
      *   1. "Data messages" - App process is alive when received.

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

@@ -8,6 +8,8 @@
 
 import com.huawei.hms.push.RemoteMessage;
 
+import java.util.concurrent.atomic.AtomicBoolean;
+
 /**
  * If you have your own {@link com.huawei.hms.push.HmsMessageService} defined in your app please also
  * call {@link OneSignalHmsEventBridge#onNewToken} and {@link OneSignalHmsEventBridge#onMessageReceived}
@@ -18,12 +20,18 @@
  */
 public class OneSignalHmsEventBridge {
 
+    private static final AtomicBoolean firstToken = new AtomicBoolean(true);
+
     /**
      * Method used by last HMS push version 5.3.0.304 and upper
      */
     public static void onNewToken(@NonNull Context context, @NonNull String token, @Nullable Bundle bundle) {
-        OneSignal.Log(OneSignal.LOG_LEVEL.INFO, "HmsMessageServiceOneSignal.onNewToken - HMS token: " + token + " Bundle: " + bundle);
-        PushRegistratorHMS.fireCallback(token);
+        if (firstToken.compareAndSet(true, false)) {
+            OneSignal.Log(OneSignal.LOG_LEVEL.INFO, "OneSignalHmsEventBridge onNewToken - HMS token: " + token + " Bundle: " + bundle);
+            PushRegistratorHMS.fireCallback(token);
+        } else {
+            OneSignal.Log(OneSignal.LOG_LEVEL.INFO, "OneSignalHmsEventBridge ignoring onNewToken - HMS token: " + token + " Bundle: " + bundle);
+        }
     }
 
     /**