kopia lustrzana https://github.com/ryukoposting/Signal-Android
Do not auto-leave groups you have requested to join.
rodzic
f1ab0a05f1
commit
2f551ee3f2
|
@ -586,7 +586,7 @@ public class GroupsV2StateProcessor {
|
||||||
|
|
||||||
Log.i(TAG, String.format("Added as a full member of %s by %s", groupId, addedBy.getId()));
|
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.");
|
Log.i(TAG, "Added by a blocked user. Leaving group.");
|
||||||
ApplicationDependencies.getJobManager().add(new LeaveGroupV2Job(groupId));
|
ApplicationDependencies.getJobManager().add(new LeaveGroupV2Job(groupId));
|
||||||
//noinspection UnnecessaryReturnStatement
|
//noinspection UnnecessaryReturnStatement
|
||||||
|
|
|
@ -232,6 +232,10 @@ public final class DecryptedGroupUtil {
|
||||||
findRequestingByUuid(group.getRequestingMembersList(), uuid).isPresent();
|
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.
|
* Removes the uuid from the full members of a group.
|
||||||
* <p>
|
* <p>
|
||||||
|
|
Ładowanie…
Reference in New Issue