Fix NPE: use a getter for the current UserState

* The currentUserState could be null from a user's report

* Replace currentUserState with getCurrentUserState() to avoid an NPE

* Replaced more instances of currentUserState with getCurrentUserState() than just the cases reported by the user. Which are all the places in UserStateSynchronizer that access currentUserState and it could possibly be null.

Author: nan-li

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

@@ -266,7 +266,7 @@ 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);;
             OneSignal.onesignalLog(OneSignal.LOG_LEVEL.DEBUG, "UserStateSynchronizer internalSyncUserState from session call: "+ isSessionCall + " jsonBody: " + jsonBody);
@@ -290,7 +290,7 @@ 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));
 
@@ -333,7 +333,7 @@ private void logoutEmailSyncSuccess() {
         toSyncUserState.removeFromSyncValues(EMAIL_KEY);
         toSyncUserState.persistState();
 
-        currentUserState.removeFromDependValues(EMAIL_AUTH_HASH_KEY);
+        getCurrentUserState().removeFromDependValues(EMAIL_AUTH_HASH_KEY);
         currentUserState.removeFromSyncValues(PARENT_PLAYER_ID);
         String emailLoggedOut = currentUserState.getSyncValues().optString(EMAIL_KEY);
         currentUserState.removeFromSyncValues(EMAIL_KEY);
@@ -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,7 +570,7 @@ private void handlePlayerDeletedFromServer() {
     }
 
     void resetCurrentState() {
-        currentUserState.setSyncValues(new JSONObject());
+        getCurrentUserState().setSyncValues(new JSONObject());
         currentUserState.persistState();
     }