gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-08 23:19:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace non null check with early return if null

Browse Source 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
This commit is contained in:
Daniel Calviño Sánchez 2023-01-26 14:09:50 +01:00 committed by Marcel Hibbe
parent 747a4646d3
commit b07aaee140
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2147,15 +2147,17 @@ class ChatController(args: Bundle) :
} }
private fun setupWebsocket() { private fun setupWebsocket() {
if (conversationUser != null) { if (conversationUser == null) {
webSocketInstance = return
if (WebSocketConnectionHelper.getMagicWebSocketInstanceForUserId(conversationUser.id!!) != null) {
WebSocketConnectionHelper.getMagicWebSocketInstanceForUserId(conversationUser.id!!)
} else {
Log.d(TAG, "magicWebSocketInstance became null")
null
}
} }
webSocketInstance =
if (WebSocketConnectionHelper.getMagicWebSocketInstanceForUserId(conversationUser.id!!) != null) {
WebSocketConnectionHelper.getMagicWebSocketInstanceForUserId(conversationUser.id!!)
} else {
Log.d(TAG, "magicWebSocketInstance became null")
null
}
} }
fun pullChatMessages(lookIntoFuture: Int, setReadMarker: Int = 1, xChatLastCommonRead: Int? = null) { fun pullChatMessages(lookIntoFuture: Int, setReadMarker: Int = 1, xChatLastCommonRead: Int? = null) {