From 2fdd9bfe3eadc8b88f164b40b3a6eb9648e5baa0 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO Date: Tue, 3 Mar 2020 14:29:40 +1100 Subject: [PATCH] fix syncing contacts and closed groups after device linking --- .../securesms/jobs/MultiDeviceContactUpdateJob.java | 2 +- .../securesms/loki/MultiDeviceOpenGroupUpdateJob.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java index aa22fa51e5..7fde014469 100644 --- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java @@ -245,7 +245,7 @@ public class MultiDeviceContactUpdateJob extends BaseJob implements InjectableTy } private List getAllContacts() { - List
contactAddresses = DatabaseFactory.getRecipientDatabase(context).getRegistered(); + List
contactAddresses = new ArrayList<>(DatabaseFactory.getRecipientDatabase(context).getAllAddresses()); List 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 index 0ef7ca67ed..683eea84b6 100644 --- a/src/org/thoughtcrime/securesms/loki/MultiDeviceOpenGroupUpdateJob.kt +++ b/src/org/thoughtcrime/securesms/loki/MultiDeviceOpenGroupUpdateJob.kt @@ -19,7 +19,7 @@ import javax.inject.Inject class MultiDeviceOpenGroupUpdateJob private constructor(parameters: Parameters) : BaseJob(parameters), InjectableType { companion object { - const val KEY = "MultiDeviceGroupUpdateJob" + const val KEY = "MultiDeviceOpenGroupUpdateJob" } @Inject @@ -27,7 +27,7 @@ class MultiDeviceOpenGroupUpdateJob private constructor(parameters: Parameters) constructor() : this(Parameters.Builder() .addConstraint(NetworkConstraint.KEY) - .setQueue("MultiDeviceGroupUpdateJob") + .setQueue("MultiDeviceOpenGroupUpdateJob") .setLifespan(TimeUnit.DAYS.toMillis(1)) .setMaxAttempts(Parameters.UNLIMITED) .build())