Show a specific error when database reset cannot finish
This commit is contained in:
1 parent
3b42547740
commit
893e714422
3 files changed
+4
-1
No files matched your search
@@ -744,7 +744,8 @@ private fun DeveloperSettingsTab(vm: ChatViewModel, onDirty: (Boolean) -> Unit,
|
||||
/* Dialogs */
|
||||
if (configFailure || databaseReset.failed) AlertDialog(
|
||||
onDismissRequest = { configFailure = false; vm.dismissDatabaseResetError() }, title = { Text(stringResource(R.string.settings)) },
|
||||
text = { Text(stringResource(R.string.settings_update_failed)) }, confirmButton = {
|
||||
text = { Text(stringResource(if (databaseReset.failed) R.string.database_reset_failed else R.string.settings_update_failed)) },
|
||||
confirmButton = {
|
||||
TextButton(onClick = { configFailure = false; vm.dismissDatabaseResetError() }) { Text(stringResource(R.string.close)) }
|
||||
})
|
||||
if (clearingDb) AlertDialog(onDismissRequest = {}, title = { Text(stringResource(R.string.settings)) },
|
||||
|
||||
@@ -599,4 +599,5 @@
|
||||
<string name="media_audio_fallback">Выбранное устройство отключено. Используется микрофон и динамик телефона.</string>
|
||||
<string name="media_audio_failed">Не удалось использовать выбранное аудиоустройство. Проверьте текущие микрофон и выход.</string>
|
||||
<string name="settings_update_failed">Не удалось обновить настройки. Повторите попытку.</string>
|
||||
<string name="database_reset_failed">Не удалось завершить очистку базы. Повторите попытку.</string>
|
||||
</resources>
|
||||
@@ -598,4 +598,5 @@
|
||||
<string name="media_audio_fallback">The selected device is disconnected. Phone audio is in use.</string>
|
||||
<string name="media_audio_failed">Could not use the selected audio device. Check the current microphone and output.</string>
|
||||
<string name="settings_update_failed">Could not update the settings. Try again.</string>
|
||||
<string name="database_reset_failed">Could not finish clearing the database. Try again.</string>
|
||||
</resources>
|
||||
Reference in new issue
Block a user