Moved Channel code into it's own class

Author: jkasten2

OneSignalSDK/app/build.gradle

@@ -28,6 +28,10 @@ android {
     }
 }
 
+repositories {
+  maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
+}
+
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:26.0.0'
@@ -41,25 +45,28 @@ dependencies {
         exclude group: 'com.google.android.gms', module: 'play-services-location'
     }
 
+    // Use snapshot
+    // compile 'com.onesignal:OneSignal:4.0.0-SNAPSHOT'
+
     // Use to run local .aar file
     // compile(name: 'OneSignal-release', ext: 'aar')
 
     // New Instructions - Use for released SDK
-    // compile 'com.onesignal:OneSignal:[3.5.3,4.0.0)'
+    //compile 'com.onesignal:OneSignal:[3.5.8, 3.99.99]'
 
     // Old Instructions - Use for released SDK
     // compile 'com.onesignal:OneSignal:3.+@aar'
 
 
     // Test with 7.0.0 to make sure there are no breaking changes in Google's libraries.
     //   This insures that the SDK will work if an app developer is using an older version of GMS.
-    compile "com.google.android.gms:play-services-gcm:11.0.2"
+    compile "com.google.android.gms:play-services-gcm:11.0.4"
 
     // play-services-analytics is required for AdvertisingIdClient when using GMS 8.1.0 or lower.
     //  In 8.3.0 it is included in 'basement' which is required by 'base'.
     //   compile 'com.google.android.gms:play-services-analytics:7.0.0'
 
-    compile "com.google.android.gms:play-services-location:11.0.2"
+    compile "com.google.android.gms:play-services-location:11.0.4"
 
 
     // NOTES: Android Support Library v4 breakout. VERSION - 24.2.0

OneSignalSDK/onesignal/build.gradle

@@ -31,8 +31,8 @@ dependencies {
     compile 'com.android.support:support-v4:26.0.0'
 
     // NOTE: Starting with play-services 10.2.0, minSdkVersion is now 14
-    compile 'com.google.android.gms:play-services-gcm:11.0.2'
-    compile 'com.google.android.gms:play-services-location:11.0.2'
+    compile 'com.google.android.gms:play-services-gcm:11.0.4'
+    compile 'com.google.android.gms:play-services-location:11.0.4'
 
     // NOTE: customtabs sets minSdkVersion to 15.
     compile 'com.android.support:customtabs:26.0.0'

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

@@ -44,9 +44,6 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationChannelGroup;
-import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -61,7 +58,6 @@
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.NotificationManagerCompat;
 import android.text.SpannableString;
@@ -78,12 +74,6 @@ class GenerateNotification {
    private static Resources contextResources = null;
    private static Class<?> notificationOpenedClass;
    private static boolean openerIsBroadcast;
-   
-   // 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 class OneSignalNotificationBuilder {
       NotificationCompat.Builder compatBuilder;
@@ -182,105 +172,6 @@ else if (i == 2)
       });
    }
 
-   // TODO: Need to handle delete, do so on cold start up.
-   private static String createNotificationChannel(NotificationGenerationJob notifJob) {
-      if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O)
-         return DEFAULT_CHANNEL_ID;
-      
-      // TODO: Can new api be used if not targeting O but device is and have a new enough library?
-      //       If not then check for this and return.
-      
-      JSONObject payload = notifJob.jsonPayload;
-      
-// Testing with additional data
-//      JSONObject customJson = null;
-//      try {
-//         customJson = new JSONObject(notifJob.jsonPayload.optString("custom"));
-//      } catch (JSONException e) {
-//         e.printStackTrace();
-//      }
-//      JSONObject payload = customJson.optJSONObject("a");
-      
-      if (!payload.has("chnl"))
-         return createDefaultChannel();
-   
-      try {
-         JSONObject channelPayload = payload.getJSONObject("chnl");
-   
-         NotificationManager notificationManager =
-             (NotificationManager) currentContext.getSystemService(Context.NOTIFICATION_SERVICE);
-         
-         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))
-            channel_id = DEFAULT_CHANNEL_ID;
-   
-         int importance = channelPayload.optInt("imp", NotificationManager.IMPORTANCE_DEFAULT);
-         String channel_name = channelPayload.optString("nm", "Miscellaneous");
-         
-         NotificationChannel channel = new NotificationChannel(channel_id, channel_name, importance);
-         
-         if (channelPayload.has("grp")) {
-            String group_id = channelPayload.optString("grp");
-            CharSequence group_name = channelPayload.optString("grp_nm");
-            notificationManager.createNotificationChannelGroup(new NotificationChannelGroup(group_id, group_name));
-            channel.setGroup(group_id);
-         }
-         
-         channel.enableLights(channelPayload.optBoolean("lght", true));
-         if (channelPayload.has("ledc")) {
-            BigInteger ledColor = new BigInteger(channelPayload.optString("ledc"), 16);
-            channel.setLightColor(ledColor.intValue());
-         }
-         
-         channel.enableVibration(channelPayload.optBoolean("vib", true));
-         if (channelPayload.has("vib_pt")) {
-            JSONArray json_vib_array = channelPayload.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);
-         }
-         
-         if (channelPayload.has("snd_nm")) {
-            // Sound will only play if Importance is set to High or Urgent
-            Uri uri = getCustomSound(channelPayload.optString("snd_nm", null));
-            OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "##################### channel.seSound():"  + uri);
-            channel.setSound(uri, null);
-         }
-         else if (!channelPayload.optBoolean("snd", true))
-            channel.setSound(null, null);
-         // Setting sound to null makes it 'None' in the Settings.
-         // Otherwise not calling setSound makes it the default notification sound.
-         
-         channel.setLockscreenVisibility(channelPayload.optInt("lck", Notification.VISIBILITY_PUBLIC));
-         channel.enableVibration(channelPayload.optBoolean("lght", true));
-         channel.setShowBadge(channelPayload.optBoolean("bdg", true));
-         channel.setBypassDnd(channelPayload.optBoolean("bdnd", false));
-         
-         notificationManager.createNotificationChannel(channel);
-         return channel_id;
-      } catch (JSONException e) {
-         OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "Count not create notification channel due to JSON payload error!", e);
-      }
-      
-      return DEFAULT_CHANNEL_ID;
-   }
-   
-   @RequiresApi(api = Build.VERSION_CODES.O)
-   private static String createDefaultChannel() {
-      NotificationManager notificationManager =
-          (NotificationManager) currentContext.getSystemService(Context.NOTIFICATION_SERVICE);
-   
-      NotificationChannel channel = new NotificationChannel(DEFAULT_CHANNEL_ID,
-          "Miscellaneous",
-          NotificationManager.IMPORTANCE_DEFAULT);
-      channel.enableLights(true);
-      channel.enableVibration(true);
-      notificationManager.createNotificationChannel(channel);
-      return DEFAULT_CHANNEL_ID;
-   }
-   
    private static CharSequence getTitle(JSONObject gcmBundle) {
       CharSequence title = gcmBundle.optString("title", null);
 
@@ -321,7 +212,7 @@ private static OneSignalNotificationBuilder getBaseOneSignalNotificationBuilder(
 
       NotificationCompat.Builder notifBuilder;
       try {
-         String channelId = createNotificationChannel(notifJob);
+         String channelId = NotificationChannelManager.createNotificationChannel(currentContext, notifJob.jsonPayload);
          // 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) {
@@ -382,7 +273,7 @@ private static OneSignalNotificationBuilder getBaseOneSignalNotificationBuilder(
          notifBuilder.setStyle(new NotificationCompat.BigPictureStyle().bigPicture(bigPictureIcon).setSummaryText(message));
 
       if (isSoundEnabled(gcmBundle)) {
-         Uri soundUri = getCustomSound(gcmBundle.optString("sound", null));
+         Uri soundUri = OSUtils.getSoundUri(currentContext, gcmBundle.optString("sound", null));
          if (soundUri != null)
             notifBuilder.setSound(soundUri);
          else
@@ -819,10 +710,6 @@ private static Integer safeGetColorFromHex(JSONObject gcmBundle, String colorKey
       return null;
    }
 
-   private static boolean isValidResourceName(String name) {
-      return (name != null && !name.matches("^[0-9]"));
-   }
-
    private static Bitmap getLargeIcon(JSONObject gcmBundle) {
       if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.HONEYCOMB)
          return null;
@@ -927,7 +814,7 @@ private static int getResourceIcon(String iconName) {
          return 0;
 
       String trimmedIconName = iconName.trim();
-      if (!isValidResourceName(trimmedIconName))
+      if (!OSUtils.isValidResourceName(trimmedIconName))
          return 0;
 
       int notificationIcon = getDrawableId(trimmedIconName);
@@ -977,22 +864,6 @@ private static boolean isSoundEnabled(JSONObject gcmBundle) {
       return OneSignal.getSoundEnabled(currentContext);
    }
 
-   private static Uri getCustomSound(String sound) {
-      int soundId;
-      
-      if (isValidResourceName(sound)) {
-         soundId = contextResources.getIdentifier(sound, "raw", packageName);
-         if (soundId != 0)
-            return Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" + packageName + "/" + soundId);
-      }
-
-      soundId = contextResources.getIdentifier("onesignal_default_sound", "raw", packageName);
-      if (soundId != 0)
-         return Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" + packageName + "/" + soundId);
-
-      return null;
-   }
-
    // Android 5.0 accent color to use, only works when AndroidManifest.xml is targetSdkVersion >= 21
    private static BigInteger getAccentColor(JSONObject gcmBundle) {
       try {