gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-19 10:45:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add temporary workarounds until conductor is removed

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2023-04-06 19:20:06 +02:00 committed by Andy Scherzinger
parent 1246223859
commit 9c9259b730
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
View File

@ -1293,16 +1293,17 @@ class ConversationsListActivity :
Log.d(TAG, "No other users found. AccountRemovalWorker will restart the app.") Log.d(TAG, "No other users found. AccountRemovalWorker will restart the app.")
} }
} }
.setNegativeButton(R.string.nc_settings_reauthorize) { _, _ ->
// TODO // TODO: show negative button again when conductor is removed
// router.pushController( // .setNegativeButton(R.string.nc_settings_reauthorize) { _, _ ->
// RouterTransaction.with( // // router.pushController(
// WebViewLoginController(currentUser!!.baseUrl, true) // // RouterTransaction.with(
// ) // // WebViewLoginController(currentUser!!.baseUrl, true)
// .pushChangeHandler(VerticalChangeHandler()) // // )
// .popChangeHandler(VerticalChangeHandler()) // // .pushChangeHandler(VerticalChangeHandler())
// ) // // .popChangeHandler(VerticalChangeHandler())
} // // )
// }
viewThemeUtils.dialog.colorMaterialAlertDialogBackground(it.context, dialogBuilder) viewThemeUtils.dialog.colorMaterialAlertDialogBackground(it.context, dialogBuilder)
val dialog = dialogBuilder.show() val dialog = dialogBuilder.show()
@ -1335,8 +1336,10 @@ class ConversationsListActivity :
} }
.setNegativeButton(R.string.nc_cancel) { _, _ -> .setNegativeButton(R.string.nc_cancel) { _, _ ->
if (userManager.users.blockingGet().isNotEmpty()) { if (userManager.users.blockingGet().isNotEmpty()) {
// TODO // TODO show SwitchAccount screen again when conductor is removed instead to close app
// router.pushController(RouterTransaction.with(SwitchAccountController())) // router.pushController(RouterTransaction.with(SwitchAccountController()))
finishAffinity()
finish()
} else { } else {
finishAffinity() finishAffinity()
finish() finish()