Added test to ensure channels are synced on cold start

Author: jkasten2

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

@@ -1275,7 +1275,7 @@ static void saveUserId(String inUserId) {
       final SharedPreferences prefs = getGcmPreferences(appContext);
       SharedPreferences.Editor editor = prefs.edit();
       editor.putString("GT_PLAYER_ID", userId);
-      editor.commit();
+      editor.apply();
    }
 
    static boolean getFilterOtherGCMReceivers(Context context) {

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

@@ -417,7 +417,7 @@ private void persistState() {
 
             editor.putString("ONESIGNAL_USERSTATE_SYNCVALYES_" + persistKey, syncValues.toString());
             editor.putString("ONESIGNAL_USERSTATE_DEPENDVALYES_" + persistKey, dependValues.toString());
-            editor.commit();
+            editor.apply();
          }
       }
 

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

@@ -347,6 +347,26 @@ public void testNullProjectNumberSetsErrorType() throws Exception {
 
       Assert.assertEquals(-6, ShadowOneSignalRestClient.lastPost.getInt("notification_types"));
    }
+   
+   @Test
+   @Config(shadows = {ShadowRoboNotificationManager.class}, sdk = 10000)
+   public void testNotificationChannelListPayload() throws Exception {
+      NotificationChannelManagerRunner testHelper = new NotificationChannelManagerRunner().setContext(blankActivity);
+      JSONObject payloadList = testHelper.createBasicChannelListPayload();
+   
+      JSONObject androidParams = testHelper.createBasicChannelListPayload();
+      androidParams.put("awl_list", new JSONObject());
+      // Get call will not return a Google project number if it hasn't been entered on the OneSignal dashboard.
+      ShadowOneSignalRestClient.nextSuccessResponse = androidParams.toString();
+      
+      // Don't fire the mock callback, it will be done from the real class.
+//      ShadowPushRegistratorGPS.skipComplete = true;
+      
+      OneSignal.init(blankActivity, null, ONESIGNAL_APP_ID);
+      threadAndTaskWait();
+   
+      testHelper.assertChannelsForBasicChannelList();
+   }
 
    @Test
    public void shouldCorrectlyRemoveOpenedHandlerAndFireMissedOnesWhenAddedBack() throws Exception {

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

@@ -11,6 +11,7 @@
 import com.onesignal.example.BlankActivity;
 
 import org.json.JSONArray;
+import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -40,8 +41,14 @@
 @RunWith(RobolectricTestRunner.class)
 public class NotificationChannelManagerRunner {
 
+   private Context mContext;
    private BlankActivity blankActivity;
-
+   
+   NotificationChannelManagerRunner setContext(Context context) {
+      mContext = context;
+      return this;
+   }
+   
    @BeforeClass // Runs only once, before any tests
    public static void setUpClass() throws Exception {
       ShadowLog.stream = System.out;
@@ -51,6 +58,7 @@ public static void setUpClass() throws Exception {
    public void beforeEachTest() throws Exception {
       ActivityController<BlankActivity> blankActivityController = Robolectric.buildActivity(BlankActivity.class).create();
       blankActivity = blankActivityController.get();
+      mContext = blankActivity;
    }
 
    @Test
@@ -177,38 +185,43 @@ public void processPayloadCreatingNewChannel() throws Exception {
       assertNotNull(getChannel("OS_id1"));
    }
 
-   
    @Test
    public void processPayloadDeletingOldChannel() throws Exception {
+      NotificationChannelManager_processChannelList(blankActivity, createBasicChannelListPayload());
+      assertChannelsForBasicChannelList();
+   }
+   
+   JSONObject createBasicChannelListPayload() throws JSONException {
       createChannel("local_existing_id");
       createChannel("OS_existing_id");
 
       JSONArray channelList = new JSONArray();
       JSONObject channelItem = new JSONObject();
-      
+   
       channelItem.put("id", "OS_id1");
-      
+   
       channelList.put(channelItem);
       JSONObject payload = new JSONObject();
       payload.put("chnl_lst", channelList);
-      
-      NotificationChannelManager_processChannelList(blankActivity, payload);
-      
+      return payload;
+   }
+   
+   void assertChannelsForBasicChannelList() {
       assertNotNull(getChannel("local_existing_id"));
       assertNull(getChannel("OS_existing_id"));
       assertNotNull(getChannel("OS_id1"));
    }
 
    private NotificationChannel getChannel(String id) {
       NotificationManager notificationManager =
-          (NotificationManager)blankActivity.getSystemService(Context.NOTIFICATION_SERVICE);
+          (NotificationManager)mContext.getSystemService(Context.NOTIFICATION_SERVICE);
       return notificationManager.getNotificationChannel(id);
    }
 
    private void createChannel(String id) {
       NotificationManager notificationManager =
-          (NotificationManager)blankActivity.getSystemService(Context.NOTIFICATION_SERVICE);
+          (NotificationManager)mContext.getSystemService(Context.NOTIFICATION_SERVICE);
       NotificationChannel channel = new NotificationChannel(id,"name", NotificationManager.IMPORTANCE_DEFAULT);
       notificationManager.createNotificationChannel(channel);
    }
-}
+}