idsAvailable bug fix.

* Fixed bug where idsAvailable could fire with a userId of null if the device is having intermittent connection issues.
   - Added UnitTest for this as well.

Author: jkasten2

OneSignalSDK.jar

@@ -102,13 +102,13 @@
     <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.1.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.1.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="icu4j-53.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-1.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="robolectric-3.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />

OneSignalSDK/.idea/compiler.xml

@@ -35,7 +35,8 @@ dependencies {
 
     // Use for released SDK
     //compile 'com.onesignal:OneSignal:1.10.+@aar'
-    //compile 'com.google.android.gms:play-services:7.3.+'
+    //compile 'com.google.android.gms:play-services-gcm:7.3.+'
+    //compile 'com.google.android.gms:play-services-analytics:7.3.+'
 
     testCompile 'junit:junit:4.12'
     //    testCompile 'org.robolectric:shadows-support-v4:3.0'

OneSignalSDK/.idea/misc.xml

@@ -39,7 +39,11 @@ public class ShadowPushRegistratorGPS {
 
     public static final String regId = "aspdfoh0fhj02hr-2h";
 
+    public static boolean failFirst = false;
+
     public void registerForPush(Context context, String googleProjectNumber, PushRegistrator.RegisteredHandler callback) {
+        if (failFirst)
+            callback.complete(null);
         callback.complete(regId);
     }
 }

OneSignalSDK/app/app.iml

@@ -96,7 +96,7 @@ public void beforeEachTest() throws Exception {
 
       ShadowOneSignalRestClient.failNext = false;
       ShadowOneSignalRestClient.testThread = Thread.currentThread();
-      GetIdsAvailable();
+      ShadowPushRegistratorGPS.failFirst = false;
       notificationOpenedMessage = null;
    }
 
@@ -153,6 +153,7 @@ public void notificationOpened(String message, JSONObject additionalData, boolea
 
    @Test
    public void testInvalidGoogleProjectNumber() throws Exception {
+      GetIdsAvailable();
       // Tests seem to be over lapping when running them all. Wait a bit before running this test.
       try {Thread.sleep(1000);} catch (Throwable t) {}
 
@@ -168,6 +169,7 @@ public void testInvalidGoogleProjectNumber() throws Exception {
 
    @Test
    public void testUnsubcribeShouldMakeRegIdNullToIdsAvailable() throws Exception {
+      GetIdsAvailable();
       OneSignal.init(blankActiviy, "123456789", "b2f7f966-d8cc-11e4-bed1-df8f05be55ba");
       try {Thread.sleep(5000);} catch (Throwable t) {}
       Assert.assertEquals(ShadowPushRegistratorGPS.regId, ShadowOneSignalRestClient.lastPost.getString("identifier"));
@@ -275,4 +277,22 @@ public void shouldAllowMultipleSetSubscription() throws Exception {
       OneSignal.setSubscription(true);
       Assert.assertNull(ShadowOneSignalRestClient.lastPost);
    }
+
+   private static boolean userIdWasNull = false;
+   @Test
+   public void shouldNotFireIdsAvailableWithoutUserId() throws Exception {
+      ShadowOneSignalRestClient.failNext = true;
+      ShadowPushRegistratorGPS.failFirst = true;
+
+      OneSignal.idsAvailable(new OneSignal.IdsAvailableHandler() {
+         @Override
+         public void idsAvailable(String userId, String registrationId) {
+            if (userId == null)
+               userIdWasNull = true;
+         }
+      });
+      OneSignal.init(blankActiviy, "123456789", "b2f7f966-d8cc-11e4-bed1-df8f05be55ba");
+
+      Assert.assertFalse(userIdWasNull);
+   }
 }

OneSignalSDK/app/build.gradle

@@ -141,7 +141,7 @@ public interface PostNotificationResponseHandler {
    private static TrackGooglePurchase trackGooglePurchase;
    private static TrackAmazonPurchase trackAmazonPurchase;
 
-   public static final String VERSION = "011004";
+   public static final String VERSION = "011005";
 
    private static PushRegistrator pushRegistrator;
    private static AdvertisingIdentifierProvider mainAdIdProvider = new AdvertisingIdProviderGPS();
@@ -827,7 +827,12 @@ private static void internalFireIdsAvailableCallback() {
       if (currentSubscription < 1)
          regId = null;
 
-      idsAvailableHandler.idsAvailable(getUserId(), regId);
+      String userId = getUserId();
+      if (userId == null)
+         return;
+
+      idsAvailableHandler.idsAvailable(userId, regId);
+
       if (regId != null)
          idsAvailableHandler = null;
    }