summaryrefslogtreecommitdiff
path: root/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_IP.kt
diff options
context:
space:
mode:
Diffstat (limited to 'main/src/ui/java/de/blinkt/openvpn/fragments/Settings_IP.kt')
-rw-r--r--main/src/ui/java/de/blinkt/openvpn/fragments/Settings_IP.kt18
1 files changed, 17 insertions, 1 deletions
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 27e6854f..ef69f3f4 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
@@ -5,6 +5,7 @@
package de.blinkt.openvpn.fragments
import android.os.Bundle
+import android.view.View
import androidx.preference.*
import de.blinkt.openvpn.R
import de.blinkt.openvpn.fragments.OpenVpnPreferencesFragment
@@ -33,6 +34,22 @@ class Settings_IP : OpenVpnPreferencesFragment(), Preference.OnPreferenceChangeL
// Load the preferences from an XML resource
addPreferencesFromResource(R.xml.vpn_ipsettings)
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ /* Bind the preferences early to avoid loadingSetting which is called
+ * from the superclass to access an uninitialised earlyinit property
+ */
+ super.onViewCreated(view, savedInstanceState)
+ }
+
+ override fun onBindPreferences() {
+ super.onBindPreferences()
+ bindPreferences()
+ loadSettings()
+ }
+
+ private fun bindPreferences() {
mIPv4 = findPreference("ipv4_address")!!
mIPv6 = findPreference("ipv6_address")!!
mUsePull = findPreference("usePull")!!
@@ -45,7 +62,6 @@ class Settings_IP : OpenVpnPreferencesFragment(), Preference.OnPreferenceChangeL
mNobind = findPreference("nobind")!!
mUsePull.onPreferenceChangeListener = this
mOverrideDNS.onPreferenceChangeListener = this
- loadSettings()
}