Fix logout email ended linking again email

* Clean email data from user states
* Don't wait for email to be save on shared preferences, use memory email data
* Add logout email button under example app

Author: Jeasmine

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

@@ -86,4 +86,10 @@ public JSONObject optJSONObject(String name) {
         return jsonObject.optJSONObject(name);
     }
 
+    @Override
+    public String toString() {
+        return "ImmutableJSONObject{" +
+                "jsonObject=" + jsonObject +
+                '}';
+    }
 }

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

@@ -2353,12 +2353,16 @@ static boolean hasEmailId() {
    }
 
    static String getEmailId() {
-      if (TextUtils.isEmpty(emailId) && appContext != null) {
+      if (emailId == null && appContext != null) {
          emailId = OneSignalPrefs.getString(
                  OneSignalPrefs.PREFS_ONESIGNAL,
                  OneSignalPrefs.PREFS_OS_EMAIL_ID,
                  null);
       }
+
+      if (TextUtils.isEmpty(emailId))
+         return null;
+
       return emailId;
    }
 

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

@@ -395,4 +395,13 @@ private static JSONObject generateJsonDiff(JSONObject cur, JSONObject changedTo,
             return JSONUtils.generateJsonDiff(cur, changedTo, baseOutput, includeFields);
         }
     }
+
+    @Override
+    public String toString() {
+        return "UserState{" +
+                "persistKey='" + persistKey + '\'' +
+                ", dependValues=" + dependValues +
+                ", syncValues=" + syncValues +
+                '}';
+    }
 }

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

@@ -292,6 +292,7 @@ private void logoutEmailSyncSuccess() {
         getToSyncUserState().removeFromDependValues("logoutEmail");
         toSyncUserState.removeFromDependValues("email_auth_hash");
         toSyncUserState.removeFromSyncValues("parent_player_id");
+        toSyncUserState.removeFromSyncValues("email");
         toSyncUserState.persistState();
 
         currentUserState.removeFromDependValues("email_auth_hash");

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

@@ -56,6 +56,15 @@ public static class Request {
          this.payload = payload;
          this.url = url;
       }
+
+      @Override
+      public String toString() {
+         return "Request{" +
+                 "method=" + method +
+                 ", payload=" + payload +
+                 ", url='" + url + '\'' +
+                 '}';
+      }
    }
 
    private static class PendingResponse {

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

@@ -39,6 +39,7 @@
 import android.location.Location;
 import android.net.ConnectivityManager;
 import android.os.Bundle;
+import android.util.Log;
 
 import com.huawei.hms.location.HWLocation;
 import com.onesignal.MockOSLog;
@@ -1748,6 +1749,27 @@ public void shouldLogoutOfEmail() throws Exception {
       assertEquals("b2f7f966-d8cc-11e4-bed1-df8f05be55ba", logoutEmailPost.payload.get("app_id"));
    }
 
+   @Test
+   public void logoutEmailShouldNotSendEmailPlayersRequest() throws Exception {
+      // 1. Init OneSignal and set email
+      OneSignalInit();
+
+      emailSetThenLogout();
+
+      advanceSystemTimeBy(60);
+      blankActivityController.pause();
+      threadAndTaskWait();
+
+      List<ShadowOneSignalRestClient.Request> requests = ShadowOneSignalRestClient.requests;
+      assertEquals(6, ShadowOneSignalRestClient.networkCallCount);
+
+      ShadowOneSignalRestClient.Request postPush = ShadowOneSignalRestClient.requests.get(4);
+      assertNotEquals("players/a2f7f967-e8cc-11e4-bed1-118f05be4511", postPush.url);
+
+      ShadowOneSignalRestClient.Request postEmail = ShadowOneSignalRestClient.requests.get(5);
+      assertEquals("players/a2f7f967-e8cc-11e4-bed1-118f05be4511/on_focus", postEmail.url);
+   }
+
    @Test
    public void shouldFireOnSuccessOfLogoutEmail() throws Exception {
       OneSignalInit();