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

Integrate contact hiding with message requests.

Browse Source
This commit is contained in:
Clark
2023-04-05 16:55:05 -04:00
committed by Greyson Parrelli
parent 74877b839e
commit 48360d08d4
15 changed files with 107 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestRepository.java
View File

@@ -116,6 +116,8 @@ final class MessageRequestRepository {
} else {
if (RecipientUtil.isMessageRequestAccepted(context, threadId)) {
return MessageRequestState.NONE;
} else if (RecipientUtil.isRecipientHidden(threadId)) {
return MessageRequestState.INDIVIDUAL_HIDDEN;
} else {
return MessageRequestState.INDIVIDUAL;
}

5
app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestState.java
View File

@@ -35,5 +35,8 @@ public enum MessageRequestState {
GROUP_V2_ADD,
/** A message request is needed for an individual */
INDIVIDUAL
INDIVIDUAL,
/** A message request is needed for an individual since they have been hidden */
INDIVIDUAL_HIDDEN
}

6
app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsBottomView.java
View File

@@ -139,6 +139,12 @@ public class MessageRequestsBottomView extends ConstraintLayout {
setActiveInactiveGroups(normalButtons, blockedButtons, gv1MigrationButtons);
accept.setText(R.string.MessageRequestBottomView_accept);
break;
case INDIVIDUAL_HIDDEN:
question.setText(HtmlCompat.fromHtml(getContext().getString(R.string.MessageRequestBottomView_do_you_want_to_let_s_message_you_you_removed_them_before,
HtmlUtil.bold(recipient.getShortDisplayName(getContext()))), 0));
setActiveInactiveGroups(normalButtons, blockedButtons, gv1MigrationButtons);
accept.setText(R.string.MessageRequestBottomView_accept);
break;
}
}