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

fix klint

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2021-11-23 11:42:46 +01:00
parent b652b1136e
commit d377b6f136
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -279,7 +279,7 @@ class ChatController(args: Bundle) :
this.sharedText = args.getString(BundleKeys.KEY_SHARED_TEXT, "") this.sharedText = args.getString(BundleKeys.KEY_SHARED_TEXT, "")
Log.d(TAG, " roomToken = $roomToken") Log.d(TAG, " roomToken = $roomToken")
if (roomToken.isNullOrEmpty()){ if (roomToken.isNullOrEmpty()) {
Log.d(TAG, " roomToken was null or empty!") Log.d(TAG, " roomToken was null or empty!")
} }
@ -322,7 +322,10 @@ class ChatController(args: Bundle) :
@Suppress("Detekt.TooGenericExceptionCaught") @Suppress("Detekt.TooGenericExceptionCaught")
override fun onNext(roomOverall: RoomOverall) { override fun onNext(roomOverall: RoomOverall) {
currentConversation = roomOverall.ocs.data currentConversation = roomOverall.ocs.data
Log.d(TAG, "getRoomInfo. token: " + currentConversation?.getToken() + " sessionId: " + currentConversation?.sessionId) Log.d(
TAG, "getRoomInfo. token: " + currentConversation?.getToken() +
" sessionId: " + currentConversation?.sessionId
)
loadAvatarForStatusBar() loadAvatarForStatusBar()
setTitle() setTitle()
@ -1627,9 +1630,10 @@ class ChatController(args: Bundle) :
private fun joinRoomWithPassword() { private fun joinRoomWithPassword() {
if (currentConversation == null if (currentConversation == null ||
|| TextUtils.isEmpty(currentConversation?.sessionId) TextUtils.isEmpty(currentConversation?.sessionId) ||
|| currentConversation?.sessionId == "0") { currentConversation?.sessionId == "0"
) {
var apiVersion = 1 var apiVersion = 1
// FIXME Fix API checking with guests? // FIXME Fix API checking with guests?
if (conversationUser != null) { if (conversationUser != null) {