Merge pull request #532 from OneSignal/synchronization

Synchronize State

Author: Nightsd01

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

@@ -119,8 +119,10 @@ protected synchronized UserState getToSyncUserState() {
     }
 
     void initUserState() {
-        if (currentUserState == null)
-            currentUserState = newUserState("CURRENT_STATE", true);
+        synchronized (syncLock) {
+            if (currentUserState == null)
+                currentUserState = newUserState("CURRENT_STATE", true);
+        }
 
         getToSyncUserState();
     }
@@ -167,6 +169,9 @@ private void internalSyncUserState(boolean fromSyncService) {
             return;
         }
 
+        if (currentUserState == null)
+            initUserState();
+
         final boolean isSessionCall = isSessionCall();
         JSONObject jsonBody, dependDiff;
         synchronized (syncLock) {