Added a restore channel

* Fixed some channel defaults

Author: jkasten2

OneSignalSDK/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         maven { url 'https://maven.google.com' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha9'
+        classpath 'com.android.tools.build:gradle:3.0.0-beta1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

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

@@ -211,7 +211,7 @@ private static OneSignalNotificationBuilder getBaseOneSignalNotificationBuilder(
 
       NotificationCompat.Builder notifBuilder;
       try {
-         String channelId = NotificationChannelManager.createNotificationChannel(currentContext, gcmBundle);
+         String channelId = NotificationChannelManager.createNotificationChannel(notifJob);
          // Will throw if app is using 26.0.0-beta1 or older of the support library.
          notifBuilder = new NotificationCompat.Builder(currentContext, channelId);
       } catch(Throwable t) {

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

@@ -51,24 +51,22 @@ class NotificationChannelManager {
    // Can't create a channel with the id 'miscellaneous' as an exception is thrown.
    // Using it results in the notification not being displayed.
    // private static final String DEFAULT_CHANNEL_ID = "miscellaneous"; // NotificationChannel.DEFAULT_CHANNEL_ID;
-   
+
    private static final String DEFAULT_CHANNEL_ID = "fcm_fallback_notification_channel";
+   private static final String RESTORE_CHANNEL_ID = "restored_OS_notifications";
 
-   static String createNotificationChannel(Context context, JSONObject jsonPayload) {
+   static String createNotificationChannel(NotificationGenerationJob notifJob) {
       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");
-   
+      Context context = notifJob.context;
+      JSONObject jsonPayload = notifJob.jsonPayload;
+
       NotificationManager notificationManager =
-         (NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE);
+            (NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE);
+
+      if (notifJob.restoring)
+         return createRestoreChannel(notificationManager);
 
       // Allow channels created outside the SDK
       if (jsonPayload.has("oth_chnl")) {
@@ -100,7 +98,7 @@ private static String createChannel(Context context, NotificationManager notific
       JSONObject channelPayload = null;
       if (objChannelPayload instanceof String)
          channelPayload = new JSONObject((String)objChannelPayload);
-      else if (objChannelPayload instanceof JSONObject)
+      else
          channelPayload = (JSONObject)objChannelPayload;
 
       String channel_id = channelPayload.optString("id", DEFAULT_CHANNEL_ID);
@@ -128,21 +126,21 @@ else if (objChannelPayload instanceof JSONObject)
          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);
          channel.setLightColor(ledColor.intValue());
       }
+      channel.enableLights(payload.optInt("led", 1) == 1);
 
-      channel.enableVibration(payload.optInt("vib", 1) == 1);
       if (payload.has("vib_pt")) {
          JSONArray json_vib_array = payload.optJSONArray("vib_pt");
          long[] long_array = new long[json_vib_array.length()];
          for (int i = 0; i < json_vib_array.length(); i++)
             long_array[i] = json_vib_array.optLong(i);
          channel.setVibrationPattern(long_array);
       }
+      channel.enableVibration(payload.optInt("vib", 1) == 1);
 
       if (payload.has("sound")) {
          // Sound will only play if Importance is set to High or Urgent
@@ -157,7 +155,7 @@ else if ("null".equals(sound) || "nil".equals(sound))
       // Setting sound to null makes it 'None' in the Settings.
       // Otherwise not calling setSound makes it the default notification sound.
 
-      channel.setLockscreenVisibility(payload.optInt("vis", Notification.VISIBILITY_PUBLIC));
+      channel.setLockscreenVisibility(payload.optInt("vis", Notification.VISIBILITY_PRIVATE));
       channel.setShowBadge(payload.optInt("bdg", 1) == 1);
       channel.setBypassDnd(payload.optInt("bdnd", 0) == 1);
 
@@ -177,6 +175,17 @@ private static String createDefaultChannel(NotificationManager notificationManag
 
       return DEFAULT_CHANNEL_ID;
    }
+
+   @RequiresApi(api = Build.VERSION_CODES.O)
+   private static String createRestoreChannel(NotificationManager notificationManager) {
+      NotificationChannel channel = new NotificationChannel(RESTORE_CHANNEL_ID,
+            "Restored",
+            NotificationManager.IMPORTANCE_LOW);
+
+      notificationManager.createNotificationChannel(channel);
+
+      return RESTORE_CHANNEL_ID;
+   }
 
    static void processChannelList(Context context, JSONObject payload) {
       if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O)

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

@@ -93,7 +93,9 @@ public static class NotificationGenerationJob extends com.onesignal.Notification
    }
 
    public static String NotificationChannelManager_createNotificationChannel(Context context, JSONObject payload) {
-      return NotificationChannelManager.createNotificationChannel(context, payload);
+      NotificationGenerationJob notifJob = new NotificationGenerationJob(context);
+      notifJob.jsonPayload = payload;
+      return NotificationChannelManager.createNotificationChannel(notifJob);
    }
 
    public static void NotificationChannelManager_processChannelList(Context context, JSONObject jsonObject) {

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

@@ -127,9 +127,9 @@ public void createNotificationChannelWithALlOptions() throws Exception {
       assertEquals("grp_id", group.getId());
       assertEquals("Group Name", group.getName());
       assertNotNull(channel.getSound());
-      assertFalse(channel.shouldShowLights());
+      assertFalse(channel.shouldShowLights()); // Setting a led color should NOT override enableLights
       assertEquals(-65536, channel.getLightColor());
-      assertTrue(channel.shouldVibrate()); // Setting a pattern enables vibration
+      assertFalse(channel.shouldVibrate()); // Setting a pattern should NOT override enableVibration
       assertArrayEquals(new long[]{1,2,3,4}, channel.getVibrationPattern());
       assertEquals(NotificationManager.IMPORTANCE_MAX, channel.getImportance());
       assertEquals("content://settings/system/notification_sound", channel.getSound().toString());
@@ -159,7 +159,7 @@ public void useOtherChannelWhenItIsAvailable() throws Exception {
    }
 
 
-   // Starting cold start sync tests
+   // Start - Cold start sync tests
 
    @Test
    public void processPayloadWithOutChannelList() throws Exception {