Merge branch 'development' into feat/RMET-2948/subscribe-general-app-…

…topic
OutSystems · Oct 11, 2024 · 1b0b4ba · 1b0b4ba
2 parents 0203d4f + 928bf10
commit 1b0b4ba
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,10 @@ The changes documented here do not include those from the original repository.
 ### Fix
 - (ios) `NotificationClickedV2` not being triggered when deep link property is not set (https://outsystemsrd.atlassian.net/browse/RMET-3695).
 
+## [Unreleased]
+### 04-10-2024
+- Feat: Handle icon and color parameters in setupNotificationBuilder for Android 12+ compatibility
+
 ## [Version 2.3.2]
 
 ### Features

diff --git a/src/android/com/outsystems/firebase/cloudmessaging/OSFirebaseCloudMessaging.kt b/src/android/com/outsystems/firebase/cloudmessaging/OSFirebaseCloudMessaging.kt
@@ -300,8 +300,20 @@ class OSFirebaseCloudMessaging : CordovaImplementation() {
         val text = args.get(2).toString()
         val channelName = args.get(3).toString()
         val channelDescription = args.get(4).toString()
+        val color =  args.get(5).toString()
+        val icon =  args.get(6).toString()
+
+        val result = controller.sendLocalNotification(
+            number = badge,
+            title = title,
+            text = text,
+            image = null,
+            color = color,
+            icon = icon,
+            channelName = channelName,
+            channelDescription = channelDescription
+        )
 
-        val result = controller.sendLocalNotification(badge, title, text, null, channelName, channelDescription)
         if (result.first) {
             sendSuccess(callbackContext)
         } else {

diff --git a/www/OSFirebaseCloudMessaging.js b/www/OSFirebaseCloudMessaging.js
@@ -28,8 +28,8 @@ exports.getBadge = function (success, error) {
     exec(success, error, 'OSFirebaseCloudMessaging', 'getBadge');
 };
 
-exports.sendLocalNotification = function (badge, title, body, channelName, channelDescription, success, error) {
-    exec(success, error, 'OSFirebaseCloudMessaging', 'sendLocalNotification', [badge, title, body, channelName, channelDescription]);
+exports.sendLocalNotification = function (badge, title, body, channelName, channelDescription, color, icon, success, error) {
+    exec(success, error, 'OSFirebaseCloudMessaging', 'sendLocalNotification', [badge, title, body, channelName, channelDescription, color, icon]);
 };
 
 exports.registerDevice = function (success, error) {