From bb0ac32540b5692f7a208fe6db7a2fd40c07b0a0 Mon Sep 17 00:00:00 2001 From: Mikunj Date: Thu, 24 Oct 2019 14:17:12 +1100 Subject: [PATCH] Correctly reset prekeys for linking. --- .../thoughtcrime/securesms/loki/LokiPreKeyBundleDatabase.kt | 5 +++++ src/org/thoughtcrime/securesms/loki/SeedActivity.kt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/loki/LokiPreKeyBundleDatabase.kt b/src/org/thoughtcrime/securesms/loki/LokiPreKeyBundleDatabase.kt index 978abd6e91..6eee3387b1 100644 --- a/src/org/thoughtcrime/securesms/loki/LokiPreKeyBundleDatabase.kt +++ b/src/org/thoughtcrime/securesms/loki/LokiPreKeyBundleDatabase.kt @@ -36,6 +36,11 @@ class LokiPreKeyBundleDatabase(context: Context, helper: SQLCipherOpenHelper) : "$signedPreKeySignature TEXT," + "$identityKey TEXT NOT NULL," + "$deviceID INTEGER," + "$registrationID INTEGER" + ");" } + fun resetAllPreKeyBundleInfo() { + TextSecurePreferences.removeLocalRegistrationId(context) + TextSecurePreferences.setSignedPreKeyRegistered(context, false) + } + fun generatePreKeyBundle(hexEncodedPublicKey: String): PreKeyBundle? { var registrationID = TextSecurePreferences.getLocalRegistrationId(context) if (registrationID == 0) { diff --git a/src/org/thoughtcrime/securesms/loki/SeedActivity.kt b/src/org/thoughtcrime/securesms/loki/SeedActivity.kt index 1eaea1308d..8a537e1de6 100644 --- a/src/org/thoughtcrime/securesms/loki/SeedActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/SeedActivity.kt @@ -227,7 +227,7 @@ class SeedActivity : BaseActionBarActivity(), DeviceLinkingDialogDelegate { private fun resetForRegistration() { IdentityKeyUtil.delete(this, IdentityKeyUtil.lokiSeedKey) - TextSecurePreferences.removeLocalRegistrationId(this) + DatabaseFactory.getLokiPreKeyBundleDatabase(this).resetAllPreKeyBundleInfo() TextSecurePreferences.removeLocalNumber(this) TextSecurePreferences.setHasSeenWelcomeScreen(this, false) TextSecurePreferences.setPromptedPushRegistration(this, false)