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

show snackbar instead of dialog to perform add or remove account action when server is in maintenance mode.

Browse Source 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
This commit is contained in:
sowjanyakch 2025-02-24 09:27:23 +01:00
parent 04d2f056b8
commit 97ea35a6b1
No known key found for this signature in database
GPG Key ID: F7AA2A8B65B50220
2 changed files with 7 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1876,42 +1876,11 @@ class ConversationsListActivity :
private fun showServiceUnavailableDialog(httpException: HttpException) { private fun showServiceUnavailableDialog(httpException: HttpException) {
if (httpException.response()?.headers()?.get(MAINTENANCE_MODE_HEADER_KEY) == "1") { if (httpException.response()?.headers()?.get(MAINTENANCE_MODE_HEADER_KEY) == "1") {
binding.floatingActionButton.let { binding.floatingActionButton.let {
val dialogBuilder = MaterialAlertDialogBuilder(it.context) Snackbar.make(
.setIcon( binding.root,
viewThemeUtils.dialog.colorMaterialAlertDialogIcon( R.string.nc_dialog_maintenance_mode_description,
context, Snackbar.LENGTH_LONG
R.drawable.ic_info_white_24dp ).show()
)
)
.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)
)
} }
} else { } else {
showErrorDialog() showErrorDialog()

4
app/src/main/res/values/strings.xml
View File

@ -656,8 +656,8 @@ How to translate with transifex:
<string name="nc_dialog_outdated_client_description">The app is too old and no longer supported by this server. Please update.</string> <string name="nc_dialog_outdated_client_description">The app is too old and no longer supported by this server. Please update.</string>
<string name="nc_dialog_outdated_client_option_update">Update</string> <string name="nc_dialog_outdated_client_option_update">Update</string>
<string name="nc_switch_account">Switch account</string> <string name="nc_switch_account">Switch account</string>
<string name="nc_dialog_maintenance_mode">Maintenance mode</string> <string name="nc_dialog_maintenance_mode_description">Server is currently in maintenance mode. Please try again
<string name="nc_dialog_maintenance_mode_description">Server is currently in maintenance mode.</string> later.</string>
<!-- Take photo --> <!-- Take photo -->
<string name="take_photo">Take a photo</string> <string name="take_photo">Take a photo</string>