diff --git a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java index c91e8751..fb37ad1a 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java +++ b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java @@ -71,6 +71,7 @@ import androidx.work.PeriodicWorkRequest; import androidx.work.WorkManager; +import net.kollnig.missioncontrol.ActivityOnboarding; import net.kollnig.missioncontrol.BuildConfig; import net.kollnig.missioncontrol.R; import net.kollnig.missioncontrol.data.BlockingMode; @@ -355,6 +356,16 @@ public boolean onPreferenceClick(Preference preference) { }); } + // Handle reintroduction + Preference pref_restart_intro = screen.findPreference("reintroduction"); + if (pref_restart_intro != null) { + pref_restart_intro.setOnPreferenceClickListener(preference -> { + startActivity(new Intent(ActivitySettings.this, + ActivityOnboarding.class)); + return true; + }); + } + // Hosts file settings if (cat_advanced != null) { Preference pref_use_hosts = screen.findPreference("use_hosts"); @@ -740,7 +751,7 @@ else if ("vpn4".equals(name)) { ServiceSinkhole.reload("changed " + name, this, false); } else if ("validate".equals(name)) { - String host = prefs.getString(name, "www.f-droid.org"); + String host = prefs.getString(name, "wpref_ww.f-droid.org"); try { checkDomain(host); prefs.edit().putString(name, host.trim()).apply(); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1ae4c3b8..d9c57c4c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -151,6 +151,8 @@ Backup Export settings Import settings + Help + Restart introduction Import hosts file Import hosts file (append) Hosts file URL @@ -168,6 +170,7 @@ Allow apps to connect to local area network addresses, like 10.0.0.0/8, 172.16.0.0/12 and 192.168.0.0/16 Route IP version 6 traffic to TrackerControl so it can selectively be allowed or blocked Disable TrackerControl on incoming or outgoing telephone call. This can be used to work around IP/Wi-Fi calling problems. + View the getting started guide again Show system apps in the app list Disable to decrease battery usage. New trackers will still be blocked, but not shown. diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index b5d1dfb6..528a3ec3 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -32,6 +32,15 @@ android:title="@string/setting_import" /> + + + + @@ -258,6 +267,5 @@ android:title="@string/setting_ip6" /> -