From 6c37e7a93f95e4dc8cc750cfe23c19f0d62fe19f Mon Sep 17 00:00:00 2001 From: Brice-W Date: Mon, 24 May 2021 13:13:07 +1000 Subject: [PATCH] move logic from Storage to OpenGroupAPIV2 --- .../java/org/thoughtcrime/securesms/database/Storage.kt | 4 ---- .../libsession/messaging/open_groups/OpenGroupAPIV2.kt | 6 ++++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt index 56a4b367f9..185944df95 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt @@ -233,8 +233,6 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context, } override fun getLastMessageServerID(room: String, server: String): Long? { - // return null if limit is set on open groups polling - if (TextSecurePreferences.isOpenGroupPollingLimit(context)) return null return DatabaseFactory.getLokiAPIDatabase(context).getLastMessageServerID(room, server) } @@ -247,8 +245,6 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context, } override fun getLastDeletionServerID(room: String, server: String): Long? { - // return null if limit is set on open groups polling - if (TextSecurePreferences.isOpenGroupPollingLimit(context)) return null return DatabaseFactory.getLokiAPIDatabase(context).getLastDeletionServerID(room, server) } diff --git a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt index 12e5fc1364..32925bdfe1 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt @@ -15,6 +15,7 @@ import okhttp3.RequestBody import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.snode.OnionRequestAPI import org.session.libsession.utilities.AESGCM +import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.utilities.HTTP import org.session.libsignal.utilities.HTTP.Verb.* import org.session.libsignal.utilities.removing05PrefixIfNeeded @@ -349,6 +350,7 @@ object OpenGroupAPIV2 { fun compactPoll(rooms: List, server: String): Promise, Exception> { val authTokenRequests = rooms.associateWith { room -> getAuthToken(room, server) } val storage = MessagingModuleConfiguration.shared.storage + val context = MessagingModuleConfiguration.shared.context val requests = rooms.mapNotNull { room -> val authToken = try { authTokenRequests[room]?.get() @@ -359,8 +361,8 @@ object OpenGroupAPIV2 { CompactPollRequest( roomID = room, authToken = authToken, - fromDeletionServerID = storage.getLastDeletionServerID(room, server), - fromMessageServerID = storage.getLastMessageServerID(room, server) + fromDeletionServerID = if (TextSecurePreferences.isOpenGroupPollingLimit(context)) null else storage.getLastDeletionServerID(room, server), + fromMessageServerID = if (TextSecurePreferences.isOpenGroupPollingLimit(context)) null else storage.getLastMessageServerID(room, server) ) } val request = Request(verb = POST, room = null, server = server, endpoint = "compact_poll", isAuthRequired = false, parameters = mapOf( "requests" to requests ))