Merge pull request #1590 from OneSignal/fix/npe_set_email

Fix NPE: use a getter for the current UserState

Author: nan-li

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

@@ -266,13 +266,13 @@ private void internalSyncUserState(boolean fromSyncService) {
         final boolean isSessionCall = !fromSyncService && isSessionCall();
         JSONObject jsonBody, dependDiff;
         synchronized (LOCK) {
-            jsonBody = currentUserState.generateJsonDiff(getToSyncUserState(), isSessionCall);
+            jsonBody = getCurrentUserState().generateJsonDiff(getToSyncUserState(), isSessionCall);
             UserState toSyncState = getToSyncUserState();
-            dependDiff = currentUserState.generateJsonDiffFromDependValues(toSyncState, null);;
+            dependDiff = getCurrentUserState().generateJsonDiffFromDependValues(toSyncState, null);;
             OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "UserStateSynchronizer internalSyncUserState from session call: "+ isSessionCall + " jsonBody: " + jsonBody);
             // Updates did not result in a server side change, skipping network call
             if (jsonBody == null) {
-                currentUserState.persistStateAfterSync(dependDiff, null);
+                getCurrentUserState().persistStateAfterSync(dependDiff, null);
                 sendTagsHandlersPerformOnSuccess();
                 externalUserIdUpdateHandlersPerformOnSuccess();
                 return;
@@ -290,11 +290,11 @@ private void doEmailLogout(String userId) {
         String urlStr = "players/" + userId + "/email_logout";
         JSONObject jsonBody = new JSONObject();
         try {
-            ImmutableJSONObject dependValues = currentUserState.getDependValues();
+            ImmutableJSONObject dependValues = getCurrentUserState().getDependValues();
             if (dependValues.has(EMAIL_AUTH_HASH_KEY))
                 jsonBody.put(EMAIL_AUTH_HASH_KEY, dependValues.optString(EMAIL_AUTH_HASH_KEY));
 
-            ImmutableJSONObject syncValues = currentUserState.getSyncValues();
+            ImmutableJSONObject syncValues = getCurrentUserState().getSyncValues();
             if (syncValues.has(PARENT_PLAYER_ID))
                 jsonBody.put(PARENT_PLAYER_ID, syncValues.optString(PARENT_PLAYER_ID));
 
@@ -333,10 +333,10 @@ private void logoutEmailSyncSuccess() {
         toSyncUserState.removeFromSyncValues(EMAIL_KEY);
         toSyncUserState.persistState();
 
-        currentUserState.removeFromDependValues(EMAIL_AUTH_HASH_KEY);
-        currentUserState.removeFromSyncValues(PARENT_PLAYER_ID);
-        String emailLoggedOut = currentUserState.getSyncValues().optString(EMAIL_KEY);
-        currentUserState.removeFromSyncValues(EMAIL_KEY);
+        getCurrentUserState().removeFromDependValues(EMAIL_AUTH_HASH_KEY);
+        getCurrentUserState().removeFromSyncValues(PARENT_PLAYER_ID);
+        String emailLoggedOut = getCurrentUserState().getSyncValues().optString(EMAIL_KEY);
+        getCurrentUserState().removeFromSyncValues(EMAIL_KEY);
 
         OneSignalStateSynchronizer.setNewSessionForEmail();
 
@@ -379,7 +379,7 @@ void onFailure(int statusCode, String response, Throwable throwable) {
             @Override
             void onSuccess(String response) {
                 synchronized (LOCK) {
-                    currentUserState.persistStateAfterSync(dependDiff, jsonBody);
+                    getCurrentUserState().persistStateAfterSync(dependDiff, jsonBody);
                     onSuccessfulSync(jsonBody);
                 }
 
@@ -422,7 +422,7 @@ void onFailure(int statusCode, String response, Throwable throwable) {
             void onSuccess(String response) {
                 synchronized (LOCK) {
                     waitingForSessionResponse = false;
-                    currentUserState.persistStateAfterSync(dependDiff, jsonBody);
+                    getCurrentUserState().persistStateAfterSync(dependDiff, jsonBody);
 
                     try {
                         OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "doCreateOrNewSession:response: " + response);
@@ -468,7 +468,7 @@ private void handleNetworkFailure(int statusCode) {
     }
 
     private void fireNetworkFailureEvents() {
-        final JSONObject jsonBody = currentUserState.generateJsonDiff(toSyncUserState, false);
+        final JSONObject jsonBody = getCurrentUserState().generateJsonDiff(toSyncUserState, false);
         if (jsonBody != null)
             fireEventsForUpdateFailure(jsonBody);
 
@@ -570,8 +570,8 @@ private void handlePlayerDeletedFromServer() {
     }
 
     void resetCurrentState() {
-        currentUserState.setSyncValues(new JSONObject());
-        currentUserState.persistState();
+        getCurrentUserState().setSyncValues(new JSONObject());
+        getCurrentUserState().persistState();
     }
 
     public abstract boolean getUserSubscribePreference();