Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 37 additions & 1 deletion RIADigiDoc/Supporting files/Localizable.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,42 @@
}
}
},
"Configuration update successful" : {
"comment" : "In Diagnostics view when configuration check and update were successful",
"extractionState" : "manual",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "RIA DigiDoc configuration update was successful"
}
},
"et" : {
"stringUnit" : {
"state" : "translated",
"value" : "RIA DigiDoci konfiguratsiooni värskendamine õnnestus"
}
}
}
},
"Configuration update unsuccessful" : {
"comment" : "In Diagnostics view when configuration check or update was unsuccessful",
"extractionState" : "manual",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Please check your internet connection and network settings"
}
},
"et" : {
"stringUnit" : {
"state" : "translated",
"value" : "Palun kontrolli internetiühendust ja võrgu sätteid"
}
}
}
},
"Confirm container removal" : {
"comment" : "Recent documents remove container accessibility confirm button",
"extractionState" : "manual",
Expand Down Expand Up @@ -3539,7 +3575,7 @@
"et" : {
"stringUnit" : {
"state" : "translated",
"value" : "RIA DigiDoc äpi kohta"
"value" : "RIA DigiDoci äpi kohta"
}
}
}
Expand Down
23 changes: 14 additions & 9 deletions RIADigiDoc/UI/Component/DiagnosticsView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -170,15 +170,20 @@ struct DiagnosticsView: View {

private func onCheckUpdateClick() {
Task {
let status = await viewModel.updateConfiguration()
if !status {
let message = languageSettings.localized("No Internet connection")
if voiceOverEnabled {
var saveButtonAccessibilityAnnouncement = AttributedString(message)
saveButtonAccessibilityAnnouncement.accessibilitySpeechAnnouncementPriority = .high
AccessibilityNotification.Announcement(saveButtonAccessibilityAnnouncement).post()
}
Toast.show(message)
let isUpdated = await viewModel.updateConfiguration()

let messageKey = isUpdated ?
"Configuration update successful" :
"Configuration update unsuccessful"

let updateMessage = languageSettings.localized(messageKey)

Toast.show(updateMessage)

if voiceOverEnabled {
var saveButtonAccessibilityAnnouncement = AttributedString(updateMessage)
saveButtonAccessibilityAnnouncement.accessibilitySpeechAnnouncementPriority = .high
AccessibilityNotification.Announcement(saveButtonAccessibilityAnnouncement).post()
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions RIADigiDoc/ViewModel/DiagnosticsViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,11 @@ class DiagnosticsViewModel: DiagnosticsViewModelProtocol, Loggable {
proxyInfo: proxyInfo,
userAgent: userAgent
)
DiagnosticsViewModel.logger().info("Configuration updated successfully")
return true
} catch let error as URLError where error.code == .resourceUnavailable {
DiagnosticsViewModel.logger().error("Unable to update configuration. No Internet connection. \(error)")
return false
} catch {
DiagnosticsViewModel.logger().error("Unable to update configuration: \(error)")
return false
Expand Down