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

Show a message request for certain GV2 adds.

Browse Source
This commit is contained in:
Greyson Parrelli
2020-07-30 16:17:23 -04:00
parent 6f53fdc02d
commit 9b61e1c85c
5 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,12 +68,7 @@ final class MessageRequestRepository {
void getMessageRequestState(@NonNull Recipient recipient, long threadId, @NonNull Consumer<MessageRequestState> state) {
executor.execute(() -> {
if (recipient.isPushV2Group()) {
boolean pendingMember = DatabaseFactory.getGroupDatabase(context)
.isPendingMember(recipient.requireGroupId().requireV2(), Recipient.self());
state.accept(pendingMember ? MessageRequestState.UNACCEPTED
: MessageRequestState.ACCEPTED);
} else if (!RecipientUtil.isMessageRequestAccepted(context, threadId)) {
if (!RecipientUtil.isMessageRequestAccepted(context, threadId)) {
state.accept(MessageRequestState.UNACCEPTED);
} else if (RecipientUtil.isPreMessageRequestThread(context, threadId) && !RecipientUtil.isLegacyProfileSharingAccepted(recipient)) {
state.accept(MessageRequestState.LEGACY);

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

@@ -71,11 +71,7 @@ public class MessageRequestsBottomView extends ConstraintLayout {
setActiveInactiveGroups(blockedButtons, normalButtons);
} else {
if (recipient.isGroup()) {
if (recipient.isPushV2Group()) {
question.setText(HtmlCompat.fromHtml(getContext().getString(R.string.MessageRequestBottomView_you_were_invited_to_join_the_group_s, HtmlUtil.bold(recipient.getDisplayName(getContext()))), 0));
} else {
question.setText(R.string.MessageRequestBottomView_do_you_want_to_join_this_group_they_wont_know_youve_seen_their_messages_until_you_accept);
}
question.setText(R.string.MessageRequestBottomView_do_you_want_to_join_this_group_they_wont_know_youve_seen_their_messages_until_you_accept);
} else {
String name = recipient.getShortDisplayName(getContext());
question.setText(HtmlCompat.fromHtml(getContext().getString(R.string.MessageRequestBottomView_do_you_want_to_let_s_message_you_they_wont_know_youve_seen_their_messages_until_you_accept, HtmlUtil.bold(name)), 0));