diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java index 5392ae3e4..9bfbf0879 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java @@ -583,7 +583,9 @@ public class DefaultMessageNotifier implements MessageNotifier { if (isUnreadMessage) { boolean canReply = false; - if (KeyCachingService.isLocked(context)) { + if (!RecipientUtil.isMessageRequestAccepted(context, threadId)) { + body = SpanUtil.italic(context.getString(R.string.SingleRecipientNotificationBuilder_message_request)); + } else if (KeyCachingService.isLocked(context)) { body = SpanUtil.italic(context.getString(R.string.MessageNotifier_locked_message)); } else if (record.isMms() && !((MmsMessageRecord) record).getSharedContacts().isEmpty()) { Contact contact = ((MmsMessageRecord) record).getSharedContacts().get(0); diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationItemV2.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationItemV2.kt index 5e79561e9..166454301 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationItemV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationItemV2.kt @@ -20,6 +20,7 @@ import org.thoughtcrime.securesms.mms.Slide import org.thoughtcrime.securesms.mms.SlideDeck import org.thoughtcrime.securesms.notifications.AbstractNotificationBuilder import org.thoughtcrime.securesms.recipients.Recipient +import org.thoughtcrime.securesms.recipients.RecipientUtil import org.thoughtcrime.securesms.service.KeyCachingService import org.thoughtcrime.securesms.util.MediaUtil import org.thoughtcrime.securesms.util.MessageRecordUtil @@ -114,7 +115,11 @@ sealed class NotificationItemV2(val threadRecipient: Recipient, protected val re fun getPrimaryText(context: Context): CharSequence { return if (TextSecurePreferences.getNotificationPrivacy(context).isDisplayMessage) { - getPrimaryTextActual(context) + if (RecipientUtil.isMessageRequestAccepted(context, threadId)) { + getPrimaryTextActual(context) + } else { + SpanUtil.italic(context.getString(R.string.SingleRecipientNotificationBuilder_message_request)) + } } else { context.getString(R.string.SingleRecipientNotificationBuilder_new_message) } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ba921f425..6333d0070 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1749,6 +1749,7 @@ Signal New message + Message request Play video