robolectric 3.4.2 and fcm payload channel fixes

* Updating to robolectric 3.4.2 from 3.4.0 requires switching to targeting api 26 from 10000.
* Fixed chanel payload was not correctly being process through FCM due to string conversion.

Author: jkasten2

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

@@ -94,7 +94,14 @@ static String createNotificationChannel(Context context, JSONObject jsonPayload)
    // Language dependent fields will be passed localized
    @RequiresApi(api = Build.VERSION_CODES.O)
    private static String createChannel(Context context, NotificationManager notificationManager, JSONObject payload) throws JSONException {
-      JSONObject channelPayload = payload.optJSONObject("chnl");
+      // 'chnl' will be a string if coming from FCM and it will be a JSONObject when coming from
+      //   a cold start sync.
+      Object objChannelPayload = payload.opt("chnl");
+      JSONObject channelPayload = null;
+      if (objChannelPayload instanceof String)
+         channelPayload = new JSONObject((String)objChannelPayload);
+      else if (objChannelPayload instanceof JSONObject)
+         channelPayload = (JSONObject)objChannelPayload;
 
       String channel_id = channelPayload.optString("id", DEFAULT_CHANNEL_ID);
       // Ensure we don't try to use the system reserved id
@@ -121,7 +128,7 @@ private static String createChannel(Context context, NotificationManager notific
          notificationManager.createNotificationChannelGroup(new NotificationChannelGroup(group_id, group_name));
          channel.setGroup(group_id);
       }
-
+      
       channel.enableLights(payload.optInt("led", 1) == 1);
       if (payload.has("ledc")) {
          BigInteger ledColor = new BigInteger(payload.optString("ledc"), 16);

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

@@ -349,7 +349,7 @@ public void testNullProjectNumberSetsErrorType() throws Exception {
    }
 
    @Test
-   @Config(shadows = {ShadowRoboNotificationManager.class}, sdk = 10000)
+   @Config(shadows = {ShadowRoboNotificationManager.class}, sdk = 26)
    public void testNotificationChannelListPayload() throws Exception {
       NotificationChannelManagerRunner testHelper = new NotificationChannelManagerRunner().setContext(blankActivity);
       JSONObject payloadList = testHelper.createBasicChannelListPayload();

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

@@ -22,7 +22,6 @@
 import org.robolectric.android.controller.ActivityController;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLog;
-import org.robolectric.shadows.ShadowNotificationManager;
 
 import static com.onesignal.OneSignalPackagePrivateHelper.NotificationChannelManager_createNotificationChannel;
 import static com.onesignal.OneSignalPackagePrivateHelper.NotificationChannelManager_processChannelList;
@@ -38,7 +37,7 @@
          ShadowOSUtils.class,
          ShadowRoboNotificationManager.class},
       instrumentedPackages = {"com.onesignal"},
-      sdk = 10000)
+      sdk = 26)
 @RunWith(RobolectricTestRunner.class)
 public class NotificationChannelManagerRunner {
 
@@ -81,7 +80,7 @@ public void createNotificationChannelCreateBasicChannel() throws Exception {
       JSONObject payload = new JSONObject();
       JSONObject chnl = new JSONObject();
       chnl.put("id", "test_id");
-      payload.put("chnl", chnl);
+      payload.put("chnl", chnl.toString());
 
       String ret = NotificationChannelManager_createNotificationChannel(blankActivity, payload);
 
@@ -114,7 +113,7 @@ public void createNotificationChannelWithALlOptions() throws Exception {
       payload.put("bdg", 1);
       payload.put("bdnd", 1);
 
-      payload.put("chnl", chnl);
+      payload.put("chnl", chnl.toString());
 
       String ret = NotificationChannelManager_createNotificationChannel(blankActivity, payload);
 
@@ -146,7 +145,7 @@ public void useOtherChannelWhenItIsAvailable() throws Exception {
 
       JSONObject chnl = new JSONObject();
       chnl.put("id", "test_id");
-      payload.put("chnl", chnl);
+      payload.put("chnl", chnl.toString());
 
       String ret = NotificationChannelManager_createNotificationChannel(blankActivity, payload);
 
@@ -159,6 +158,9 @@ public void useOtherChannelWhenItIsAvailable() throws Exception {
       assertEquals("existing_id", ret);
    }
 
+   
+   // Starting cold start sync tests
+   
    @Test
    public void processPayloadWithOutChannelList() throws Exception {
       createChannel("local_existing_id");
@@ -226,6 +228,8 @@ public void processChannelListWithMultiLanguage() throws Exception {
       assertEquals("en_grp_nm", ShadowRoboNotificationManager.lastChannelGroup.getName());
    }
 
+   // Starting helper methods
+   
    JSONObject createBasicChannelListPayload() throws JSONException {
       createChannel("local_existing_id");
       createChannel("OS_existing_id");