From 5c0cb425a672f7a6b6634cb8fb595e7e9f4b7008 Mon Sep 17 00:00:00 2001 From: Alan Evans Date: Tue, 30 Jun 2020 10:17:42 -0300 Subject: [PATCH] Only sync V1 groups with linked devices. --- .../org/thoughtcrime/securesms/database/GroupDatabase.java | 4 ++++ .../securesms/jobs/MultiDeviceGroupUpdateJob.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java index 8d04d6db8f..a2e0daf6ca 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java @@ -693,6 +693,10 @@ public final class GroupDatabase extends Database { return mms; } + public boolean isV1Group() { + return !mms && !isV2Group(); + } + public boolean isV2Group() { return v2GroupProperties != null; } diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java index bf52919e2d..72843ed728 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java @@ -85,7 +85,7 @@ public class MultiDeviceGroupUpdateJob extends BaseJob { reader = DatabaseFactory.getGroupDatabase(context).getGroups(); while ((record = reader.getNext()) != null) { - if (!record.isMms()) { + if (record.isV1Group()) { List members = new LinkedList<>(); for (RecipientId member : record.getMembers()) {