From 017fa17bb823698c02118e95f1fc501f0a12182d Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Fri, 9 Aug 2024 16:48:35 +0200
Subject: [PATCH] fix lateinit crashes in settings

---
 .../blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java | 5 ++++-
 .../de/blinkt/openvpn/fragments/Settings_Authentication.kt   | 3 +++
 main/src/ui/java/de/blinkt/openvpn/fragments/Settings_IP.kt  | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java b/main/src/ui/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java
index 802e0b497..0b2ebde20 100644
--- a/main/src/ui/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java
@@ -52,7 +52,10 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     @Override
 	public void onSaveInstanceState (Bundle outState) {
 		super.onSaveInstanceState(outState);
-		saveSettings();
+		if (getView() != null) {
+			//if we have no view, there is no point in trying to save anything.
+			saveSettings();
+		}
 		outState.putString(VpnProfile.EXTRA_PROFILEUUID, mProfile.getUUIDString());
 	}
 }
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 51a4e2e38..944aa41a7 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
@@ -69,6 +69,9 @@ class Settings_Authentication : OpenVpnPreferencesFragment(), Preference.OnPrefe
     }
 
     override fun loadSettings() {
+        if (!this::mExpectTLSCert.isInitialized) {
+            return;
+        }
         mExpectTLSCert.isChecked = mProfile.mExpectTLSCert
         mCheckRemoteCN.isChecked = mProfile.mCheckRemoteCN
         mRemoteCN.setDN(mProfile.mRemoteCN)
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 ef69f3f4e..fef4861b1 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
@@ -66,6 +66,10 @@ class Settings_IP : OpenVpnPreferencesFragment(), Preference.OnPreferenceChangeL
 
 
     override fun loadSettings() {
+        // Since we maybe not have preferences bound yet, check if we actually have them bound.
+        if (!this::mUsePull.isInitialized) {
+            return;
+        }
         if (mProfile.mAuthenticationType == VpnProfile.TYPE_STATICKEYS) mUsePull.isEnabled =
             false else mUsePull.isChecked = mProfile.mUsePull
         mIPv4.text = mProfile.mIPv4Address