Fix setting default SiVa url

martenrebane · Nov 26, 2024 · aad20fa · aad20fa
1 parent b9454af
commit aad20fa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/MoppApp/MoppApp/SettingsViewController.swift b/MoppApp/MoppApp/SettingsViewController.swift
@@ -115,7 +115,7 @@ class SettingsViewController: MoppViewController {
         CertUtil.removeCertificate(folder: SivaCertViewController.sivaFileFolder, fileName: DefaultsHelper.sivaCertFileName ?? "")
         DefaultsHelper.sivaCertFileName = ""
         DefaultsHelper.sivaAccessState = .defaultAccess
-        DefaultsHelper.sivaUrl = Configuration.getConfiguration().SIVAURL
+        DefaultsHelper.sivaUrl = nil
     }
 
     func resetProxy() {

diff --git a/MoppApp/MoppApp/Signing/SivaCertViewController.swift b/MoppApp/MoppApp/Signing/SivaCertViewController.swift
@@ -172,7 +172,7 @@ class SivaCertViewController: MoppViewController {
             self.useDefaultAccessRadioButton.setSelectedState(state: true)
             self.useManuallyConfiguredAccessRadioButton.setSelectedState(state: false)
             DefaultsHelper.sivaAccessState = .defaultAccess
-            DefaultsHelper.sivaUrl = configuration.SIVAURL
+            DefaultsHelper.sivaUrl = nil
             self.sivaUrlTextField.isEnabled = false
             certificateStackView.isHidden = true
             sivaUrlTextField.textColor = UIColor.lightGray
@@ -324,7 +324,7 @@ extension SivaCertViewController: SettingsCellDelegate {
     func didEndEditingField(_ fieldId: SigningCategoryViewController.FieldId, with value: String) {
         switch fieldId {
         case .sivaCert:
-            DefaultsHelper.sivaUrl = value
+            DefaultsHelper.sivaUrl = DefaultsHelper.sivaUrl.isNilOrEmpty ? nil : value
             break
         default:
             break