For atomic Groups V2 block and leave, block after leaving group.
parent
89a940ec81
commit
93f587b851
|
@ -97,17 +97,17 @@ public class RecipientUtil {
|
||||||
throw new AssertionError("Recipient is not blockable!");
|
throw new AssertionError("Recipient is not blockable!");
|
||||||
}
|
}
|
||||||
|
|
||||||
Recipient resolved = recipient.resolve();
|
recipient = recipient.resolve();
|
||||||
|
|
||||||
DatabaseFactory.getRecipientDatabase(context).setBlocked(resolved.getId(), true);
|
if (recipient.isGroup() && recipient.getGroupId().get().isPush()) {
|
||||||
|
|
||||||
if (resolved.isGroup() && recipient.getGroupId().get().isPush()) {
|
|
||||||
GroupManager.leaveGroupFromBlockOrMessageRequest(context, recipient.getGroupId().get().requirePush());
|
GroupManager.leaveGroupFromBlockOrMessageRequest(context, recipient.getGroupId().get().requirePush());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (resolved.isSystemContact() || resolved.isProfileSharing() || isProfileSharedViaGroup(context,resolved)) {
|
DatabaseFactory.getRecipientDatabase(context).setBlocked(recipient.getId(), true);
|
||||||
|
|
||||||
|
if (recipient.isSystemContact() || recipient.isProfileSharing() || isProfileSharedViaGroup(context, recipient)) {
|
||||||
ApplicationDependencies.getJobManager().add(new RotateProfileKeyJob());
|
ApplicationDependencies.getJobManager().add(new RotateProfileKeyJob());
|
||||||
DatabaseFactory.getRecipientDatabase(context).setProfileSharing(resolved.getId(), false);
|
DatabaseFactory.getRecipientDatabase(context).setProfileSharing(recipient.getId(), false);
|
||||||
}
|
}
|
||||||
|
|
||||||
ApplicationDependencies.getJobManager().add(new MultiDeviceBlockedUpdateJob());
|
ApplicationDependencies.getJobManager().add(new MultiDeviceBlockedUpdateJob());
|
||||||
|
|
Loading…
Reference in New Issue