Merge branch 'master' into major_release_4.0.0

Author: Jeasmine

OneSignalSDK.jar

@@ -24,7 +24,7 @@ class Global {
     static def POM_NAME = 'OneSignal'
     static def POM_ARTIFACT_ID = 'OneSignal'
     static def POM_PACKAGING = 'aar'
-    static def VERSION_NAME = '3.15.4'
+    static def VERSION_NAME = '3.15.5'
 
     static def GROUP_ID = 'com.onesignal'
     static def POM_DESCRIPTION = 'OneSignal Android SDK'

OneSignalSDK/onesignal/maven-push.gradle

@@ -347,7 +347,7 @@ static void setInForeground(boolean inForeground) {
    private static TrackAmazonPurchase trackAmazonPurchase;
    private static TrackFirebaseAnalytics trackFirebaseAnalytics;
 
-   private static final String VERSION = "031504";
+   private static final String VERSION = "031505";
    public static String getSdkVersionRaw() {
       return VERSION;
    }
@@ -2539,7 +2539,7 @@ public void run() {
       else
          runCancelNotification.run();
    }
-   
+
    public static void removeGroupedNotifications(final String group) {
       if (taskController.shouldQueueTaskForInit(OSTaskController.CANCEL_GROUPED_NOTIFICATIONS)) {
          logger.error("Waiting for remote params. " +

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

@@ -241,6 +241,8 @@ JSONObject generateJsonDiff(UserState newState, boolean isSessionCall) {
                 sendJson.put("app_id", syncValues.optString("app_id"));
             if (syncValues.has("email_auth_hash"))
                 sendJson.put("email_auth_hash", syncValues.optString("email_auth_hash"));
+            if (syncValues.has("external_user_id_auth_hash"))
+                sendJson.put("external_user_id_auth_hash", syncValues.optString("external_user_id_auth_hash"));
         } catch (JSONException e) {
             e.printStackTrace();
         }

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

@@ -311,7 +311,7 @@ private void showMessageView(@Nullable Integer newHeight) {
             return;
         }
 
-        OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "In app message, showing fist one with height: " + newHeight);
+        OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "In app message, showing first one with height: " + newHeight);
         messageView.setWebView(webView);
         if (newHeight != null)
             messageView.updateHeight(newHeight);

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

@@ -4328,6 +4328,75 @@ public void shouldSetExternalIdWithAuthHashBeforeRegistration() throws Exception
       assertEquals(mockExternalIdHash, registrationRequest.payload.getString("external_user_id_auth_hash"));
    }
 
+   @Test
+   public void shouldAlwaysSetExternalIdWithAuthHashAAfterRegistration() throws Exception {
+      OneSignalInit();
+      threadAndTaskWait();
+
+      String testExternalId = "test_ext_id";
+      String mockExternalIdHash = new String(new char[64]).replace('\0', '0');
+
+      OneSignal.setExternalUserId(testExternalId, mockExternalIdHash);
+      threadAndTaskWait();
+
+      ShadowOneSignalRestClient.Request registrationRequest = ShadowOneSignalRestClient.requests.get(2);
+      assertEquals(ShadowOneSignalRestClient.REST_METHOD.PUT, registrationRequest.method);
+      assertEquals(testExternalId, registrationRequest.payload.getString("external_user_id"));
+      assertEquals(mockExternalIdHash, registrationRequest.payload.getString("external_user_id_auth_hash"));
+
+      fastColdRestartApp();
+
+      time.advanceSystemTimeBy(60);
+      OneSignalInit();
+      threadAndTaskWait();
+
+      ShadowOneSignalRestClient.Request registrationRequestAfterColdStart = ShadowOneSignalRestClient.requests.get(4);
+      assertEquals(REST_METHOD.POST, registrationRequestAfterColdStart.method);
+      assertEquals(mockExternalIdHash, registrationRequestAfterColdStart.payload.getString("external_user_id_auth_hash"));
+   }
+
+   @Test
+   public void shouldAlwaysSetExternalIdAndEmailWithAuthHashAfterRegistration() throws Exception {
+      OneSignalInit();
+      threadAndTaskWait();
+
+      String testExternalId = "test_ext_id";
+      String mockExternalIdHash = new String(new char[64]).replace('\0', '0');
+
+      String email = "josh@onesignal.com";
+      String mockEmailHash = new String(new char[64]).replace('\0', '0');
+
+      OneSignal.setExternalUserId(testExternalId, mockExternalIdHash);
+      OneSignal.setEmail(email, mockEmailHash);
+      threadAndTaskWait();
+
+      ShadowOneSignalRestClient.Request registrationRequest = ShadowOneSignalRestClient.requests.get(2);
+      assertEquals(ShadowOneSignalRestClient.REST_METHOD.PUT, registrationRequest.method);
+      assertEquals(testExternalId, registrationRequest.payload.getString("external_user_id"));
+      assertEquals(mockExternalIdHash, registrationRequest.payload.getString("external_user_id_auth_hash"));
+
+      ShadowOneSignalRestClient.Request emailPost = ShadowOneSignalRestClient.requests.get(3);
+      assertEquals(REST_METHOD.POST, emailPost.method);
+      assertEquals(email, emailPost.payload.getString("identifier"));
+      assertEquals(11, emailPost.payload.getInt("device_type"));
+      assertEquals(mockEmailHash, emailPost.payload.getString("email_auth_hash"));
+
+      fastColdRestartApp();
+
+      time.advanceSystemTimeBy(60);
+      OneSignalInit();
+      threadAndTaskWait();
+
+      ShadowOneSignalRestClient.Request registrationRequestAfterColdStart = ShadowOneSignalRestClient.requests.get(6);
+      assertEquals(REST_METHOD.POST, registrationRequestAfterColdStart.method);
+      assertEquals(mockExternalIdHash, registrationRequestAfterColdStart.payload.getString("external_user_id_auth_hash"));
+
+      ShadowOneSignalRestClient.Request emailPostAfterColdStart = ShadowOneSignalRestClient.requests.get(7);
+      assertEquals(REST_METHOD.POST, emailPostAfterColdStart.method);
+      assertEquals(11, emailPostAfterColdStart.payload.getInt("device_type"));
+      assertEquals(mockEmailHash, emailPostAfterColdStart.payload.getString("email_auth_hash"));
+   }
+
    @Test
    public void shouldRemoveExternalUserId() throws Exception {
       OneSignal.setExternalUserId("test_ext_id");