gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

ktlint

Browse Source 
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
This commit is contained in:
Dariusz Olszewski 2022-02-27 15:46:26 +01:00 committed by Marcel Hibbe
parent a7bd6393df
commit c95d286de4
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1509,7 +1509,7 @@ class ChatController(args: Bundle) :
} }
} }
private fun validSessionId() : Boolean { private fun validSessionId(): Boolean {
return currentConversation != null && return currentConversation != null &&
!TextUtils.isEmpty(currentConversation?.sessionId) && !TextUtils.isEmpty(currentConversation?.sessionId) &&
currentConversation?.sessionId != "0" currentConversation?.sessionId != "0"
@ -1517,8 +1517,11 @@ class ChatController(args: Bundle) :
override fun onAttach(view: View) { override fun onAttach(view: View) {
super.onAttach(view) super.onAttach(view)
Log.d(TAG, "onAttach: Controller: " + System.identityHashCode(this).toString() + Log.d(
" Activity: " + System.identityHashCode(activity).toString()) TAG,
"onAttach: Controller: " + System.identityHashCode(this).toString() +
" Activity: " + System.identityHashCode(activity).toString()
)
eventBus?.register(this) eventBus?.register(this)
if (conversationUser?.userId != "?" && if (conversationUser?.userId != "?" &&
@ -1587,8 +1590,11 @@ class ChatController(args: Bundle) :
override fun onDetach(view: View) { override fun onDetach(view: View) {
super.onDetach(view) super.onDetach(view)
Log.d(TAG, "onDetach: Controller: " + System.identityHashCode(this).toString() + Log.d(
" Activity: " + System.identityHashCode(activity).toString()) TAG,
"onDetach: Controller: " + System.identityHashCode(this).toString() +
" Activity: " + System.identityHashCode(activity).toString()
)
eventBus?.unregister(this) eventBus?.unregister(this)
@ -1651,9 +1657,11 @@ class ChatController(args: Bundle) :
} }
private fun joinRoomWithPassword() { private fun joinRoomWithPassword() {
Log.d(TAG, Log.d(
TAG,
"joinRoomWithPassword start: " + (currentConversation == null).toString() + "joinRoomWithPassword start: " + (currentConversation == null).toString() +
" sessionId: " + currentConversation?.sessionId) " sessionId: " + currentConversation?.sessionId
)
if (! validSessionId()) { if (! validSessionId()) {
var apiVersion = 1 var apiVersion = 1
@ -1682,7 +1690,7 @@ class ChatController(args: Bundle) :
Log.d(TAG, "joinRoomWithPassword - joinRoom - got response: " + startNanoTime) Log.d(TAG, "joinRoomWithPassword - joinRoom - got response: " + startNanoTime)
inConversation = true inConversation = true
currentConversation?.sessionId = roomOverall.ocs.data.sessionId currentConversation?.sessionId = roomOverall.ocs.data.sessionId
Log.d(TAG, "joinRoomWithPassword - joinRoom - got response - sessionId: " + currentConversation?.sessionId) Log.d(TAG, "joinRoomWithPassword - sessionId: " + currentConversation?.sessionId)
ApplicationWideCurrentRoomHolder.getInstance().session = ApplicationWideCurrentRoomHolder.getInstance().session =
currentConversation?.sessionId currentConversation?.sessionId