Merge pull request #505 from Iterable/MOB-5664-Revert-Channel-Name-Implementation

[MOB-5664] - Revert channel name implementation

Author: Ayyanchira

iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java

@@ -143,7 +143,7 @@ public final class IterableConstants {
     public static final String NOTIFICATION_ICON_NAME   = "iterable_notification_icon";
     public static final String NOTIFICAION_BADGING      = "iterable_notification_badging";
     public static final String NOTIFICATION_COLOR       = "iterable_notification_color";
-    public static final String NOTIFICATION_CHANNEL_NAME = "Default";
+    public static final String NOTIFICATION_CHANNEL_NAME = "iterable_notification_channel_name";
     public static final String DEFAULT_SOUND            = "default";
     public static final String SOUND_FOLDER_IDENTIFIER  = "raw";
     public static final String ANDROID_RESOURCE_PATH    = "android.resource://";

iterableapi/src/main/java/com/iterable/iterableapi/IterableNotificationHelper.java

@@ -26,6 +26,7 @@
 import java.util.Map;
 
 class IterableNotificationHelper {
+    private static final String DEFAULT_CHANNEL_NAME = "iterable channel";
     private static final String NO_BADGE = "_noBadge";
 
     @VisibleForTesting
@@ -139,8 +140,8 @@ public IterableNotificationBuilder createNotification(Context context, Bundle ex
             soundUri = getSoundUri(context, soundName, soundUrl);
 
             String channelName = (soundUri == Settings.System.DEFAULT_NOTIFICATION_URI)
-                    ? IterableConstants.NOTIFICATION_CHANNEL_NAME
-                    : getChannelName(soundName);
+                    ? getChannelName(context)
+                    : soundName;
 
             String channelId = (soundUri == Settings.System.DEFAULT_NOTIFICATION_URI)
                     ? context.getPackageName()
@@ -357,14 +358,33 @@ private String getChannelIdName(Context context, boolean isActive, String soundN
             return channelId;
         }
 
-        private String getChannelName(String soundName) {
-            String channelName = IterableConstants.NOTIFICATION_CHANNEL_NAME;
-
-            if (soundName != null) {
-                channelName = soundName;
+        private String getChannelName(Context context) {
+            String channelName = null;
+            try {
+                ApplicationInfo info = context.getPackageManager().getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA);
+                if (info.metaData != null) {
+                    Object channelNameMetaData = info.metaData.get(IterableConstants.NOTIFICATION_CHANNEL_NAME);
+                    if (channelNameMetaData instanceof String) {
+                        // Literal string value
+                        channelName = (String) channelNameMetaData;
+                    } else if (channelNameMetaData instanceof Integer) {
+                        // Try to read from a string resource
+                        int stringId = (Integer) channelNameMetaData;
+                        if (stringId != 0) {
+                            channelName = context.getString(stringId);
+                        }
+                    }
+                    IterableLogger.d(IterableNotificationBuilder.TAG, "channel name: " + channelName);
+                }
+            } catch (Exception e) {
+                IterableLogger.e(IterableNotificationBuilder.TAG, "Error while retrieving channel name", e);
             }
 
-            return channelName;
+            if (channelName != null) {
+                return channelName;
+            } else {
+                return DEFAULT_CHANNEL_NAME;
+            }
         }
 
         /**