Fix user state null pointer exception

* Have a sync getter method to avoid accessing null user state

Author: Jeasmine

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

@@ -38,6 +38,8 @@ class OSTaskController {
     static final String SEND_OUTCOME_WITH_VALUE = "sendOutcomeWithValue()";
     static final HashSet<String> METHODS_AVAILABLE_FOR_DELAY = new HashSet<>(Arrays.asList(
             GET_TAGS,
+            SET_EMAIL,
+            LOGOUT_EMAIL,
             SYNC_HASHED_EMAIL,
             SET_EXTERNAL_USER_ID,
             SET_SUBSCRIPTION,
@@ -49,8 +51,11 @@ class OSTaskController {
             SET_REQUIRES_USER_PRIVACY_CONSENT,
             UNSUBSCRIBE_WHEN_NOTIFICATION_ARE_DISABLED,
             HANDLE_NOTIFICATION_OPEN,
-            SET_EMAIL,
-            APP_LOST_FOCUS));
+            APP_LOST_FOCUS,
+            SEND_OUTCOME,
+            SEND_UNIQUE_OUTCOME,
+            SEND_OUTCOME_WITH_VALUE
+    ));
 
     // The concurrent queue in which we pin pending tasks upon finishing initialization
     private final ConcurrentLinkedQueue<Runnable> taskQueueWaitingForInit = new ConcurrentLinkedQueue<>();

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

@@ -145,8 +145,8 @@ void logoutEmail() {
         keysToRemove.add("email_auth_hash");
         keysToRemove.add("device_player_id");
         keysToRemove.add("external_user_id");
-        toSyncUserState.removeFromSyncValues(keysToRemove);
-        toSyncUserState.persistState();
+        getToSyncUserState().removeFromSyncValues(keysToRemove);
+        getToSyncUserState().persistState();
 
         OneSignal.getEmailSubscriptionState().clearEmailAndId();
     }

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

@@ -51,12 +51,12 @@ void onSuccess(String responseStr) {
                         JSONObject lastGetTagsResponse = new JSONObject(responseStr);
                         if (lastGetTagsResponse.has("tags")) {
                             synchronized(LOCK) {
-                                JSONObject dependDiff = generateJsonDiff(currentUserState.getSyncValues().optJSONObject("tags"),
+                                JSONObject dependDiff = generateJsonDiff(getCurrentUserState().getSyncValues().optJSONObject("tags"),
                                         getToSyncUserState().getSyncValues().optJSONObject("tags"),
                                         null, null);
 
-                                currentUserState.putOnSyncValues("tags", lastGetTagsResponse.optJSONObject("tags"));
-                                currentUserState.persistState();
+                                getCurrentUserState().putOnSyncValues("tags", lastGetTagsResponse.optJSONObject("tags"));
+                                getCurrentUserState().persistState();
 
                                 // Allow server side tags to overwrite local tags expect for any pending changes
                                 //  that haven't been successfully posted.
@@ -72,14 +72,14 @@ void onSuccess(String responseStr) {
         }
 
         synchronized(LOCK) {
-            return new GetTagsResult(serverSuccess, JSONUtils.getJSONObjectWithoutBlankValues(toSyncUserState.getSyncValues(), "tags"));
+            return new GetTagsResult(serverSuccess, JSONUtils.getJSONObjectWithoutBlankValues(getToSyncUserState().getSyncValues(), "tags"));
         }
     }
 
     @Override
     @Nullable String getExternalId(boolean fromServer) {
         synchronized(LOCK) {
-            return toSyncUserState.getSyncValues().optString("external_user_id", null);
+            return getToSyncUserState().getSyncValues().optString("external_user_id", null);
         }
     }
 

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

@@ -144,7 +144,7 @@ boolean doRetry() {
     // currentUserState - Current known state of the user on OneSignal's server.
     // toSyncUserState  - Pending state that will be synced to the OneSignal server.
     //                    diff will be generated between currentUserState when a sync call is made to the server.
-    protected UserState currentUserState, toSyncUserState;
+    private UserState currentUserState, toSyncUserState;
 
     protected JSONObject generateJsonDiff(JSONObject cur, JSONObject changedTo, JSONObject baseOutput, Set<String> includeFields) {
         synchronized (LOCK) {
@@ -153,29 +153,34 @@ protected JSONObject generateJsonDiff(JSONObject cur, JSONObject changedTo, JSON
     }
 
     protected UserState getCurrentUserState() {
-        synchronized (LOCK) {
-            if (currentUserState == null)
-                currentUserState = newUserState("CURRENT_STATE", true);
+        if (currentUserState == null) {
+            synchronized (LOCK) {
+                if (currentUserState == null)
+                    currentUserState = newUserState("CURRENT_STATE", true);
+            }
         }
 
         return currentUserState;
     }
 
     protected UserState getToSyncUserState() {
-        synchronized (LOCK) {
-            if (toSyncUserState == null)
-                toSyncUserState = newUserState("TOSYNC_STATE", true);
+        if (toSyncUserState == null) {
+            synchronized (LOCK) {
+                if (toSyncUserState == null)
+                    toSyncUserState = newUserState("TOSYNC_STATE", true);
+            }
         }
 
         return toSyncUserState;
     }
 
     void initUserState() {
-        synchronized (LOCK) {
-            if (currentUserState == null)
-                currentUserState = newUserState("CURRENT_STATE", true);
+        if (currentUserState == null) {
+            synchronized (LOCK) {
+                if (currentUserState == null)
+                    currentUserState = newUserState("CURRENT_STATE", true);
+            }
         }
-
         getToSyncUserState();
     }