From 3f24f8753a7f6c2343e521e875df762530c9135f Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Mon, 26 Aug 2019 13:03:38 +1000 Subject: [PATCH 1/3] Poll for deleted group chat messages --- .../securesms/loki/LokiGroupChatPoller.kt | 55 +++++++++++++++---- .../securesms/loki/LokiMessageDatabase.kt | 7 +++ 2 files changed, 50 insertions(+), 12 deletions(-) diff --git a/src/org/thoughtcrime/securesms/loki/LokiGroupChatPoller.kt b/src/org/thoughtcrime/securesms/loki/LokiGroupChatPoller.kt index 43265beae2..f97332807f 100644 --- a/src/org/thoughtcrime/securesms/loki/LokiGroupChatPoller.kt +++ b/src/org/thoughtcrime/securesms/loki/LokiGroupChatPoller.kt @@ -18,35 +18,51 @@ class LokiGroupChatPoller(private val context: Context, private val groupID: Lon private val handler = Handler() private var hasStarted = false - private val task = object : Runnable { + private val api: LokiGroupChatAPI + get() = { + val userHexEncodedPublicKey = TextSecurePreferences.getLocalNumber(context) + val lokiAPIDatabase = DatabaseFactory.getLokiAPIDatabase(context) + val lokiUserDatabase = DatabaseFactory.getLokiUserDatabase(context) + val userPrivateKey = IdentityKeyUtil.getIdentityKeyPair(context).privateKey.serialize() + LokiGroupChatAPI(userHexEncodedPublicKey, userPrivateKey, lokiAPIDatabase, lokiUserDatabase) + }() + + private val pollForNewMessagesTask = object : Runnable { override fun run() { - poll() - handler.postDelayed(this, pollInterval) + pollForNewMessages() + handler.postDelayed(this, pollForNewMessagesInterval) + } + } + + private val pollForDeletedMessagesTask = object : Runnable { + + override fun run() { + pollForDeletedMessages() + handler.postDelayed(this, pollForDeletedMessagesInterval) } } companion object { - private val pollInterval: Long = 4 * 1000 + private val pollForNewMessagesInterval: Long = 4 * 1000 + private val pollForDeletedMessagesInterval: Long = 120 * 1000 } fun startIfNeeded() { if (hasStarted) return - task.run() + pollForNewMessagesTask.run() + pollForDeletedMessagesTask.run() hasStarted = true } fun stop() { - handler.removeCallbacks(task) + handler.removeCallbacks(pollForNewMessagesTask) + handler.removeCallbacks(pollForDeletedMessagesTask) hasStarted = false } - private fun poll() { - val userHexEncodedPublicKey = TextSecurePreferences.getLocalNumber(context) - val lokiAPIDatabase = DatabaseFactory.getLokiAPIDatabase(context) - val lokiUserDatabase = DatabaseFactory.getLokiUserDatabase(context) - val userPrivateKey = IdentityKeyUtil.getIdentityKeyPair(context).privateKey.serialize() - LokiGroupChatAPI(userHexEncodedPublicKey, userPrivateKey, lokiAPIDatabase, lokiUserDatabase).getMessages(groupID).success { messages -> + private fun pollForNewMessages() { + api.getMessages(groupID).success { messages -> messages.reversed().map { message -> val id = "${LokiGroupChatAPI.serverURL}.$groupID".toByteArray() val x1 = SignalServiceGroup(SignalServiceGroup.Type.UPDATE, id, null, null, null) @@ -59,4 +75,19 @@ class LokiGroupChatPoller(private val context: Context, private val groupID: Lon Log.d("Loki", "Failed to get messages for group chat with ID: $groupID.") } } + + private fun pollForDeletedMessages() { + api.getMessages(groupID, 0).success { messages -> + val lokiMessageDatabase = DatabaseFactory.getLokiMessageDatabase(context) + val deletedMessageIDs = messages.filter { it.isDeleted }.mapNotNull { it.serverID }.mapNotNull { lokiMessageDatabase.getMessageID(it) } + val smsMessageDatabase = DatabaseFactory.getSmsDatabase(context) + val mmsMessageDatabase = DatabaseFactory.getMmsDatabase(context) + deletedMessageIDs.forEach { + smsMessageDatabase.deleteMessage(it) + mmsMessageDatabase.delete(it) + } + }.fail { + Log.d("Loki", "Failed to get deleted messages for group chat with ID: $groupID.") + } + } } \ No newline at end of file diff --git a/src/org/thoughtcrime/securesms/loki/LokiMessageDatabase.kt b/src/org/thoughtcrime/securesms/loki/LokiMessageDatabase.kt index d6f208ac02..0548e9e6fe 100644 --- a/src/org/thoughtcrime/securesms/loki/LokiMessageDatabase.kt +++ b/src/org/thoughtcrime/securesms/loki/LokiMessageDatabase.kt @@ -18,6 +18,13 @@ class LokiMessageDatabase(context: Context, helper: SQLCipherOpenHelper) : Datab @JvmStatic val createTableCommand = "CREATE TABLE $tableName ($messageID INTEGER PRIMARY KEY, $serverID INTEGER DEFAULT 0, $friendRequestStatus INTEGER DEFAULT 0);" } + fun getMessageID(serverID: Long): Long? { + val database = databaseHelper.readableDatabase + return database.get(tableName, "${Companion.serverID} = ?", arrayOf( serverID.toString() )) { cursor -> + cursor.getInt(messageID) + }?.toLong() + } + override fun setServerID(messageID: Long, serverID: Long) { val database = databaseHelper.writableDatabase val contentValues = ContentValues(2) From c5e4a2255c267f1c864942c0d9e84a28a8f1854e Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Mon, 26 Aug 2019 13:24:49 +1000 Subject: [PATCH 2/3] Update for core changes --- src/org/thoughtcrime/securesms/loki/LokiGroupChatPoller.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/thoughtcrime/securesms/loki/LokiGroupChatPoller.kt b/src/org/thoughtcrime/securesms/loki/LokiGroupChatPoller.kt index f97332807f..be06ee1f0b 100644 --- a/src/org/thoughtcrime/securesms/loki/LokiGroupChatPoller.kt +++ b/src/org/thoughtcrime/securesms/loki/LokiGroupChatPoller.kt @@ -77,9 +77,9 @@ class LokiGroupChatPoller(private val context: Context, private val groupID: Lon } private fun pollForDeletedMessages() { - api.getMessages(groupID, 0).success { messages -> + api.getDeletedMessageIDs(groupID, 0).success { deletedMessageServerIDs -> val lokiMessageDatabase = DatabaseFactory.getLokiMessageDatabase(context) - val deletedMessageIDs = messages.filter { it.isDeleted }.mapNotNull { it.serverID }.mapNotNull { lokiMessageDatabase.getMessageID(it) } + val deletedMessageIDs = deletedMessageServerIDs.mapNotNull { lokiMessageDatabase.getMessageID(it) } val smsMessageDatabase = DatabaseFactory.getSmsDatabase(context) val mmsMessageDatabase = DatabaseFactory.getMmsDatabase(context) deletedMessageIDs.forEach { From a2a74fddcd54a5484c9a3ebcfd1ba7d009e151bb Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Mon, 26 Aug 2019 13:55:45 +1000 Subject: [PATCH 3/3] Keep track of first message ID --- .../securesms/loki/LokiAPIDatabase.kt | 42 +++++++++++++++++-- .../securesms/loki/LokiGroupChatPoller.kt | 2 +- .../securesms/loki/NewConversationActivity.kt | 4 ++ 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/src/org/thoughtcrime/securesms/loki/LokiAPIDatabase.kt b/src/org/thoughtcrime/securesms/loki/LokiAPIDatabase.kt index 9cf4d66e72..cf73327ec8 100644 --- a/src/org/thoughtcrime/securesms/loki/LokiAPIDatabase.kt +++ b/src/org/thoughtcrime/securesms/loki/LokiAPIDatabase.kt @@ -33,6 +33,16 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database( private val serverURL = "server_url" private val token = "token" @JvmStatic val createGroupChatAuthTokenTableCommand = "CREATE TABLE $groupChatAuthTokenTable ($serverURL TEXT PRIMARY KEY, $token TEXT);" + // Last message server ID cache + private val lastMessageServerIDCache = "loki_api_last_message_server_id_cache" + private val lastMessageServerIDCacheGroupID = "group_id" + private val lastMessageServerID = "last_message_server_id" + @JvmStatic val createLastMessageServerIDTableCommand = "CREATE TABLE $lastMessageServerIDCache ($lastMessageServerIDCacheGroupID INTEGER PRIMARY KEY, $lastMessageServerID INTEGER);" + // First message server ID cache + private val firstMessageServerIDCache = "loki_api_first_message_server_id_cache" + private val firstMessageServerIDCacheGroupID = "group_id" + private val firstMessageServerID = "first_message_server_id" + @JvmStatic val createFirstMessageServerIDTableCommand = "CREATE TABLE $firstMessageServerIDCache ($firstMessageServerIDCacheGroupID INTEGER PRIMARY KEY, $firstMessageServerID INTEGER);" } override fun getSwarmCache(hexEncodedPublicKey: String): Set? { @@ -90,15 +100,41 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database( } } - override fun setGroupChatAuthToken(token: String?, serverURL: String) { + override fun setGroupChatAuthToken(serverURL: String, newValue: String?) { val database = databaseHelper.writableDatabase - if (token != null) { - val row = wrap(mapOf(Companion.serverURL to serverURL, Companion.token to token!!)) + if (newValue != null) { + val row = wrap(mapOf(Companion.serverURL to serverURL, token to newValue!!)) database.insertOrUpdate(groupChatAuthTokenTable, row, "${Companion.serverURL} = ?", wrap(serverURL)) } else { database.delete(groupChatAuthTokenTable, "${Companion.serverURL} = ?", wrap(serverURL)) } } + + override fun getLastMessageServerID(groupID: Long): Long? { + val database = databaseHelper.readableDatabase + return database.get(lastMessageServerIDCache, "$lastMessageServerIDCacheGroupID = ?", wrap(groupID.toString())) { cursor -> + cursor.getInt(lastMessageServerID) + }?.toLong() + } + + override fun setLastMessageServerID(groupID: Long, newValue: Long) { + val database = databaseHelper.writableDatabase + val row = wrap(mapOf( lastMessageServerIDCacheGroupID to groupID.toString(), lastMessageServerID to newValue.toString() )) + database.insertOrUpdate(lastMessageServerIDCache, row, "$lastMessageServerIDCacheGroupID = ?", wrap(groupID.toString())) + } + + override fun getFirstMessageServerID(groupID: Long): Long? { + val database = databaseHelper.readableDatabase + return database.get(firstMessageServerIDCache, "$firstMessageServerIDCacheGroupID = ?", wrap(groupID.toString())) { cursor -> + cursor.getInt(firstMessageServerID) + }?.toLong() + } + + override fun setFirstMessageServerID(groupID: Long, newValue: Long) { + val database = databaseHelper.writableDatabase + val row = wrap(mapOf( firstMessageServerIDCacheGroupID to groupID.toString(), firstMessageServerID to newValue.toString() )) + database.insertOrUpdate(firstMessageServerIDCache, row, "$firstMessageServerIDCacheGroupID = ?", wrap(groupID.toString())) + } } // region Convenience diff --git a/src/org/thoughtcrime/securesms/loki/LokiGroupChatPoller.kt b/src/org/thoughtcrime/securesms/loki/LokiGroupChatPoller.kt index be06ee1f0b..d0888568d0 100644 --- a/src/org/thoughtcrime/securesms/loki/LokiGroupChatPoller.kt +++ b/src/org/thoughtcrime/securesms/loki/LokiGroupChatPoller.kt @@ -77,7 +77,7 @@ class LokiGroupChatPoller(private val context: Context, private val groupID: Lon } private fun pollForDeletedMessages() { - api.getDeletedMessageIDs(groupID, 0).success { deletedMessageServerIDs -> + api.getDeletedMessageServerIDs(groupID).success { deletedMessageServerIDs -> val lokiMessageDatabase = DatabaseFactory.getLokiMessageDatabase(context) val deletedMessageIDs = deletedMessageServerIDs.mapNotNull { lokiMessageDatabase.getMessageID(it) } val smsMessageDatabase = DatabaseFactory.getSmsDatabase(context) diff --git a/src/org/thoughtcrime/securesms/loki/NewConversationActivity.kt b/src/org/thoughtcrime/securesms/loki/NewConversationActivity.kt index 9d3364675e..353f2a97c6 100644 --- a/src/org/thoughtcrime/securesms/loki/NewConversationActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/NewConversationActivity.kt @@ -8,13 +8,17 @@ import android.widget.Toast import network.loki.messenger.R import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity import org.thoughtcrime.securesms.conversation.ConversationActivity +import org.thoughtcrime.securesms.crypto.IdentityKeyUtil import org.thoughtcrime.securesms.database.Address import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.database.ThreadDatabase +import org.thoughtcrime.securesms.logging.Log import org.thoughtcrime.securesms.permissions.Permissions import org.thoughtcrime.securesms.qr.ScanListener import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.util.DynamicTheme +import org.thoughtcrime.securesms.util.TextSecurePreferences +import org.whispersystems.signalservice.loki.api.LokiGroupChatAPI import org.whispersystems.signalservice.loki.utilities.PublicKeyValidation class NewConversationActivity : PassphraseRequiredActionBarActivity(), ScanListener {