empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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
Show stats 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) { if (isUnreadMessage) {
boolean canReply = false; 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)); body = SpanUtil.italic(context.getString(R.string.MessageNotifier_locked_message));
} else if (record.isMms() && !((MmsMessageRecord) record).getSharedContacts().isEmpty()) { } else if (record.isMms() && !((MmsMessageRecord) record).getSharedContacts().isEmpty()) {
Contact contact = ((MmsMessageRecord) record).getSharedContacts().get(0); 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.mms.SlideDeck
import org.thoughtcrime.securesms.notifications.AbstractNotificationBuilder import org.thoughtcrime.securesms.notifications.AbstractNotificationBuilder
import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.recipients.RecipientUtil
import org.thoughtcrime.securesms.service.KeyCachingService import org.thoughtcrime.securesms.service.KeyCachingService
import org.thoughtcrime.securesms.util.MediaUtil import org.thoughtcrime.securesms.util.MediaUtil
import org.thoughtcrime.securesms.util.MessageRecordUtil import org.thoughtcrime.securesms.util.MessageRecordUtil
@ -114,7 +115,11 @@ sealed class NotificationItemV2(val threadRecipient: Recipient, protected val re
fun getPrimaryText(context: Context): CharSequence { fun getPrimaryText(context: Context): CharSequence {
return if (TextSecurePreferences.getNotificationPrivacy(context).isDisplayMessage) { 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 { } else {
context.getString(R.string.SingleRecipientNotificationBuilder_new_message) context.getString(R.string.SingleRecipientNotificationBuilder_new_message)
} }

1
app/src/main/res/values/strings.xml
View file

@ -1749,6 +1749,7 @@
<!-- SingleRecipientNotificationBuilder --> <!-- SingleRecipientNotificationBuilder -->
<string name="SingleRecipientNotificationBuilder_signal">Signal</string> <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
<string name="SingleRecipientNotificationBuilder_new_message">New message</string> <string name="SingleRecipientNotificationBuilder_new_message">New message</string>
<string name="SingleRecipientNotificationBuilder_message_request">Message request</string>
<!-- ThumbnailView --> <!-- ThumbnailView -->
<string name="ThumbnailView_Play_video_description">Play video</string> <string name="ThumbnailView_Play_video_description">Play video</string>