(Android): Don't display app icon for large notification icon on Andr…

…oid. Resolves #343.
dpa99c · Mar 16, 2020 · accf88e · accf88e
1 parent 432126d
commit accf88e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+* (Android): Don't display app icon for large notification icon on Android. Resolves [#343](https://github.com/dpa99c/cordova-plugin-firebasex/issues/343).
+
 # Version 9.0.1-cli
 * Document `cli_build` branch.
 * *BREAKING CHANGE*: Remove Firebase Inapp Messaging and Google Tag Manager SDK components due to causing Cordova CLI build issues.

diff --git a/src/android/FirebasePluginMessagingService.java b/src/android/FirebasePluginMessagingService.java
@@ -287,17 +287,16 @@ private void sendMessage(RemoteMessage remoteMessage, Map<String, String> data,
                 }
 
                 int largeIconResID;
-                if (customLargeIconResID != 0) {
-                    largeIconResID = customLargeIconResID;
-                    Log.d(TAG, "Large icon: custom="+icon);
-                }else if (defaultLargeIconResID != 0) {
-                    Log.d(TAG, "Large icon: default="+defaultLargeIconName);
-                    largeIconResID = defaultLargeIconResID;
-                } else {
-                    Log.d(TAG, "Large icon: application");
-                    largeIconResID = getApplicationInfo().icon;
+                if (customLargeIconResID != 0 || defaultLargeIconResID != 0) {
+					if (customLargeIconResID != 0) {
+	                    largeIconResID = customLargeIconResID;
+	                    Log.d(TAG, "Large icon: custom="+icon);
+	                }else{
+	                    Log.d(TAG, "Large icon: default="+defaultLargeIconName);
+	                    largeIconResID = defaultLargeIconResID;
+	                }
+	                notificationBuilder.setLargeIcon(BitmapFactory.decodeResource(getApplicationContext().getResources(), largeIconResID));
                 }
-                notificationBuilder.setLargeIcon(BitmapFactory.decodeResource(getApplicationContext().getResources(), largeIconResID));
             }
 
             // Color