Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 13:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not auto-leave groups you have requested to join.

Browse Source
This commit is contained in:
Cody Henthorne
2022-04-21 11:30:13 -04:00
parent f1ab0a05f1
commit 2f551ee3f2
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessor.java
View File

@@ -586,7 +586,7 @@ public class GroupsV2StateProcessor {
Log.i(TAG, String.format("Added as a full member of %s by %s", groupId, addedBy.getId()));
if (addedBy.isBlocked()) {
if (addedBy.isBlocked() && (inputGroupState.getLocalState() == null || !DecryptedGroupUtil.isRequesting(inputGroupState.getLocalState(), selfAci.uuid()))) {
Log.i(TAG, "Added by a blocked user. Leaving group.");
ApplicationDependencies.getJobManager().add(new LeaveGroupV2Job(groupId));
//noinspection UnnecessaryReturnStatement

4
libsignal/service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil.java
View File

@@ -232,6 +232,10 @@ public final class DecryptedGroupUtil {
findRequestingByUuid(group.getRequestingMembersList(), uuid).isPresent();
}
public static boolean isRequesting(DecryptedGroup group, UUID uuid) {
return findRequestingByUuid(group.getRequestingMembersList(), uuid).isPresent();
}
/**
* Removes the uuid from the full members of a group.
* <p>