Fix for extra player PUT network calls

* These extra calls were made if there was a delay in registering with GCM or with location prompting enabled and sendTags or other player updating calls were made.

Author: jkasten2

OneSignalSDK/app/src/main/java/com/onesignal/example/OneSignalExampleApp.java

@@ -50,6 +50,8 @@ public void onCreate() {
           .setNotificationOpenedHandler(new ExampleNotificationOpenedHandler())
           .setNotificationReceivedHandler(new ExampleNotificationReceivedHandler())
           .init();
+
+      OneSignal.sendTag("test1", "test1");
    }
 
    private class ExampleNotificationReceivedHandler implements OneSignal.NotificationReceivedHandler {

OneSignalSDK/app/src/test/java/com/onesignal/ShadowOneSignalRestClient.java

@@ -101,10 +101,12 @@ private static void mockPost(String url, JSONObject jsonBody, OneSignalRestClien
    }
 
    static void post(String url, JSONObject jsonBody, OneSignalRestClient.ResponseHandler responseHandler) {
+      System.out.println("POST:URL:" + url + "  jsonBody: " + jsonBody.toString());
       mockPost(url, jsonBody, responseHandler);
    }
 
    static void postSync(String url, JSONObject jsonBody, OneSignalRestClient.ResponseHandler responseHandler) {
+      System.out.println("POST Sync:URL:" + url + "  jsonBody: " + jsonBody.toString());
       mockPost(url, jsonBody, responseHandler);
    }
 

OneSignalSDK/app/src/test/java/com/onesignal/ShadowPushRegistratorGPS.java

@@ -38,7 +38,7 @@ public class ShadowPushRegistratorGPS {
    public static final String regId = "aspdfoh0fhj02hr-2h";
 
    public static boolean fail = false;
-   public static int waitTimer = 0;
+   public static boolean skipComplete;
 
    private static PushRegistrator.RegisteredHandler lastCallback;
 
@@ -49,9 +49,11 @@ public static void manualFireRegisterForPush() {
    public void registerForPush(Context context, String googleProjectNumber, PushRegistrator.RegisteredHandler callback) {
       lastCallback = callback;
 
-      if (waitTimer > 0)
-         SystemClock.sleep(waitTimer);
+      if (!skipComplete)
+         callback.complete(fail ? null : regId, 1);
+   }
 
-      callback.complete(fail ? null : regId, 1);
+   public static void fireLastCallback() {
+      lastCallback.complete(fail ? null : regId, 1);
    }
 }

OneSignalSDK/app/src/test/java/com/onesignal/StaticResetHelper.java

@@ -19,7 +19,7 @@ public class StaticResetHelper {
       classes.add(new StaticResetHelper().new ClassState(OneSignal.class, new OtherFieldHandler() {
          @Override
          public boolean onOtherField(Field field) throws Exception {
-            if (field.getName() == "unprocessedOpenedNotifis") {
+            if (field.getName().equals("unprocessedOpenedNotifis")) {
                field.set(null, new ArrayList<JSONArray>());
                return true;
             }
@@ -30,7 +30,7 @@ public boolean onOtherField(Field field) throws Exception {
       classes.add(new StaticResetHelper().new ClassState(OneSignalStateSynchronizer.class, new OtherFieldHandler() {
          @Override
          public boolean onOtherField(Field field) throws Exception {
-            if (field.getName() == "currentUserState" || field.getName() == "toSyncUserState") {
+            if (field.getName().equals("currentUserState") || field.getName().equals("toSyncUserState")) {
                field.set(null, null);
                return true;
             }

OneSignalSDK/app/src/test/java/com/test/onesignal/MainOneSignalClassRunner.java

@@ -143,7 +143,9 @@ private static void cleanUp() {
       ShadowOneSignalRestClient.networkCallCount = 0;
       ShadowOneSignalRestClient.testThread = Thread.currentThread();
 
+      ShadowPushRegistratorGPS.skipComplete = false;
       ShadowPushRegistratorGPS.fail = false;
+
       notificationOpenedMessage = null;
       lastGetTags = null;
    }
@@ -735,6 +737,26 @@ public void shouldSendTagsWithRequestBatching() throws Exception {
       Assert.assertEquals(4, ShadowOneSignalRestClient.networkCallCount);
    }
 
+   @Test
+   public void shouldNotAttemptToSendTagsBeforeGettingPlayerId() throws Exception {
+      ShadowPushRegistratorGPS.skipComplete = true;
+      OneSignalInit();
+      GetIdsAvailable();
+
+      threadAndTaskWait();
+      Assert.assertEquals(1, ShadowOneSignalRestClient.networkCallCount);
+
+      // Should not attempt to make a network call yet as we don't have a player_id
+      OneSignal.sendTags(new JSONObject("{\"test1\": \"value1\"}"));
+      threadAndTaskWait();
+      Assert.assertEquals(1, ShadowOneSignalRestClient.networkCallCount);
+
+      ShadowPushRegistratorGPS.fireLastCallback();
+      threadAndTaskWait();
+      Assert.assertEquals(2, ShadowOneSignalRestClient.networkCallCount);
+      Assert.assertNotNull(callBackUseId);
+   }
+
    @Test
    public void testOldIntValues() throws Exception {
       final SharedPreferences prefs = blankActivity.getSharedPreferences(OneSignal.class.getSimpleName(), Context.MODE_PRIVATE);

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

@@ -167,7 +167,7 @@ public void init() {
    private static TrackGooglePurchase trackGooglePurchase;
    private static TrackAmazonPurchase trackAmazonPurchase;
 
-   public static final String VERSION = "030000";
+   public static final String VERSION = "030001";
 
    private static AdvertisingIdentifierProvider mainAdIdProvider = new AdvertisingIdProviderGPS();
 

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

@@ -491,18 +491,20 @@ static void syncUserState(boolean fromSyncService) {
          currentUserState.persistStateAfterSync(dependDiff, null);
          return;
       }
-
       toSyncUserState.persistState();
+
+      // Prevent non-create player network calls when we don't have a player id yet.
+      if (userId == null && !nextSyncIsSession)
+         return;
+
       if (!isSessionCall || fromSyncService) {
          OneSignalRestClient.putSync("players/" + userId, jsonBody, new OneSignalRestClient.ResponseHandler() {
             @Override
             void onFailure(int statusCode, String response, Throwable throwable) {
                OneSignal.Log(OneSignal.LOG_LEVEL.WARN, "Failed last request. statusCode: " + statusCode + "\nresponse: " + response);
 
-               if (response400WithErrorsContaining(statusCode, response, "No user with this id found")) {
-                  resetCurrentState();
-                  postNewSyncUserState();
-               }
+               if (response400WithErrorsContaining(statusCode, response, "No user with this id found"))
+                  handlePlayerDeletedFromServer();
                else
                   getNetworkHandlerThread(NetworkHandlerThread.NETWORK_HANDLER_USERSTATE).doRetry();
             }
@@ -527,10 +529,8 @@ void onFailure(int statusCode, String response, Throwable throwable) {
                waitingForSessionResponse = false;
                OneSignal.Log(OneSignal.LOG_LEVEL.WARN, "Failed last request. statusCode: " + statusCode + "\nresponse: " + response);
 
-               if (response400WithErrorsContaining(statusCode, response, "not a valid device_type")) {
-                  resetCurrentState();
-                  postNewSyncUserState();
-               }
+               if (response400WithErrorsContaining(statusCode, response, "not a valid device_type"))
+                  handlePlayerDeletedFromServer();
                else
                   getNetworkHandlerThread(NetworkHandlerThread.NETWORK_HANDLER_USERSTATE).doRetry();
             }
@@ -599,7 +599,7 @@ static void postUpdate(UserState postSession, boolean isSession) {
       JSONObject dependValues = getUserStateForModification().dependValues;
       generateJsonDiff(dependValues, postSession.dependValues, dependValues, null);
 
-      nextSyncIsSession = nextSyncIsSession || isSession;
+      nextSyncIsSession = nextSyncIsSession || isSession || OneSignal.getUserId() == null;
    }
 
    static void sendTags(JSONObject newTags) {
@@ -728,4 +728,10 @@ static void resetCurrentState() {
       currentUserState.persistState();
       OneSignal.setLastSessionTime(-60 * 61);
    }
+
+   static void handlePlayerDeletedFromServer() {
+      resetCurrentState();
+      nextSyncIsSession = true;
+      postNewSyncUserState();
+   }
 }