Merge branch 'master' into dev

src/org/thoughtcrime/securesms/notifications/MessageNotifier.java

@@ -311,6 +311,7 @@ public class MessageNotifier {
     builder.setDeleteIntent(notificationState.getDeleteIntent(context));
     builder.setOnlyAlertOnce(!signal);
     builder.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY);
+    builder.setAutoCancel(true);
 
     long timestamp = notifications.get(0).getTimestamp();
     if (timestamp != 0) builder.setWhen(timestamp);
@@ -358,11 +359,12 @@ public class MessageNotifier {
     List<NotificationItem>               notifications = notificationState.getNotifications();
 
     builder.setMessageCount(notificationState.getMessageCount(), notificationState.getThreadCount());
-    builder.setMostRecentSender(notifications.get(0).getIndividualRecipient());
+    builder.setMostRecentSender(notifications.get(0).getIndividualRecipient(), notifications.get(0).getRecipient());
     builder.setGroup(NOTIFICATION_GROUP);
     builder.setDeleteIntent(notificationState.getDeleteIntent(context));
     builder.setOnlyAlertOnce(!signal);
     builder.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY);
+    builder.setAutoCancel(true);
 
     long timestamp = notifications.get(0).getTimestamp();
     if (timestamp != 0) builder.setWhen(timestamp);
@@ -373,7 +375,7 @@ public class MessageNotifier {
 
     while(iterator.hasPrevious()) {
       NotificationItem item = iterator.previous();
-      builder.addMessageBody(item.getIndividualRecipient(), item.getText());
+      builder.addMessageBody(item.getIndividualRecipient(), item.getRecipient(), item.getText());
     }
 
     if (signal) {

src/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java

@@ -7,6 +7,7 @@ import android.content.Intent;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.NotificationCompat;
+import android.text.SpannableStringBuilder;
 
 import org.thoughtcrime.securesms.loki.redesign.activities.HomeActivity;
 import org.thoughtcrime.securesms.preferences.widgets.NotificationPrivacyPreference;
@@ -45,10 +46,14 @@ public class MultipleRecipientNotificationBuilder extends AbstractNotificationBu
     setNumber(messageCount);
   }
 
-  public void setMostRecentSender(Recipient recipient) {
+  public void setMostRecentSender(Recipient recipient, Recipient threadRecipient) {
+    String displayName = recipient.toShortString();
+    if (threadRecipient.isGroupRecipient()) {
+      displayName = NotificationUtilities.getOpenGroupDisplayName(recipient, threadRecipient, context);
+    }
     if (privacy.isDisplayContact()) {
       setContentText(context.getString(R.string.MessageNotifier_most_recent_from_s,
-                                       recipient.toShortString()));
+              displayName));
     }
 
     if (recipient.getNotificationChannel() != null) {
@@ -64,11 +69,20 @@ public class MultipleRecipientNotificationBuilder extends AbstractNotificationBu
     extend(new NotificationCompat.WearableExtender().addAction(markAllAsReadAction));
   }
 
-  public void addMessageBody(@NonNull Recipient sender, @Nullable CharSequence body) {
+  public void addMessageBody(@NonNull Recipient sender, Recipient threadRecipient, @Nullable CharSequence body) {
+    String displayName = sender.toShortString();
+    if (threadRecipient.isGroupRecipient()) {
+      displayName = NotificationUtilities.getOpenGroupDisplayName(sender, threadRecipient, context);
+    }
     if (privacy.isDisplayMessage()) {
-      messageBodies.add(getStyledMessage(sender, body));
+      SpannableStringBuilder builder = new SpannableStringBuilder();
+      builder.append(Util.getBoldedString(displayName));
+      builder.append(": ");
+      builder.append(body == null ? "" : body);
+
+      messageBodies.add(builder);
     } else if (privacy.isDisplayContact()) {
-      messageBodies.add(Util.getBoldedString(sender.toShortString()));
+      messageBodies.add(Util.getBoldedString(displayName));
     }
 
     if (privacy.isDisplayContact() && sender.getContactUri() != null) {

src/org/thoughtcrime/securesms/notifications/NotificationUtilities.kt

@@ -0,0 +1,22 @@
+@file:JvmName("NotificationUtilities")
+package org.thoughtcrime.securesms.notifications
+
+import android.content.Context
+import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.recipients.Recipient
+
+fun getOpenGroupDisplayName(recipient: Recipient, threadRecipient: Recipient, context: Context): String {
+    val threadID = DatabaseFactory.getThreadDatabase(context).getThreadIdFor(threadRecipient)
+    val publicChat = DatabaseFactory.getLokiThreadDatabase(context).getPublicChat(threadID)
+    val hexEncodedPublicKey = recipient.address.toString()
+    val displayName: String?
+    displayName = if (publicChat != null) {
+        DatabaseFactory.getLokiUserDatabase(context).getServerDisplayName(publicChat.id, hexEncodedPublicKey)
+    } else {
+        DatabaseFactory.getLokiUserDatabase(context).getDisplayName(hexEncodedPublicKey)
+    }
+    if (displayName == null) {
+        return hexEncodedPublicKey
+    }
+    return displayName
+}

src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java

@@ -120,15 +120,7 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
     SpannableStringBuilder stringBuilder = new SpannableStringBuilder();
 
     if (privacy.isDisplayContact() && threadRecipients.isGroupRecipient()) {
-      long threadID = DatabaseFactory.getThreadDatabase(context).getThreadIdFor(threadRecipients);
-      LokiPublicChat publicChat = DatabaseFactory.getLokiThreadDatabase(context).getPublicChat(threadID);
-      String hexEncodedPublicKey = individualRecipient.getAddress().toString();
-      String displayName;
-      if (publicChat != null) {
-        displayName = DatabaseFactory.getLokiUserDatabase(context).getServerDisplayName(publicChat.getId(), hexEncodedPublicKey);
-      } else {
-        displayName = DatabaseFactory.getLokiUserDatabase(context).getDisplayName(hexEncodedPublicKey);
-      }
+      String displayName = NotificationUtilities.getOpenGroupDisplayName(individualRecipient, threadRecipients, context);
       if (displayName != null) {
         stringBuilder.append(Util.getBoldedString(displayName + ": "));
       }
@@ -226,7 +218,10 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
     SpannableStringBuilder stringBuilder = new SpannableStringBuilder();
 
     if (privacy.isDisplayContact() && threadRecipient.isGroupRecipient()) {
-      stringBuilder.append(Util.getBoldedString(individualRecipient.toShortString() + ": "));
+      String displayName = NotificationUtilities.getOpenGroupDisplayName(individualRecipient, threadRecipient, context);
+      if (displayName != null) {
+        stringBuilder.append(Util.getBoldedString(displayName + ": "));
+      }
     }
 
     if (privacy.isDisplayMessage()) {