From 52631bcbf25d7588ed9cc280001e0df963bea49f Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Wed, 5 Jun 2019 10:10:33 +1000 Subject: [PATCH] =?UTF-8?q?Rename=20LokiPreKeyBundleImpl=20=E2=86=92=20Lok?= =?UTF-8?q?iPreKeyBundleStore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../securesms/dependencies/SignalCommunicationModule.java | 4 ++-- ...{LokiPreKeyBundleStoreImpl.kt => LokiPreKeyBundleStore.kt} | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) rename src/org/thoughtcrime/securesms/loki/{LokiPreKeyBundleStoreImpl.kt => LokiPreKeyBundleStore.kt} (89%) diff --git a/src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java b/src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java index 7d21962283..22c76563aa 100644 --- a/src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java +++ b/src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java @@ -41,7 +41,7 @@ import org.thoughtcrime.securesms.jobs.RotateCertificateJob; import org.thoughtcrime.securesms.jobs.RotateSignedPreKeyJob; import org.thoughtcrime.securesms.jobs.SendDeliveryReceiptJob; import org.thoughtcrime.securesms.jobs.SendReadReceiptJob; -import org.thoughtcrime.securesms.loki.LokiPreKeyBundleStoreImpl; +import org.thoughtcrime.securesms.loki.LokiPreKeyBundleStore; import org.thoughtcrime.securesms.preferences.AppProtectionPreferenceFragment; import org.thoughtcrime.securesms.push.SecurityEventListener; import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess; @@ -138,7 +138,7 @@ public class SignalCommunicationModule { // LOKI - Set the prekey bundle store // This is something that we MUST have otherwise our loki logic will fail - this.messageSender.setPreKeyBundleStore(new LokiPreKeyBundleStoreImpl(context)); + this.messageSender.setPreKeyBundleStore(new LokiPreKeyBundleStore(context)); } else { this.messageSender.setMessagePipe(IncomingMessageObserver.getPipe(), IncomingMessageObserver.getUnidentifiedPipe()); this.messageSender.setIsMultiDevice(TextSecurePreferences.isMultiDevice(context)); diff --git a/src/org/thoughtcrime/securesms/loki/LokiPreKeyBundleStoreImpl.kt b/src/org/thoughtcrime/securesms/loki/LokiPreKeyBundleStore.kt similarity index 89% rename from src/org/thoughtcrime/securesms/loki/LokiPreKeyBundleStoreImpl.kt rename to src/org/thoughtcrime/securesms/loki/LokiPreKeyBundleStore.kt index 1bba0760a8..8724cc52c5 100644 --- a/src/org/thoughtcrime/securesms/loki/LokiPreKeyBundleStoreImpl.kt +++ b/src/org/thoughtcrime/securesms/loki/LokiPreKeyBundleStore.kt @@ -5,7 +5,8 @@ import org.thoughtcrime.securesms.database.DatabaseFactory import org.whispersystems.libsignal.state.PreKeyBundle import org.whispersystems.signalservice.loki.utilities.LokiPreKeyBundleStore -class LokiPreKeyBundleStoreImpl(val context: Context): LokiPreKeyBundleStore { +class LokiPreKeyBundleStore(val context: Context) : LokiPreKeyBundleStoreProtocol { + companion object { val FILE_LOCK = Object() }