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

Fix missing message request on V2 re-invites.

Browse source
This commit is contained in:
Alan Evans 2020-10-23 16:32:36 -03:00 • committed by Cody Henthorne
parent 4099154dc0
commit 4ce136be17
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestRepository.java
View file

@ -75,6 +75,17 @@ final class MessageRequestRepository {
@WorkerThread @WorkerThread
private MessageRequestState findMessageRequestState(@NonNull Recipient recipient, long threadId) { private MessageRequestState findMessageRequestState(@NonNull Recipient recipient, long threadId) {
if (recipient.isGroup() && recipient.isPushV2Group()) {
GroupDatabase.MemberLevel memberLevel = DatabaseFactory.getGroupDatabase(context)
.getGroup(recipient.getId())
.transform(g -> g.memberLevel(Recipient.self()))
.or(GroupDatabase.MemberLevel.NOT_A_MEMBER);
if (memberLevel == GroupDatabase.MemberLevel.PENDING_MEMBER) {
return MessageRequestState.REQUIRED;
}
}
if (!RecipientUtil.isMessageRequestAccepted(context, threadId)) { if (!RecipientUtil.isMessageRequestAccepted(context, threadId)) {
if (recipient.isGroup()) { if (recipient.isGroup()) {
GroupDatabase.MemberLevel memberLevel = DatabaseFactory.getGroupDatabase(context) GroupDatabase.MemberLevel memberLevel = DatabaseFactory.getGroupDatabase(context)