From d94cdf0d1bb90ebbc67802bba774ee373cc9c004 Mon Sep 17 00:00:00 2001 From: estevez-dev Date: Wed, 8 Jul 2020 17:59:43 +0300 Subject: [PATCH] Fix long notification with images conflict --- .../java/com/keyboardcrumbs/hassclient/MessagingService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 a04e325..271583d 100644 --- a/android/app/src/main/java/com/keyboardcrumbs/hassclient/MessagingService.java +++ b/android/app/src/main/java/com/keyboardcrumbs/hassclient/MessagingService.java @@ -103,8 +103,6 @@ public class MessagingService extends FirebaseMessagingService { .setSmallIcon(R.drawable.mini_icon) .setContentTitle(messageTitle) .setContentText(messageBody) - .setStyle(new NotificationCompat.BigTextStyle() - .bigText(messageBody)) .setAutoCancel(autoCancel) .setSound(defaultSoundUri) .setContentIntent(pendingIntent); @@ -114,6 +112,9 @@ public class MessagingService extends FirebaseMessagingService { 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)); } for (int i = 1; i <= 3; i++) { if (data.containsKey("action" + i)) {