TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-17 18:28:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect contacts being synced

Browse Source
This commit is contained in:
nielsandriesse 2020-07-17 15:06:16 +10:00
parent 68821b98aa
commit e3f107b00c
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt
View File

@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit
class BackgroundPollWorker : PersistentAlarmManagerListener() { class BackgroundPollWorker : PersistentAlarmManagerListener() {
companion object { companion object {
private val pollInterval = TimeUnit.MINUTES.toMillis(30) private val pollInterval = TimeUnit.MINUTES.toMillis(20)
@JvmStatic @JvmStatic
fun schedule(context: Context) { fun schedule(context: Context) {

14
src/org/thoughtcrime/securesms/loki/protocol/SyncMessagesProtocol.kt
View File

@ -12,6 +12,7 @@ import org.thoughtcrime.securesms.groups.GroupManager
import org.thoughtcrime.securesms.groups.GroupMessageProcessor import org.thoughtcrime.securesms.groups.GroupMessageProcessor
import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob
import org.thoughtcrime.securesms.jobs.MultiDeviceGroupUpdateJob import org.thoughtcrime.securesms.jobs.MultiDeviceGroupUpdateJob
import org.thoughtcrime.securesms.loki.utilities.ContactUtilities
import org.thoughtcrime.securesms.loki.utilities.OpenGroupUtilities import org.thoughtcrime.securesms.loki.utilities.OpenGroupUtilities
import org.thoughtcrime.securesms.loki.utilities.recipient import org.thoughtcrime.securesms.loki.utilities.recipient
import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.Recipient
@ -49,15 +50,16 @@ object SyncMessagesProtocol {
@JvmStatic @JvmStatic
fun getContactsToSync(context: Context): List<ContactData> { fun getContactsToSync(context: Context): List<ContactData> {
val allAddresses = ArrayList(DatabaseFactory.getRecipientDatabase(context).allAddresses) val contacts = ContactUtilities.getAllContacts(context)
val result = mutableSetOf<ContactData>() val result = mutableSetOf<ContactData>()
for (address in allAddresses) { for (contact in contacts) {
if (!shouldSyncContact(context, address.serialize())) { continue } val contactPublicKey = contact.recipient.address.serialize()
val threadID = DatabaseFactory.getThreadDatabase(context).getThreadIdIfExistsFor(Recipient.from(context, address, false)) if (!shouldSyncContact(context, contactPublicKey)) { continue }
val threadID = DatabaseFactory.getThreadDatabase(context).getThreadIdIfExistsFor(recipient(context, contactPublicKey))
if (threadID < 0) { continue } if (threadID < 0) { continue }
val displayName = DatabaseFactory.getLokiUserDatabase(context).getDisplayName(address.serialize()) val displayName = DatabaseFactory.getLokiUserDatabase(context).getDisplayName(contactPublicKey)
val contactData = ContactData(threadID, displayName) val contactData = ContactData(threadID, displayName)
contactData.numbers.add(NumberData("TextSecure", address.serialize())) contactData.numbers.add(NumberData("TextSecure", contactPublicKey))
result.add(contactData) result.add(contactData)
} }
return result.toList() return result.toList()