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

leave room before remap controller

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2022-12-12 11:17:58 +01:00
parent 5bc8436cd3
commit c708104cbe
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,6 +96,7 @@ import coil.load
import coil.request.ImageRequest
import coil.target.Target
import coil.transform.CircleCropTransformation
import com.bluelinelabs.conductor.Router
import com.bluelinelabs.conductor.RouterTransaction
import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler
import com.google.android.flexbox.FlexboxLayout
@ -2005,6 +2006,33 @@ class ChatController(args: Bundle) :
}
private fun leaveRoom() {
leaveRoom(
null,
null,
null,
null,
null,
null,
)
}
private fun leaveRoom(
router: Router?,
internalUserId: Long?,
roomTokenOrId: String?,
bundle: Bundle?,
replaceTop: Boolean?,
remapChatController:
(
(
router: Router,
internalUserId: Long,
roomTokenOrId: String,
bundle: Bundle,
replaceTop: Boolean
) -> Unit
)?
) {
logConversationInfos("leaveRoom")
var apiVersion = 1
@ -2057,6 +2085,19 @@ class ChatController(args: Bundle) :
}
currentConversation?.sessionId = "0"
if (remapChatController != null) {
Log.d(TAG, "remapChatController was set and is now executed after room was already left")
remapChatController(
router!!,
internalUserId!!,
roomTokenOrId!!,
bundle!!,
replaceTop!!,
)
} else {
Log.d(TAG, "remapChatController was not set")
}
}
override fun onError(e: Throwable) {
@ -3353,12 +3394,13 @@ class ChatController(args: Bundle) :
)
conversationIntent.putExtras(bundle)
ConductorRemapping.remapChatController(
leaveRoom(
router,
conversationUser.id!!,
roomOverall.ocs!!.data!!.token!!,
bundle,
false
false,
ConductorRemapping::remapChatController
)
} else {
conversationIntent.putExtras(bundle)