diff --git a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java index fb109345..f99165f1 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java +++ b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java @@ -175,6 +175,12 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere pref_wifi_homes.setEntryValues(listSSID.toArray(new CharSequence[0])); } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + TwoStatePreference pref_handover = + (TwoStatePreference) screen.findPreference("handover"); + cat_advanced.removePreference(pref_handover); + } + Preference pref_reset_usage = screen.findPreference("reset_usage"); pref_reset_usage.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { @Override diff --git a/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java b/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java index 66e71d61..fb2d827a 100644 --- a/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java +++ b/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java @@ -569,6 +569,8 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS last_builder = builder; boolean handover = prefs.getBoolean("handover", false); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) + handover = false; Log.i(TAG, "VPN restart handover=" + handover); if (handover) {