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 #761

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2020-03-23 14:16:26 +01:00
parent 4b12ede79e
commit b14f9990b4
No known key found for this signature in database
GPG Key ID: CDE0BBD2738C4CC0
2 changed files with 5 additions and 12 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
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
versionCode 134
versionName "8.0.7"
versionCode 135
versionName "8.0.8"
flavorDimensions "default"
renderscriptTargetApi 19

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

@ -333,8 +333,6 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
}
override fun onViewBound(view: View) {
super.onViewBound(view)
actionBar?.show()
var adapterWasNull = false
@ -465,7 +463,6 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
if (currentConversation != null && currentConversation?.roomId != null) {
loadAvatarForStatusBar()
checkLobbyState()
setTitle()
}
@ -473,8 +470,11 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
// we're starting
if (TextUtils.isEmpty(roomToken)) {
handleFromNotification()
} else {
getRoomInfo()
}
}
super.onViewBound(view)
}
@ -541,13 +541,6 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
lobbyView?.visibility = View.GONE
messagesListView?.visibility = View.VISIBLE
messageInput?.visibility = View.VISIBLE
if (isFirstMessagesProcessing && pastPreconditionFailed) {
pastPreconditionFailed = false
pullChatMessages(0)
} else if (futurePreconditionFailed) {
futurePreconditionFailed = false
pullChatMessages(1)
}
}
}