TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-08 20:18:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow sending of group v2 updates to inactive groups.

Browse Source
This commit is contained in:
Alan Evans 2020-07-13 18:14:02 -03:00
parent 833ca8cce9
commit 6d035c6888
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
View File

@ -108,14 +108,14 @@ public class PushGroupSendJob extends PushSendJob {
throw new AssertionError("Not a group!"); throw new AssertionError("Not a group!");
} }
if (!DatabaseFactory.getGroupDatabase(context).isActive(group.requireGroupId())) { MmsDatabase database = DatabaseFactory.getMmsDatabase(context);
OutgoingMediaMessage message = database.getOutgoingMessage(messageId);
Set<String> attachmentUploadIds = enqueueCompressingAndUploadAttachmentsChains(jobManager, message);
if (!DatabaseFactory.getGroupDatabase(context).isActive(group.requireGroupId()) && !isGv2UpdateMessage(message)) {
throw new MmsException("Inactive group!"); throw new MmsException("Inactive group!");
} }
MmsDatabase database = DatabaseFactory.getMmsDatabase(context);
OutgoingMediaMessage message = database.getOutgoingMessage(messageId);
Set<String> attachmentUploadIds = enqueueCompressingAndUploadAttachmentsChains(jobManager, message);
jobManager.add(new PushGroupSendJob(messageId, destination, filterAddress, !attachmentUploadIds.isEmpty()), attachmentUploadIds, attachmentUploadIds.isEmpty() ? null : destination.toQueueKey()); jobManager.add(new PushGroupSendJob(messageId, destination, filterAddress, !attachmentUploadIds.isEmpty()), attachmentUploadIds, attachmentUploadIds.isEmpty() ? null : destination.toQueueKey());
} catch (NoSuchMessageException | MmsException e) { } catch (NoSuchMessageException | MmsException e) {
@ -132,6 +132,10 @@ public class PushGroupSendJob extends PushSendJob {
.build(); .build();
} }
private static boolean isGv2UpdateMessage(@NonNull OutgoingMediaMessage message) {
return (message instanceof OutgoingGroupUpdateMessage && ((OutgoingGroupUpdateMessage) message).isV2Group());
}
@Override @Override
public @NonNull String getFactoryKey() { public @NonNull String getFactoryKey() {
return KEY; return KEY;