Merge pull request #126 from RyanRory/fix-syncing-for-multidevice

fix syncing contacts and closed groups after device linking
oxen-io · Mar 3, 2020 · 957e126 · 957e126
2 parents be8abcc + 2fdd9bf
commit 957e126
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
@@ -245,7 +245,7 @@ private void generateFullContactUpdate()
   }
 
   private List<ContactData> getAllContacts() {
-    List<Address> contactAddresses = DatabaseFactory.getRecipientDatabase(context).getRegistered();
+    List<Address> contactAddresses = new ArrayList<>(DatabaseFactory.getRecipientDatabase(context).getAllAddresses());
     List<ContactData> contacts     = new ArrayList<>(contactAddresses.size());
     for (Address address : contactAddresses) {
       if (!address.isPhone()) { continue; }

diff --git a/src/org/thoughtcrime/securesms/loki/MultiDeviceOpenGroupUpdateJob.kt b/src/org/thoughtcrime/securesms/loki/MultiDeviceOpenGroupUpdateJob.kt
@@ -19,15 +19,15 @@ import javax.inject.Inject
 class MultiDeviceOpenGroupUpdateJob private constructor(parameters: Parameters) : BaseJob(parameters), InjectableType {
 
   companion object {
-    const val KEY = "MultiDeviceGroupUpdateJob"
+    const val KEY = "MultiDeviceOpenGroupUpdateJob"
   }
 
   @Inject
   lateinit var messageSender: SignalServiceMessageSender
 
   constructor() : this(Parameters.Builder()
           .addConstraint(NetworkConstraint.KEY)
-          .setQueue("MultiDeviceGroupUpdateJob")
+          .setQueue("MultiDeviceOpenGroupUpdateJob")
           .setLifespan(TimeUnit.DAYS.toMillis(1))
           .setMaxAttempts(Parameters.UNLIMITED)
           .build())