From 2126bc4f0209bab1b034e1f87cddec55c9dcf1b4 Mon Sep 17 00:00:00 2001
From: estevez-dev <vyalov.egor@gmail.com>
Date: Wed, 8 Jul 2020 18:01:22 +0300
Subject: [PATCH] Fix long notification with images conflict 2

---
 .../keyboardcrumbs/hassclient/MessagingService.java   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/android/app/src/main/java/com/keyboardcrumbs/hassclient/MessagingService.java b/android/app/src/main/java/com/keyboardcrumbs/hassclient/MessagingService.java
index 271583d..943d8fa 100644
--- a/android/app/src/main/java/com/keyboardcrumbs/hassclient/MessagingService.java
+++ b/android/app/src/main/java/com/keyboardcrumbs/hassclient/MessagingService.java
@@ -106,12 +106,13 @@ public class MessagingService extends FirebaseMessagingService {
                         .setAutoCancel(autoCancel)
                         .setSound(defaultSoundUri)
                         .setContentIntent(pendingIntent);
+        Bitmap image;
         if (URLUtil.isValidUrl(imageUrl)) {
-            Bitmap image = getBitmapFromURL(imageUrl);
-            if (image != null) {
-                notificationBuilder.setStyle(new NotificationCompat.BigPictureStyle().bigPicture(image).bigLargeIcon(BitmapFactory.decodeResource(getResources(), R.drawable.blank_icon)));
-                notificationBuilder.setLargeIcon(image);
-            }
+            image = getBitmapFromURL(imageUrl);
+        }
+        if (image != null) {
+            notificationBuilder.setStyle(new NotificationCompat.BigPictureStyle().bigPicture(image).bigLargeIcon(BitmapFactory.decodeResource(getResources(), R.drawable.blank_icon)));
+            notificationBuilder.setLargeIcon(image);
         } else {
             notificationBuilder.setStyle(new NotificationCompat.BigTextStyle()
                     .bigText(messageBody));