Fix idsAvailable not firing a 2nd time

* Fixed issue where idsAvailable would not fire a 2nd time if registrationId the first time
OneSignal · Jun 16, 2018 · cc67b06 · cc67b06
1 parent 13f12eb
commit cc67b06
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java
@@ -1683,7 +1683,7 @@ public void run() {
       runIdsAvailable.run();
    }
 
-   private static void fireIdsAvailableCallback() {
+   static void fireIdsAvailableCallback() {
       if (idsAvailableHandler != null) {
          OSUtils.runOnMainUIThread(new Runnable() {
             @Override

diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/UserStatePushSynchronizer.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/UserStatePushSynchronizer.java
@@ -157,5 +157,7 @@ protected void fireEventsForUpdateFailure(JSONObject jsonFields) {
     protected void onSuccessfulSync(JSONObject jsonFields) {
         if (jsonFields.has("email"))
             OneSignal.fireEmailUpdateSuccess();
+        if (jsonFields.has("identifier"))
+            OneSignal.fireIdsAvailableCallback();
     }
 }
diff --git a/OneSignalSDK/unittest/src/test/java/com/test/onesignal/MainOneSignalClassRunner.java b/OneSignalSDK/unittest/src/test/java/com/test/onesignal/MainOneSignalClassRunner.java
@@ -591,13 +591,19 @@ public void testInvalidGoogleProjectNumberWithSuccessfulRegisterResponse() throw
       //   and is testing the same logic.
       ShadowPushRegistratorGCM.fail = true;
       OneSignalInitWithBadProjectNum();
-
       threadAndTaskWait();
       Robolectric.getForegroundThreadScheduler().runOneTask();
-      assertEquals(-7, ShadowOneSignalRestClient.lastPost.getInt("notification_types"));
 
+      assertEquals(-7, ShadowOneSignalRestClient.lastPost.getInt("notification_types"));
       // Test that idsAvailable still fires
       assertEquals(ShadowOneSignalRestClient.pushUserId, callBackUseId);
+      assertNull(getCallBackRegId); // Since GCM registration failed, this should be null
+
+      // We now get a push token after the device registers with Onesignal,
+      //    the idsAvailable callback should fire a 2nd time with a registrationId automatically
+      ShadowPushRegistratorGCM.manualFireRegisterForPush();
+      threadAndTaskWait();
+      assertEquals(ShadowPushRegistratorGCM.regId, getCallBackRegId);
    }
 
    @Test