gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-08-04 02:25:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4193 from nextcloud/bugfix/4168/doNotPullMessagesWhenOfflineOrPaused

Browse Source 
do not try to pull chat messages when offline or paused
This commit is contained in:
Marcel Hibbe 2024-09-12 17:24:21 +02:00 committed by GitHub
commit 9976767591
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt
View File

@ -199,29 +199,31 @@ class OfflineFirstChatRepository @Inject constructor(
val networkParams = Bundle() val networkParams = Bundle()
while (true) { while (true) {
if (!monitor.isOnline.first() || itIsPaused) Thread.sleep(HALF_SECOND) if (!monitor.isOnline.first() || itIsPaused) {
Thread.sleep(HALF_SECOND)
} else {
// sync database with server (This is a long blocking call because long polling (lookIntoFuture) is set)
networkParams.putSerializable(BundleKeys.KEY_FIELD_MAP, fieldMap)
// sync database with server (This is a long blocking call because long polling (lookIntoFuture) is set) val resultsFromSync = sync(networkParams)
networkParams.putSerializable(BundleKeys.KEY_FIELD_MAP, fieldMap) if (!resultsFromSync.isNullOrEmpty()) {
val chatMessages = resultsFromSync.map(ChatMessageEntity::asModel)
val pair = Pair(true, chatMessages)
_messageFlow.emit(pair)
}
val resultsFromSync = sync(networkParams) updateUiForLastCommonRead()
if (!resultsFromSync.isNullOrEmpty()) {
val chatMessages = resultsFromSync.map(ChatMessageEntity::asModel) val newestMessage = chatDao.getNewestMessageId(internalConversationId).toInt()
val pair = Pair(true, chatMessages)
_messageFlow.emit(pair) // update field map vars for next cycle
fieldMap = getFieldMap(
lookIntoFuture = true,
includeLastKnown = false,
setReadMarker = true,
lastKnown = newestMessage
)
} }
updateUiForLastCommonRead()
val newestMessage = chatDao.getNewestMessageId(internalConversationId).toInt()
// update field map vars for next cycle
fieldMap = getFieldMap(
lookIntoFuture = true,
includeLastKnown = false,
setReadMarker = true,
lastKnown = newestMessage
)
} }
} }