Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 02:10:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hide message in notification when pending message request approval.

Browse Source
This commit is contained in:
Cody Henthorne
2021-04-14 14:49:09 -04:00
committed by Greyson Parrelli
parent e461625da4
commit 9c5a0ba7eb
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
View File

@@ -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);

7
app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationItemV2.kt
View File

@@ -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)
}