mirror of
https://github.com/nextcloud/talk-android
synced 2025-07-11 14:54:09 +01:00
fix klint
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
parent
b652b1136e
commit
d377b6f136
@ -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) {
|
||||||
|
Loading…
Reference in New Issue
Block a user