TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-21 16:08:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: compact polling server-wide

Browse Source
This commit is contained in:
jubb 2021-05-04 14:51:21 +10:00
parent 2eb612a967
commit f3fa8626ed
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatManager.kt
View File

@ -21,7 +21,7 @@ class PublicChatManager(private val context: Context) {
private var chats = mutableMapOf<Long, OpenGroup>() private var chats = mutableMapOf<Long, OpenGroup>()
private var v2Chats = mutableMapOf<Long, OpenGroupV2>() private var v2Chats = mutableMapOf<Long, OpenGroupV2>()
private val pollers = mutableMapOf<Long, OpenGroupPoller>() private val pollers = mutableMapOf<Long, OpenGroupPoller>()
private val v2Pollers = mutableMapOf<Long, OpenGroupV2Poller>() private val v2Pollers = mutableMapOf<String, OpenGroupV2Poller>()
private val observers = mutableMapOf<Long, ContentObserver>() private val observers = mutableMapOf<Long, ContentObserver>()
private var isPolling = false private var isPolling = false
private val executorService = Executors.newScheduledThreadPool(4) private val executorService = Executors.newScheduledThreadPool(4)
@ -53,12 +53,17 @@ class PublicChatManager(private val context: Context) {
listenToThreadDeletion(threadId) listenToThreadDeletion(threadId)
if (!pollers.containsKey(threadId)) { pollers[threadId] = poller } if (!pollers.containsKey(threadId)) { pollers[threadId] = poller }
} }
for ((threadId, chat) in v2Chats) { v2Pollers.values.forEach { it.stop() }
val poller = v2Pollers[threadId] ?: OpenGroupV2Poller(listOf(chat), executorService) v2Pollers.clear()
v2Chats.entries.groupBy { (_, group) -> group.server }.forEach { (server, threadedRooms) ->
val poller = OpenGroupV2Poller(threadedRooms.map { it.value }, executorService)
poller.startIfNeeded() poller.startIfNeeded()
listenToThreadDeletion(threadId) threadedRooms.forEach { (thread, _) ->
if (!v2Pollers.containsKey(threadId)) { v2Pollers[threadId] = poller } listenToThreadDeletion(thread)
} }
v2Pollers[server] = poller
}
isPolling = true isPolling = true
} }
@ -171,7 +176,8 @@ class PublicChatManager(private val context: Context) {
DatabaseFactory.getLokiThreadDatabase(context).removePublicChat(threadID) DatabaseFactory.getLokiThreadDatabase(context).removePublicChat(threadID)
pollers.remove(threadID)?.stop() pollers.remove(threadID)?.stop()
v2Pollers.remove(threadID)?.stop() v2Pollers.values.forEach { it.stop() }
v2Pollers.clear()
observers.remove(threadID) observers.remove(threadID)
startPollersIfNeeded() startPollersIfNeeded()
} }

5
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupV2Poller.kt
View File

@ -66,7 +66,7 @@ class OpenGroupV2Poller(private val openGroups: List<OpenGroupV2>, private val e
} }
fun compactPoll(isBackgroundPoll: Boolean): Promise<Any, Exception> { fun compactPoll(isBackgroundPoll: Boolean): Promise<Any, Exception> {
if (isPollOngoing) return Promise.of(Unit) if (isPollOngoing || !hasStarted) return Promise.of(Unit)
isPollOngoing = true isPollOngoing = true
val server = openGroups.first().server // assume all the same server val server = openGroups.first().server // assume all the same server
val rooms = openGroups.map { it.room } val rooms = openGroups.map { it.room }
@ -74,7 +74,7 @@ class OpenGroupV2Poller(private val openGroups: List<OpenGroupV2>, private val e
results.forEach { (room, results) -> results.forEach { (room, results) ->
val serverRoomId = "$server.$room" val serverRoomId = "$server.$room"
handleDeletedMessages(serverRoomId,results.deletions) handleDeletedMessages(serverRoomId,results.deletions)
handleNewMessages(serverRoomId, results.messages, isBackgroundPoll) handleNewMessages(serverRoomId, results.messages.sortedBy { it.serverID }, isBackgroundPoll)
} }
}.always { }.always {
isPollOngoing = false isPollOngoing = false
@ -86,6 +86,7 @@ class OpenGroupV2Poller(private val openGroups: List<OpenGroupV2>, private val e
} }
private fun handleNewMessages(serverRoomId: String, newMessages: List<OpenGroupMessageV2>, isBackgroundPoll: Boolean) { private fun handleNewMessages(serverRoomId: String, newMessages: List<OpenGroupMessageV2>, isBackgroundPoll: Boolean) {
if (!hasStarted) return
newMessages.forEach { message -> newMessages.forEach { message ->
try { try {
val senderPublicKey = message.sender!! val senderPublicKey = message.sender!!