Default to default icon if the specified one doesn't exist

Bundeling · Jul 8, 2024 · a145c8a · a145c8a
1 parent d879284
commit a145c8a
Showing 1 changed file with 17 additions and 14 deletions.
diff --git a/...rc/main/java/com/dexterous/flutterlocalnotifications/FlutterLocalNotificationsPlugin.java b/...rc/main/java/com/dexterous/flutterlocalnotifications/FlutterLocalNotificationsPlugin.java
@@ -452,20 +452,24 @@ private static void setSmallIcon(
       NotificationDetails notificationDetails,
       NotificationCompat.Builder builder) {
     if (!StringUtils.isNullOrEmpty(notificationDetails.icon)) {
-      builder.setSmallIcon(getDrawableResourceId(context, notificationDetails.icon));
-    } else {
-      SharedPreferences sharedPreferences =
-          context.getSharedPreferences(SHARED_PREFERENCES_KEY, Context.MODE_PRIVATE);
-      String defaultIcon = sharedPreferences.getString(DEFAULT_ICON, null);
-      if (StringUtils.isNullOrEmpty(defaultIcon)) {
-        // for backwards compatibility: this is for handling the old way references to the icon used
-        // to be kept but should be removed in future
-        builder.setSmallIcon(notificationDetails.iconResourceId);
-
-      } else {
-        builder.setSmallIcon(getDrawableResourceId(context, defaultIcon));
+      int icon = getDrawableResourceId(context, notificationDetails.icon);
+      if(icon != 0) {
+        builder.setSmallIcon(icon);
+        return;
       }
     }
+
+    SharedPreferences sharedPreferences =
+        context.getSharedPreferences(SHARED_PREFERENCES_KEY, Context.MODE_PRIVATE);
+    String defaultIcon = sharedPreferences.getString(DEFAULT_ICON, null);
+    if (StringUtils.isNullOrEmpty(defaultIcon)) {
+      // for backwards compatibility: this is for handling the old way references to the icon used
+      // to be kept but should be removed in future
+      builder.setSmallIcon(notificationDetails.iconResourceId);
+
+    } else {
+      builder.setSmallIcon(getDrawableResourceId(context, defaultIcon));
+    }
   }
 
   @NonNull
@@ -1639,8 +1643,7 @@ private void getCallbackHandle(Result result) {
   private NotificationDetails extractNotificationDetails(
       Result result, Map<String, Object> arguments) {
     NotificationDetails notificationDetails = NotificationDetails.from(arguments);
-    if (hasInvalidIcon(result, notificationDetails.icon)
-        || hasInvalidLargeIcon(
+    if (hasInvalidLargeIcon(
             result, notificationDetails.largeIcon, notificationDetails.largeIconBitmapSource)
         || hasInvalidBigPictureResources(result, notificationDetails)
         || hasInvalidRawSoundResource(result, notificationDetails)