diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2024-12-04 19:10:41 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2024-12-04 19:36:03 +0100 |
| commit | 8defb27d55c74cfce88eb1ec16ba2b380f11927d (patch) | |
| tree | b45ffb3d6a499fb74303b838910e5a444abbdbe0 /main/src/ui/java/de | |
| parent | c569038d15669b9edefddf29ec744255262fc6f2 (diff) | |
Do not save setting if not loaded
closes github issue #1754
closes github issue #1769
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Diffstat (limited to 'main/src/ui/java/de')
3 files changed, 9 insertions, 0 deletions
diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Authentication.kt b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Authentication.kt index 944aa41a..30502582 100644 --- a/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Authentication.kt +++ b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Authentication.kt @@ -102,6 +102,9 @@ class Settings_Authentication : OpenVpnPreferencesFragment(), Preference.OnPrefe } override fun saveSettings() { + if (!this::mExpectTLSCert.isInitialized) { + return; + } mProfile.mExpectTLSCert = mExpectTLSCert.isChecked mProfile.mCheckRemoteCN = mCheckRemoteCN.isChecked mProfile.mRemoteCN = mRemoteCN.cnText diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_IP.kt b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_IP.kt index fef4861b..4b166af0 100644 --- a/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_IP.kt +++ b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_IP.kt @@ -90,6 +90,10 @@ class Settings_IP : OpenVpnPreferencesFragment(), Preference.OnPreferenceChangeL } override fun saveSettings() { + // Since we maybe not have preferences bound yet, check if we actually have them bound. + if (!this::mUsePull.isInitialized) { + return; + } mProfile.mUsePull = mUsePull.isChecked mProfile.mIPv4Address = mIPv4.text mProfile.mIPv6Address = mIPv6.text diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Routing.java b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Routing.java index 6b963bb8..99ba333e 100644 --- a/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Routing.java +++ b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Routing.java @@ -7,6 +7,7 @@ package de.blinkt.openvpn.fragments; import android.os.Build; import android.os.Bundle; +import androidx.lifecycle.Lifecycle; import androidx.preference.CheckBoxPreference; import androidx.preference.EditTextPreference; import androidx.preference.Preference; @@ -53,6 +54,7 @@ public class Settings_Routing extends OpenVpnPreferencesFragment implements Pref getPreferenceScreen().removePreference(mBlockUnusedAF); loadSettings(); + } @Override |