From 893e7144222115004d56bc074c6cd2c8da2e375d Mon Sep 17 00:00:00 2001
From: evgeny <evgeny@adaptto.ru>
Date: Tue, 27 Oct 2026 17:17:08 +0100
Subject: [PATCH] Show a specific error when database reset cannot finish

---
 .../src/main/java/com/utun/chat/ui/screens/SettingsScreen.kt   | 3 ++-
 tools/chatgui-android/app/src/main/res/values-ru/strings.xml   | 1 +
 tools/chatgui-android/app/src/main/res/values/strings.xml      | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/SettingsScreen.kt b/tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/SettingsScreen.kt
index 1e17af9f..f355c3a4 100644
--- a/tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/SettingsScreen.kt
+++ b/tools/chatgui-android/app/src/main/java/com/utun/chat/ui/screens/SettingsScreen.kt
@@ -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)) },
diff --git a/tools/chatgui-android/app/src/main/res/values-ru/strings.xml b/tools/chatgui-android/app/src/main/res/values-ru/strings.xml
index 7d797950..9aadb56f 100644
--- a/tools/chatgui-android/app/src/main/res/values-ru/strings.xml
+++ b/tools/chatgui-android/app/src/main/res/values-ru/strings.xml
@@ -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>
diff --git a/tools/chatgui-android/app/src/main/res/values/strings.xml b/tools/chatgui-android/app/src/main/res/values/strings.xml
index a386f92c..e1e53d17 100644
--- a/tools/chatgui-android/app/src/main/res/values/strings.xml
+++ b/tools/chatgui-android/app/src/main/res/values/strings.xml
@@ -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>