gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 11:39:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #684

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2020-03-22 11:19:54 +01:00
parent 53cc5d28c4
commit 68c1cd6d4d
No known key found for this signature in database
GPG Key ID: CDE0BBD2738C4CC0
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -39,8 +39,8 @@ android {
targetSdkVersion 28 targetSdkVersion 28
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
versionCode 132 versionCode 133
versionName "8.0.5" versionName "8.0.6"
flavorDimensions "default" flavorDimensions "default"
renderscriptTargetApi 19 renderscriptTargetApi 19

9
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
View File

@ -1015,6 +1015,9 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
if (isFromTheFuture) { if (isFromTheFuture) {
globalLastKnownFutureMessageId = header globalLastKnownFutureMessageId = header
} else { } else {
if (globalLastKnownFutureMessageId == -1) {
globalLastKnownFutureMessageId = header
}
globalLastKnownPastMessageId = header globalLastKnownPastMessageId = header
} }
} }
@ -1025,8 +1028,6 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
val chatOverall = response.body() as ChatOverall? val chatOverall = response.body() as ChatOverall?
val chatMessageList = chatOverall?.ocs!!.data val chatMessageList = chatOverall?.ocs!!.data
val wasFirstMessageProcessing = isFirstMessagesProcessing
if (isFirstMessagesProcessing) { if (isFirstMessagesProcessing) {
cancelNotificationsForCurrentConversation() cancelNotificationsForCurrentConversation()
@ -1061,10 +1062,6 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
} }
if (wasFirstMessageProcessing && chatMessageList.size > 0) {
globalLastKnownFutureMessageId = chatMessageList[0].jsonMessageId
}
if (adapter != null) { if (adapter != null) {
adapter?.addToEnd(chatMessageList, false) adapter?.addToEnd(chatMessageList, false)
} }