From aad20fae5ea66806d08605565f9ac4ef14108248 Mon Sep 17 00:00:00 2001
From: Marten Rebane <54431068+martenrebane@users.noreply.github.com>
Date: Tue, 26 Nov 2024 18:30:40 +0200
Subject: [PATCH] Fix setting default SiVa url

---
 MoppApp/MoppApp/SettingsViewController.swift         | 2 +-
 MoppApp/MoppApp/Signing/SivaCertViewController.swift | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/MoppApp/MoppApp/SettingsViewController.swift b/MoppApp/MoppApp/SettingsViewController.swift
index 2fb7acd6..fa1bdd8f 100644
--- 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
index 813da2c1..cc68d18d 100644
--- 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