From 16ddfc37ce5b98b00f35b37d8d4e9777c4d8567c Mon Sep 17 00:00:00 2001 From: Mikunj Date: Mon, 22 Jul 2019 12:34:10 +1000 Subject: [PATCH] Finalise session reset. --- src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java | 2 +- src/org/thoughtcrime/securesms/loki/LokiPreKeyRecordDatabase.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java index 3c15977cc5..70d5886185 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java @@ -244,7 +244,7 @@ public class PushDecryptJob extends BaseJob implements InjectableType { GroupDatabase groupDatabase = DatabaseFactory.getGroupDatabase(context); SignalProtocolStore axolotlStore = new SignalProtocolStoreImpl(context); LokiThreadDatabaseProtocol lokiThreadDatabase = DatabaseFactory.getLokiThreadDatabase(context); - LokiPreKeyRecordDatabaseProtocol preKeyRecordDatabase = DatabaseFactory.getLokiPreKeyRecordDatabase(context); + LokiPreKeyRecordDatabase preKeyRecordDatabase = DatabaseFactory.getLokiPreKeyRecordDatabase(context); SignalServiceAddress localAddress = new SignalServiceAddress(TextSecurePreferences.getLocalNumber(context)); LokiServiceCipher cipher = new LokiServiceCipher(localAddress, axolotlStore, lokiThreadDatabase, preKeyRecordDatabase, UnidentifiedAccessUtil.getCertificateValidator()); /* Loki - Original code diff --git a/src/org/thoughtcrime/securesms/loki/LokiPreKeyRecordDatabase.kt b/src/org/thoughtcrime/securesms/loki/LokiPreKeyRecordDatabase.kt index 989ae09632..bd132669ea 100644 --- a/src/org/thoughtcrime/securesms/loki/LokiPreKeyRecordDatabase.kt +++ b/src/org/thoughtcrime/securesms/loki/LokiPreKeyRecordDatabase.kt @@ -23,7 +23,7 @@ class LokiPreKeyRecordDatabase(context: Context, helper: SQLCipherOpenHelper) : return database.get(tableName, "${Companion.hexEncodedPublicKey} = ?", arrayOf( hexEncodedPublicKey )) { it.count > 0 } ?: false } - fun getPreKey(hexEncodedPublicKey: String): PreKeyRecord? { + override fun getPreKey(hexEncodedPublicKey: String): PreKeyRecord? { val database = databaseHelper.readableDatabase return database.get(tableName, "${Companion.hexEncodedPublicKey} = ?", arrayOf( hexEncodedPublicKey )) { cursor -> val preKeyID = cursor.getInt(preKeyID)