Added more channel tests and corrected sync handling

Author: jkasten2

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

@@ -57,26 +57,30 @@ static String createNotificationChannel(Context context, JSONObject jsonPayload)
       if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O)
          return DEFAULT_CHANNEL_ID;
 
-// To test with additional data
-      JSONObject customJson = null;
-      try {
-         customJson = new JSONObject(jsonPayload.optString("custom"));
-      } catch (JSONException e) {
-         e.printStackTrace();
-      }
-      jsonPayload = customJson.optJSONObject("a");
+//// To test with additional data
+//      JSONObject customJson = null;
+//      try {
+//         customJson = new JSONObject(jsonPayload.optString("custom"));
+//      } catch (JSONException e) {
+//         e.printStackTrace();
+//      }
+//      jsonPayload = customJson.optJSONObject("a");
 
       NotificationManager notificationManager =
          (NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE);
 
-      // TODO: Check for oth_chnl key, if this existing and chanel is already registered use this id
-      //         to allow any channels created outside of the SDK.
+      // Allow channels created outside the SDK
+      if (jsonPayload.has("oth_chnl")) {
+         String otherChannel = jsonPayload.optString("oth_chnl");
+         if (notificationManager.getNotificationChannel(otherChannel) != null)
+            return otherChannel;
+      }
 
       if (!jsonPayload.has("chnl"))
          return createDefaultChannel(notificationManager);
-
+      
       try {
-         return createChannel(context, notificationManager, jsonPayload);
+         return createChannel(context, notificationManager, jsonPayload.optJSONObject("chnl"));
       } catch (JSONException e) {
          OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "Could not create notification channel due to JSON payload error!", e);
       }
@@ -85,9 +89,7 @@ static String createNotificationChannel(Context context, JSONObject jsonPayload)
    }
 
    @RequiresApi(api = Build.VERSION_CODES.O)
-   private static String createChannel(Context context, NotificationManager notificationManager, JSONObject payload) throws JSONException {
-      JSONObject channelPayload = payload.getJSONObject("chnl");
-
+   private static String createChannel(Context context, NotificationManager notificationManager, JSONObject channelPayload) throws JSONException {
       String channel_id = channelPayload.optString("id", DEFAULT_CHANNEL_ID);
       // Ensure we don't try to use the system reserved id
       if (channel_id.equals(NotificationChannel.DEFAULT_CHANNEL_ID))
@@ -152,9 +154,6 @@ private static String createDefaultChannel(NotificationManager notificationManag
       return DEFAULT_CHANNEL_ID;
    }
 
-   // TODO: 1. Check JSONObject for a chnl_lst key.
-   //       2. Create a set of new channels.
-   //       3. Remove any other 'OS_' not defined in this payload
    static void processChannelList(Context context, JSONObject payload) {
       if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O)
          return;
@@ -170,12 +169,14 @@ static void processChannelList(Context context, JSONObject payload) {
       int jsonArraySize = chnlList.length();
       for (int i = 0; i < jsonArraySize; i++) {
          try {
-            sycnedChannelSet.add(createChannel(context, notificationManager, payload));
+            sycnedChannelSet.add(createChannel(context, notificationManager, chnlList.getJSONObject(i)));
          } catch (JSONException e) {
             OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "Could not create notification channel due to JSON payload error!", e);
          }
       }
-
+      
+      // Delete old channels - Payload will include all changes for the app. Any extra OS_ ones must
+      //                         have been deleted from the dashboard and should be removed.
       List<NotificationChannel> existingChannels = notificationManager.getNotificationChannels();
       for(NotificationChannel existingChannel : existingChannels) {
          String id = existingChannel.getId();

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

@@ -38,6 +38,8 @@
 //   - Google Play services is no longer starting the broadcast receiver as an order broadcast
 //  4. Fix bug where restored notifications are vibrating and playing the sound again.
 //   - This is due to the channel now being in control of these settings.
+//   - Fixed cold restarts of the app. App updates and reboots still notify again.
+
 
 package com.onesignal;
 
@@ -201,11 +203,12 @@ public void init() {
    private static TrackGooglePurchase trackGooglePurchase;
    private static TrackAmazonPurchase trackAmazonPurchase;
 
-   public static final String VERSION = "030508";
+   public static final String VERSION = "030600";
 
    private static AdvertisingIdentifierProvider mainAdIdProvider = new AdvertisingIdProviderGPS();
 
    private static int deviceType;
+   @SuppressWarnings("WeakerAccess")
    public static String sdkType = "native";
 
    private static OSUtils osUtils;
@@ -534,6 +537,8 @@ void onSuccess(String response) {
                mEnterp = responseJson.optBoolean("enterp", false);
 
                awl = responseJson.getJSONObject("awl_list");
+   
+               NotificationChannelManager.processChannelList(appContext, responseJson);
             } catch (Throwable t) {
                t.printStackTrace();
             }

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

@@ -8,6 +8,8 @@
 import android.os.Looper;
 import android.support.v4.app.*;
 
+import com.onesignal.example.BlankActivity;
+
 import org.json.JSONObject;
 import org.robolectric.util.Scheduler;
 
@@ -93,9 +95,10 @@ public static class NotificationGenerationJob extends com.onesignal.Notification
    public static String NotificationChannelManager_createNotificationChannel(Context context, JSONObject payload) {
       return NotificationChannelManager.createNotificationChannel(context, payload);
    }
-
-   // public interface BundleCompat<T> extends com.onesignal.BundleCompat {}
 
+   public static void NotificationChannelManager_processChannelList(Context context, JSONObject jsonObject) {
+      NotificationChannelManager.processChannelList(context, jsonObject);
+   }
 
    public static void OneSignalRestClientPublic_getSync(final String url, final OneSignalRestClient.ResponseHandler responseHandler) {
       OneSignalRestClient.getSync(url, responseHandler);

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

@@ -1,7 +1,7 @@
 /**
  * Modified MIT License
  *
- * Copyright 2016 OneSignal
+ * Copyright 2017 OneSignal
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -40,7 +40,7 @@
 
 import static org.robolectric.Shadows.shadowOf;
 
-@Implements(NotificationManager.class)
+@Implements(value = NotificationManager.class, looseSignatures = true)
 public class ShadowRoboNotificationManager extends ShadowNotificationManager {
 
    public class PostedNotification {
@@ -95,11 +95,12 @@ public void notify(String tag, int id, Notification notification) {
    public static NotificationChannel lastChannel;
    public void createNotificationChannel(NotificationChannel channel) {
       lastChannel = channel;
+      super.createNotificationChannel((Object)channel);
    }
 
    public static NotificationChannelGroup lastChannelGroup;
    public void createNotificationChannelGroup(NotificationChannelGroup group) {
       lastChannelGroup = group;
+      super.createNotificationChannelGroup((Object)group);
    }
-
 }

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

@@ -4,6 +4,7 @@
 import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
+import android.content.Context;
 
 import com.onesignal.ShadowOSUtils;
 import com.onesignal.ShadowRoboNotificationManager;
@@ -22,11 +23,13 @@
 import org.robolectric.shadows.ShadowLog;
 
 import static com.onesignal.OneSignalPackagePrivateHelper.NotificationChannelManager_createNotificationChannel;
+import static com.onesignal.OneSignalPackagePrivateHelper.NotificationChannelManager_processChannelList;
 import static org.junit.Assert.assertFalse;
 import static junit.framework.TestCase.assertTrue;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 @Config(packageName = "com.onesignal.example",
       shadows = {
@@ -123,4 +126,89 @@ public void createNotificationChannelWithALlOptionsl() throws Exception {
       assertTrue(channel.canShowBadge());
       assertTrue(channel.canBypassDnd());
    }
+   
+   @Test
+   public void useOtherChannelWhenItIsAvailable() throws Exception {
+      JSONObject payload = new JSONObject();
+      payload.put("oth_chnl", "existing_id");
+      
+      JSONObject chnl = new JSONObject();
+      chnl.put("id", "test_id");
+      payload.put("chnl", chnl);
+      
+      String ret = NotificationChannelManager_createNotificationChannel(blankActivity, payload);
+      
+      // Should create and use the payload type as the "existing_id" didn't exist.
+      assertEquals("test_id", ret);
+    
+      // Create the missing channel and using the same payload we should use this existing_id now.
+      createChannel("existing_id");
+      ret = NotificationChannelManager_createNotificationChannel(blankActivity, payload);
+      assertEquals("existing_id", ret);
+   }
+   
+   @Test
+   public void processPayloadWithOutChannelList() throws Exception {
+      createChannel("local_existing_id");
+      createChannel("OS_existing_id");
+   
+      NotificationChannelManager_processChannelList(blankActivity, new JSONObject());
+      
+      assertNotNull(getChannel("local_existing_id"));
+      assertNotNull(getChannel("OS_existing_id"));
+   }
+   
+   @Test
+   public void processPayloadCreatingNewChannel() throws Exception {
+      createChannel("local_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);
+      
+      assertNotNull(getChannel("local_existing_id"));
+      assertNotNull(getChannel("OS_id1"));
+   }
+   
+   
+   @Test
+   public void processPayloadDeletingOldChannel() throws Exception {
+      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);
+      
+      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);
+      return notificationManager.getNotificationChannel(id);
+   }
+   
+   private void createChannel(String id) {
+      NotificationManager notificationManager =
+          (NotificationManager)blankActivity.getSystemService(Context.NOTIFICATION_SERVICE);
+      NotificationChannel channel = new NotificationChannel(id,"name", NotificationManager.IMPORTANCE_DEFAULT);
+      notificationManager.createNotificationChannel(channel);
+   }
 }