Skip to content

Add result message to configuration updates #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martenrebane merged 1 commit into from
Jul 3, 2026
Merged

Add result message to configuration updates #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/DiagnosticsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,12 @@ fun DiagnosticsScreen(
CoroutineScope(Dispatchers.IO).launch {
try {
diagnosticsViewModel.updateConfiguration(context)
withContext(Main) {
showMessage(context, R.string.configuration_update_success)
}
} catch (_: Exception) {
withContext(Main) {
showMessage(context, R.string.no_internet_connection)
showMessage(context, R.string.configuration_update_failed)
}
}
}
Expand Down
17 changes: 12 additions & 5 deletions app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/DiagnosticsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.sendAccess
import ee.ria.DigiDoc.utilsLib.date.DateUtil
import ee.ria.DigiDoc.utilsLib.file.FileUtil
import ee.ria.DigiDoc.utilsLib.logging.LoggingUtil
import ee.ria.DigiDoc.utilsLib.logging.LoggingUtil.Companion.debugLog
import ee.ria.DigiDoc.utilsLib.logging.LoggingUtil.Companion.errorLog
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers.Main
Expand Down Expand Up @@ -200,11 +201,17 @@ class DiagnosticsViewModel

@Throws(Exception::class)
suspend fun updateConfiguration(context: Context) {
configurationLoader.loadCentralConfiguration(
context,
dataStore.getProxySetting(),
dataStore.getManualProxySettings(),
)
try {
configurationLoader.loadCentralConfiguration(
context,
dataStore.getProxySetting(),
dataStore.getManualProxySettings(),
)
debugLog(logTag, "Central configuration update successful")
} catch (ex: Exception) {
errorLog(logTag, "Central configuration update failed", ex)
throw ex
}
}

fun saveFile(
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-et/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,8 @@

<string name="configuration_is_already_up_to_date">konfiguratsioon on juba ajakohane</string>
<string name="configuration_updated">Konfiguratsioon uuendatud</string>
<string name="configuration_update_success">RIA DigiDoci konfiguratsiooni värskendamine õnnestus</string>
<string name="configuration_update_failed">Palun kontrolli internetiühendust ja võrgu sätteid</string>
<string name="language_changed">Keel muudetud</string>
<string name="theme_changed">Teema muudetud</string>
<string name="setting_value_changed">Seade väärtus muudetud</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,8 @@

<string name="configuration_is_already_up_to_date">configuration is already up-to-date</string>
<string name="configuration_updated">Configuration updated</string>
<string name="configuration_update_success">RIA DigiDoc configuration update was successful</string>
<string name="configuration_update_failed">Please check your internet connection and network settings</string>
<string name="language_changed">Language changed</string>
<string name="theme_changed">Theme changed</string>
<string name="setting_value_changed">Setting value changed</string>
Expand Down
Loading