From 97ea35a6b1508ce585bee541baf1190344b892b0 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Mon, 24 Feb 2025 09:27:23 +0100 Subject: [PATCH] show snackbar instead of dialog to perform add or remove account action when server is in maintenance mode. Signed-off-by: sowjanyakch --- .../ConversationsListActivity.kt | 41 +++---------------- app/src/main/res/values/strings.xml | 4 +- 2 files changed, 7 insertions(+), 38 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt index 3fafc116b..5a323fbe7 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt @@ -1876,42 +1876,11 @@ class ConversationsListActivity : private fun showServiceUnavailableDialog(httpException: HttpException) { if (httpException.response()?.headers()?.get(MAINTENANCE_MODE_HEADER_KEY) == "1") { binding.floatingActionButton.let { - val dialogBuilder = MaterialAlertDialogBuilder(it.context) - .setIcon( - viewThemeUtils.dialog.colorMaterialAlertDialogIcon( - context, - R.drawable.ic_info_white_24dp - ) - ) - .setTitle(R.string.nc_dialog_maintenance_mode) - .setMessage(R.string.nc_dialog_maintenance_mode_description) - .setCancelable(false) - .setNegativeButton(R.string.nc_settings_remove_account) { _, _ -> - deleteUserAndRestartApp() - } - - if (resources!!.getBoolean(R.bool.multiaccount_support) && userManager.users.blockingGet().size > 1) { - dialogBuilder.setPositiveButton(R.string.nc_switch_account) { _, _ -> - val newFragment: DialogFragment = ChooseAccountDialogFragment.newInstance() - newFragment.show(supportFragmentManager, ChooseAccountDialogFragment.TAG) - } - } - - if (resources!!.getBoolean(R.bool.multiaccount_support)) { - dialogBuilder.setNeutralButton(R.string.nc_account_chooser_add_account) { _, _ -> - val intent = Intent(this, ServerSelectionActivity::class.java) - intent.putExtra(ADD_ADDITIONAL_ACCOUNT, true) - startActivity(intent) - } - } - - viewThemeUtils.dialog.colorMaterialAlertDialogBackground(it.context, dialogBuilder) - val dialog = dialogBuilder.show() - viewThemeUtils.platform.colorTextButtons( - dialog.getButton(AlertDialog.BUTTON_POSITIVE), - dialog.getButton(AlertDialog.BUTTON_NEGATIVE), - dialog.getButton(AlertDialog.BUTTON_NEUTRAL) - ) + Snackbar.make( + binding.root, + R.string.nc_dialog_maintenance_mode_description, + Snackbar.LENGTH_LONG + ).show() } } else { showErrorDialog() diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 906934261..a9be9e288 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -656,8 +656,8 @@ How to translate with transifex: The app is too old and no longer supported by this server. Please update. Update Switch account - Maintenance mode - Server is currently in maintenance mode. + Server is currently in maintenance mode. Please try again + later. Take a photo