Immediately generate a notification's Android ID when not set, rather than when first requested through OSNotificationGenerationJob.getAndroidId(). This ensures that OSNotification will have an Android Notification ID earlier in the notification received process, specifically before control is given to OSRemoteNotificationReceivedHandler.

Author: brismithers

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

@@ -40,6 +40,7 @@ public class OSNotificationGenerationJob {
     private Context context;
     private JSONObject jsonPayload;
     private boolean restoring;
+    private boolean didGenerateId;
 
     private Long shownTimeStamp;
 
@@ -61,7 +62,7 @@ public class OSNotificationGenerationJob {
     OSNotificationGenerationJob(Context context, OSNotification notification, JSONObject jsonPayload) {
         this.context = context;
         this.jsonPayload = jsonPayload;
-        this.notification = notification;
+        this.setNotification(notification);
     }
 
     /**
@@ -105,24 +106,21 @@ String getApiNotificationId() {
     }
 
     int getAndroidIdWithoutCreate() {
-        if (!notification.hasNotificationId())
+        if (didGenerateId)
             return -1;
 
         return notification.getAndroidNotificationId();
     }
 
     Integer getAndroidId() {
-        if (!notification.hasNotificationId())
-            notification.setAndroidNotificationId(new SecureRandom().nextInt());
-
         return notification.getAndroidNotificationId() ;
     }
 
     void setAndroidIdWithoutOverriding(Integer id) {
         if (id == null)
             return;
 
-        if (notification.hasNotificationId())
+        if (!didGenerateId)
             return;
 
         notification.setAndroidNotificationId(id);
@@ -133,6 +131,21 @@ public OSNotification getNotification() {
     }
 
     public void setNotification(OSNotification notification) {
+        // we determine whether an android notification id has been
+        // generated by us only for the first notification. The assumption
+        // is any subsequent notification updates are derived from the
+        // initial one, therefore the didGenerateId will persist across.
+        if(this.notification == null)
+        {
+            if (notification.hasNotificationId())
+                didGenerateId = false;
+            else
+            {
+                didGenerateId = true;
+                notification.setAndroidNotificationId(new SecureRandom().nextInt());
+            }
+        }
+
         this.notification = notification;
     }