Pull request #98: aboldyrev MM-7257 androidsounds

Merge in MML/infobip-mobile-messaging-flutter from aboldyrev/MM-7257-androidsounds to main

Squashed commit of the following:

commit 26062dd216ed30aeba0a60c52dd1a5c4be6b34da
Author: Alexander Boldyrev <alexander.boldyrev@infobip.com>
Date:   Tue Apr 8 17:32:56 2025 +0300

    custom notification channel

Author: alboldy-ib

android/build.gradle

@@ -31,7 +31,7 @@ android {
 }
 
 dependencies {
-    def mmVersion = '13.9.1'
+    def mmVersion = '13.9.3'
     //flutter and mm dependencies clash
     implementation ("org.jetbrains.kotlin:kotlin-stdlib-jdk8") {
         version {

android/src/main/java/org/infobip/plugins/mobilemessaging/flutter/common/Configuration.java

@@ -31,6 +31,9 @@ public void setConfigurationId(String configurationId) {
 
     public static class AndroidSettings {
         String notificationIcon;
+        String notificationChannelId;
+        String notificationChannelName;
+        String notificationSound;
         boolean multipleNotifications;
         String notificationAccentColor;
         FirebaseOptions firebaseOptions;
@@ -43,6 +46,18 @@ public void setNotificationIcon(String notificationIcon) {
             this.notificationIcon = notificationIcon;
         }
 
+        public String getNotificationChannelId() {
+            return notificationChannelId;
+        }
+
+        public String getNotificationChannelName() {
+            return notificationChannelName;
+        }
+
+        public String getNotificationSound() {
+            return notificationSound;
+        }
+
         public boolean isMultipleNotifications() {
             return multipleNotifications;
         }

android/src/main/java/org/infobip/plugins/mobilemessaging/flutter/common/InitHelper.java

@@ -82,11 +82,20 @@ public MobileMessaging.Builder configurationBuilder() {
         if (androidSettings != null && androidSettings.isMultipleNotifications()) {
             notificationBuilder.withMultipleNotifications();
         }
+
         if (androidSettings != null && androidSettings.getNotificationAccentColor() != null) {
             int color = Color.parseColor(androidSettings.getNotificationAccentColor());
             notificationBuilder.withColor(color);
         }
 
+        if (androidSettings != null && androidSettings.getNotificationChannelId() != null && !androidSettings.getNotificationChannelId().isEmpty()
+                && androidSettings.getNotificationChannelName() != null && !androidSettings.getNotificationChannelName().isEmpty()
+                && androidSettings.getNotificationSound() != null && !androidSettings.getNotificationSound().isEmpty()) {
+            builder.withCustomNotificationChannel(androidSettings.getNotificationChannelId(),
+                    androidSettings.getNotificationChannelName(),
+                    androidSettings.getNotificationSound());
+        }
+
         if (configuration.isInAppChatEnabled()) {
             InAppChat chat = InAppChat.getInstance(context);
             chat.activate();

android/src/main/java/org/infobip/plugins/mobilemessaging/flutter/infobip_mobilemessaging/InfobipMobilemessagingPlugin.java

@@ -35,8 +35,9 @@
 import org.infobip.mobile.messaging.SuccessPending;
 import org.infobip.mobile.messaging.User;
 import org.infobip.mobile.messaging.chat.InAppChat;
-import org.infobip.mobile.messaging.chat.core.widget.LivechatWidgetLanguage;
 import org.infobip.mobile.messaging.chat.core.InAppChatEvent;
+import org.infobip.mobile.messaging.chat.core.MultithreadStrategy;
+import org.infobip.mobile.messaging.chat.core.widget.LivechatWidgetLanguage;
 import org.infobip.mobile.messaging.inbox.Inbox;
 import org.infobip.mobile.messaging.inbox.InboxMapper;
 import org.infobip.mobile.messaging.inbox.MobileInbox;
@@ -65,7 +66,6 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.infobip.mobile.messaging.chat.core.MultithreadStrategy;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -557,9 +557,7 @@ public void onResult(org.infobip.mobile.messaging.mobileapi.Result<User, MobileM
                     }
                 }
             });
-        } catch (IllegalArgumentException e) {
-            resultCallbacks.error(ErrorCodes.PERSONALIZE.getErrorCode(), e.getMessage(), e.getLocalizedMessage());
-        } catch (JSONException e) {
+        } catch (IllegalArgumentException | JSONException e) {
             resultCallbacks.error(ErrorCodes.PERSONALIZE.getErrorCode(), e.getMessage(), e.getLocalizedMessage());
         }
     }

lib/models/configurations/configuration.dart

@@ -77,6 +77,15 @@ class AndroidSettings {
   /// A resource name for a status bar icon (without extension), located in '/platforms/android/app/src/main/res/mipmap'
   final String? notificationIcon;
 
+  /// Custom notification channel ID.
+  final String? notificationChannelId;
+
+  /// Custom notification channel name.
+  final String? notificationChannelName;
+
+  /// A resource name for the custom sound name (without extension), located in '/android/app/src/main/res/raw'
+  final String? notificationSound;
+
   /// Should multiple notifications in status bar be shown. By default only the latest notification is shown.
   final bool? multipleNotifications;
 
@@ -87,6 +96,9 @@ class AndroidSettings {
   AndroidSettings({
     this.firebaseOptions,
     this.notificationIcon,
+    this.notificationChannelId,
+    this.notificationChannelName,
+    this.notificationSound,
     this.multipleNotifications,
     this.notificationAccentColor,
   });
@@ -95,6 +107,9 @@ class AndroidSettings {
   Map<String, dynamic> toJson() => {
         'firebaseOptions': firebaseOptions?.toJson(),
         'notificationIcon': notificationIcon,
+        'notificationChannelId': notificationChannelId,
+        'notificationChannelName': notificationChannelName,
+        'notificationSound': notificationSound,
         'multipleNotifications': multipleNotifications,
         'notificationAccentColor': notificationAccentColor,
       };

test/utils/json_test_stubs.dart

@@ -13,6 +13,9 @@ Map<String, dynamic> get configurationExampleJson => {
           'gcmSenderId': null,
           'storageBucket': null,
         },
+        'notificationChannelId': 'custom-notification-channel-id',
+        'notificationChannelName': 'Custom Name',
+        'notificationSound': 'mewmewpewpew',
         'notificationIcon': 'icon.png',
         'multipleNotifications': true,
         'notificationAccentColor': '#ABCDEF',

test/utils/models_examples.dart

@@ -16,6 +16,9 @@ Configuration get configurationModelExample => Configuration(
           projectId: 'project-123ab',
         ),
         notificationIcon: 'icon.png',
+        notificationChannelId: 'custom-notification-channel-id',
+        notificationChannelName: 'Custom Name',
+        notificationSound: 'mewmewpewpew',
         multipleNotifications: true,
         notificationAccentColor: '#ABCDEF',
       ),