From 1eec39c87c1f0cb5d092793ba104ffaff2bbf1e2 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Tue, 9 May 2017 20:34:04 +0200
Subject: Add messages to Notification for Android Auto on Android M and older

In the previous implementation for Android Auto, messages are only added
on Android N and above. In order to support older Android versions, the
messages need to be added always.
---
 .../de/pixart/messenger/services/NotificationService.java    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/services/NotificationService.java')

diff --git a/src/main/java/de/pixart/messenger/services/NotificationService.java b/src/main/java/de/pixart/messenger/services/NotificationService.java
index ce9a9e528..e6c3fb052 100644
--- a/src/main/java/de/pixart/messenger/services/NotificationService.java
+++ b/src/main/java/de/pixart/messenger/services/NotificationService.java
@@ -20,6 +20,7 @@ import android.text.SpannableString;
 import android.text.style.StyleSpan;
 import android.util.DisplayMetrics;
 import android.util.Log;
+import android.util.Pair;
 
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
@@ -443,8 +444,6 @@ public class NotificationService {
             for (Message message : messages) {
                 String sender = message.getStatus() == Message.STATUS_RECEIVED ? UIHelper.getMessageDisplayName(message) : null;
                 messagingStyle.addMessage(UIHelper.getMessagePreview(mXmppConnectionService, message).first, message.getTimeSent(), sender);
-                uBuilder.addMessage(UIHelper.getMessagePreview(mXmppConnectionService, message).first);
-                uBuilder.setLatestTimestamp(message.getTimeSent());
             }
             builder.setStyle(messagingStyle);
         } else {
@@ -472,6 +471,15 @@ public class NotificationService {
                 }
             }
         }
+        /** message preview for Android Auto **/
+        for (Message message : messages) {
+            Pair<String, Boolean> preview = UIHelper.getMessagePreview(mXmppConnectionService, message);
+            // only show user written text
+            if (preview.second == false) {
+                uBuilder.addMessage(preview.first);
+                uBuilder.setLatestTimestamp(message.getTimeSent());
+            }
+        }
     }
 
     private Message getImage(final Iterable<Message> messages) {
-- 
cgit v1.2.3