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 message title

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-09-30 12:25:15 +02:00
parent 8a60fad0c4
commit a56319d3a9
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,41 +136,41 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
lateinit var lobbyView: RelativeLayout lateinit var lobbyView: RelativeLayout
@BindView(R.id.lobby_text_view) @BindView(R.id.lobby_text_view)
lateinit var conversationLobbyText: TextView lateinit var conversationLobbyText: TextView
private val disposableList = ArrayList<Disposable>() val disposableList = ArrayList<Disposable>()
private var roomToken: String? = null var roomToken: String? = null
private val conversationUser: UserEntity? val conversationUser: UserEntity?
private val roomPassword: String val roomPassword: String
private var credentials: String? = null var credentials: String? = null
private var currentConversation: Conversation? = null var currentConversation: Conversation? = null
private var inConversation = false var inConversation = false
private var historyRead = false var historyRead = false
private var globalLastKnownFutureMessageId = -1 var globalLastKnownFutureMessageId = -1
private var globalLastKnownPastMessageId = -1 var globalLastKnownPastMessageId = -1
private var adapter: MessagesListAdapter<ChatMessage>? = null var adapter: MessagesListAdapter<ChatMessage>? = null
private var mentionAutocomplete: Autocomplete<*>? = null var mentionAutocomplete: Autocomplete<*>? = null
private var layoutManager: LinearLayoutManager? = null var layoutManager: LinearLayoutManager? = null
private var lookingIntoFuture = false var lookingIntoFuture = false
private var newMessagesCount = 0 var newMessagesCount = 0
private var startCallFromNotification: Boolean? = null var startCallFromNotification: Boolean? = null
private val roomId: String val roomId: String
private val voiceOnly: Boolean val voiceOnly: Boolean
private var isFirstMessagesProcessing = true var isFirstMessagesProcessing = true
private var isLeavingForConversation: Boolean = false var isLeavingForConversation: Boolean = false
private var isLinkPreviewAllowed: Boolean = false var isLinkPreviewAllowed: Boolean = false
private var wasDetached: Boolean = false var wasDetached: Boolean = false
private var emojiPopup: EmojiPopup? = null var emojiPopup: EmojiPopup? = null
private var myFirstMessage: CharSequence? = null var myFirstMessage: CharSequence? = null
private var checkingLobbyStatus: Boolean = false var checkingLobbyStatus: Boolean = false
private var conversationInfoMenuItem: MenuItem? = null var conversationInfoMenuItem: MenuItem? = null
private var conversationVoiceCallMenuItem: MenuItem? = null var conversationVoiceCallMenuItem: MenuItem? = null
private var conversationVideoMenuItem: MenuItem? = null var conversationVideoMenuItem: MenuItem? = null
private var magicWebSocketInstance: MagicWebSocketInstance? = null var magicWebSocketInstance: MagicWebSocketInstance? = null
private var lobbyTimerHandler: Handler? = null var lobbyTimerHandler: Handler? = null
private val roomJoined: Boolean = false val roomJoined: Boolean = false
init { init {
setHasOptionsMenu(true) setHasOptionsMenu(true)
@ -691,8 +691,8 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
override fun onNext(roomOverall: RoomOverall) { override fun onNext(roomOverall: RoomOverall) {
inConversation = true inConversation = true
currentConversation = roomOverall.ocs.data currentConversation!!.sessionId = roomOverall.ocs.data.sessionId
setTitle()
ApplicationWideCurrentRoomHolder.getInstance().session = ApplicationWideCurrentRoomHolder.getInstance().session =
currentConversation!!.sessionId currentConversation!!.sessionId
startPing() startPing()