TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-24 21:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

move logic from Storage to OpenGroupAPIV2

Browse Source
This commit is contained in:
Brice-W 2021-05-24 13:13:07 +10:00
parent 1b25de6a96
commit 6c37e7a93f
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
View File

@ -233,8 +233,6 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
} }
override fun getLastMessageServerID(room: String, server: String): Long? { 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) 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? { 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) return DatabaseFactory.getLokiAPIDatabase(context).getLastDeletionServerID(room, server)
} }

6
libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt
View File

@ -15,6 +15,7 @@ import okhttp3.RequestBody
import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.MessagingModuleConfiguration
import org.session.libsession.snode.OnionRequestAPI import org.session.libsession.snode.OnionRequestAPI
import org.session.libsession.utilities.AESGCM import org.session.libsession.utilities.AESGCM
import org.session.libsession.utilities.TextSecurePreferences
import org.session.libsignal.utilities.HTTP import org.session.libsignal.utilities.HTTP
import org.session.libsignal.utilities.HTTP.Verb.* import org.session.libsignal.utilities.HTTP.Verb.*
import org.session.libsignal.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.removing05PrefixIfNeeded
@ -349,6 +350,7 @@ object OpenGroupAPIV2 {
fun compactPoll(rooms: List<String>, server: String): Promise<Map<String, CompactPollResult>, Exception> { fun compactPoll(rooms: List<String>, server: String): Promise<Map<String, CompactPollResult>, Exception> {
val authTokenRequests = rooms.associateWith { room -> getAuthToken(room, server) } val authTokenRequests = rooms.associateWith { room -> getAuthToken(room, server) }
val storage = MessagingModuleConfiguration.shared.storage val storage = MessagingModuleConfiguration.shared.storage
val context = MessagingModuleConfiguration.shared.context
val requests = rooms.mapNotNull { room -> val requests = rooms.mapNotNull { room ->
val authToken = try { val authToken = try {
authTokenRequests[room]?.get() authTokenRequests[room]?.get()
@ -359,8 +361,8 @@ object OpenGroupAPIV2 {
CompactPollRequest( CompactPollRequest(
roomID = room, roomID = room,
authToken = authToken, authToken = authToken,
fromDeletionServerID = storage.getLastDeletionServerID(room, server), fromDeletionServerID = if (TextSecurePreferences.isOpenGroupPollingLimit(context)) null else storage.getLastDeletionServerID(room, server),
fromMessageServerID = storage.getLastMessageServerID(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 )) val request = Request(verb = POST, room = null, server = server, endpoint = "compact_poll", isAuthRequired = false, parameters = mapOf( "requests" to requests ))