@developer_tribe/react-native-comnyx 0.10.5 → 0.10.7

package/android/src/main/java/com/comnyx/src/messaging/notifications/NotificationsService.kt

@@ -122,22 +122,33 @@ class NotificationsHelper(private val context: Context) {
             val builder = NotificationCompat.Builder(context, CHANNEL_ID)
                 .setContentTitle(title)
                 .setContentText(message)
-            
-            val iconResourceId = context.resources.getIdentifier("com_google_firebase_messaging_default_notification_icon", "drawable", context.packageName)
-            if (iconResourceId != 0) {
-                builder.setSmallIcon(iconResourceId)
-                Log.d(TAG, "Using Firebase default notification icon")
-            } else {
-                try {
-                    val appInfo = context.packageManager.getApplicationInfo(context.packageName, 0)
+
+            // Check if Firebase notification icon is defined in manifest metadata
+            try {
+                val appInfo = context.packageManager.getApplicationInfo(context.packageName, android.content.pm.PackageManager.GET_META_DATA)
+                val metaData = appInfo.metaData
+                var iconResourceId = 0
+                
+                // Get Firebase notification icon from manifest metadata
+                if (metaData != null && metaData.containsKey("com.google.firebase.messaging.default_notification_icon")) {
+                    iconResourceId = metaData.getInt("com.google.firebase.messaging.default_notification_icon", 0)
+                    Log.d(TAG, "Found Firebase notification icon metadata: $iconResourceId")
+                }
+                
+                if (iconResourceId != 0) {
+                    builder.setSmallIcon(iconResourceId)
+                    Log.d(TAG, "Using Firebase default notification icon from manifest")
+                } else {
+                    // Fallback to app icon
                     builder.setSmallIcon(appInfo.icon)
-                    Log.d(TAG, "Firebase default notification icon not found, using app icon as fallback")
-                } catch (e: Exception) {
-                    builder.setSmallIcon(android.R.drawable.ic_dialog_info)
-                    Log.d(TAG, "Using system default icon as final fallback")
+                    Log.d(TAG, "Firebase default notification icon not found in manifest, using app icon as fallback")
                 }
+            } catch (e: Exception) {
+                // Ultimate fallback to Android system icon
+                builder.setSmallIcon(android.R.drawable.ic_dialog_info)
+                Log.d(TAG, "Error getting app info, using system default icon as final fallback: ${e.message}")
             }
-            
+
             builder.setPriority(NotificationCompat.PRIORITY_DEFAULT)
                 //.setNumber(100)
                 .setAutoCancel(true)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@developer_tribe/react-native-comnyx",
-  "version": "0.10.5",
+  "version": "0.10.7",
   "description": "React Native chat component with integrated support panel, enabling real-time customer communication and efficient agent workflow management.",
   "source": "./src/index.ts",
   "main": "./lib/commonjs/index.js",