Merge branch 'master' of github.com:TrackerControl/tracker-control-android

Author: kasnder

app/src/main/java/eu/faircode/netguard/ActivityMain.java

@@ -153,7 +153,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // Check Onboarding
         SharedPreferences prefsOnboarding = PreferenceManager.getDefaultSharedPreferences(this);
-        if (!prefsOnboarding.getBoolean("onboarding_complete", false)) {
+        if (prefsOnboarding.getInt("onboarding_version", 0) < ActivityOnboarding.ONBOARDING_VERSION) {
             super.onCreate(savedInstanceState);
             startActivity(new Intent(this, ActivityOnboarding.class));
             finish();
@@ -519,7 +519,7 @@ public void onDestroy() {
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         if (Build.VERSION.SDK_INT < MIN_SDK || Util.hasXposed(this) || !Util.canFilter(this)
-                || !prefs.getBoolean("onboarding_complete", false)) {
+                || prefs.getInt("onboarding_version", 0) < ActivityOnboarding.ONBOARDING_VERSION) {
             super.onDestroy();
             return;
         }

app/src/main/java/eu/faircode/netguard/ApplicationEx.java

@@ -119,8 +119,18 @@ public void onCreate() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
             createNotificationChannels();
 
-        // Migrate old strict_blocking pref to blocking_mode
+        // Migrate onboarding_complete boolean to onboarding_version int
         android.content.SharedPreferences prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(this);
+        if (prefs.contains("onboarding_complete") && !prefs.contains("onboarding_version")) {
+            boolean completed = prefs.getBoolean("onboarding_complete", false);
+            prefs.edit()
+                    .remove("onboarding_complete")
+                    .putInt("onboarding_version", completed ? 1 : 0)
+                    .apply();
+            Log.i(TAG, "Migrated onboarding_complete=" + completed + " -> onboarding_version=" + (completed ? 1 : 0));
+        }
+
+        // Migrate old strict_blocking pref to blocking_mode
         if (!prefs.contains(BlockingMode.PREF_BLOCKING_MODE)) {
             String migratedMode = BlockingMode.getDefaultMode();
 

app/src/main/java/net/kollnig/missioncontrol/ActivityOnboarding.java

@@ -33,6 +33,13 @@
 
 public class ActivityOnboarding extends AppCompatActivity {
 
+    /**
+     * Bump this to re-trigger onboarding for existing users.
+     * 1 = original onboarding (pre-2026 Q2)
+     * 2 = blocking modes, SNI privacy fix, performance improvements
+     */
+    public static final int ONBOARDING_VERSION = 2;
+
     private ViewPager2 viewPager;
     private Button btnNext;
     private Button btnPrevious;
@@ -119,20 +126,17 @@ private void setupSlides() {
                 null,
                 null));
 
-        // 1b. What's New (for returning users only, shown once)
+        // 1b. What's New (for returning users who haven't seen the latest onboarding)
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        int oldVersion = prefs.getInt("version", -1);
-        boolean hasSeenWhatsNew = prefs.getBoolean("whatsnew_seen_2026", false);
-        if (oldVersion != -1 && !hasSeenWhatsNew) {
+        int seenVersion = prefs.getInt("onboarding_version", 0);
+        if (seenVersion > 0 && seenVersion < ONBOARDING_VERSION) {
             slides.add(new Slide(
                     R.string.onboarding_whatsnew_title,
                     getText(R.string.onboarding_whatsnew_title),
                     getText(R.string.onboarding_whatsnew_desc),
                     R.drawable.ic_rocket2,
                     null,
                     null));
-            // Mark as seen
-            prefs.edit().putBoolean("whatsnew_seen_2026", true).apply();
         }
 
         // 2. Blocking Mode Selection
@@ -426,7 +430,7 @@ private void finishOnboarding() {
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         prefs.edit()
-                .putBoolean("onboarding_complete", true)
+                .putInt("onboarding_version", ONBOARDING_VERSION)
                 .putBoolean("enabled", vpnPrepared)
                 .apply();
 

app/src/main/java/net/kollnig/missioncontrol/data/BlockingMode.java

@@ -78,14 +78,11 @@ public static boolean isStrictMode(Context c) {
     }
 
     /**
-     * Get the default blocking mode based on build flavor.
-     * TC Slim (play flavor) defaults to minimal mode.
+     * Get the default blocking mode for new users.
+     * Minimal is the safest default — least app breakage.
      */
     public static String getDefaultMode() {
-        if (Util.isPlayStoreInstall()) {
-            return MODE_MINIMAL;
-        }
-        return MODE_STANDARD;
+        return MODE_MINIMAL;
     }
 
     /**

app/src/main/res/values/strings.xml

@@ -456,21 +456,21 @@ Sincerely,\n\n]]></string>
     <string name="summary_sni_enabled">Extract hostnames from TLS connections for more accurate tracker detection. Warning: this leaks your IP address to tracker servers. Only enable for research.</string>
 
     <string name="setting_blocking_mode">Blocking Mode</string>
-    <string name="summary_blocking_mode_minimal">Minimal: Only blocks trackers from the DuckDuckGo list that are safe to block. Browsers and known incompatible apps are automatically excluded. Fewest app issues.</string>
-    <string name="summary_blocking_mode_standard">Standard: Blocks all known trackers from multiple lists (X-Ray, Disconnect, DuckDuckGo). Essential services (e.g. content delivery) are allowed. Good balance of privacy and compatibility.</string>
-    <string name="summary_blocking_mode_strict">Strict: Blocks all known trackers including essential services and ambiguous shared-IP domains. Maximum privacy but some apps may break.</string>
+    <string name="summary_blocking_mode_minimal">Minimal: Only blocks trackers from the DuckDuckGo list that are safe to block. Browsers and known incompatible apps are automatically excluded. Limited app breakage.</string>
+    <string name="summary_blocking_mode_standard">Standard: Blocks all known trackers from multiple lists (X-Ray, Disconnect, DuckDuckGo). Essential services are allowed. Some apps will break and may need to be manually excluded (see Troubleshooting in the app menu).</string>
+    <string name="summary_blocking_mode_strict">Strict: Blocks all known trackers including essential services and ambiguous shared-IP domains. Many apps will break and need to be manually excluded (see Troubleshooting in the app menu).</string>
     <string name="blocking_mode_minimal">Minimal</string>
     <string name="blocking_mode_standard">Standard</string>
     <string name="blocking_mode_strict">Strict</string>
 
     <string name="onboarding_blockingmode_title">Choose Blocking Mode</string>
-    <string name="onboarding_blockingmode_desc">How aggressively should TrackerControl block trackers? You can change this later in Settings.</string>
+    <string name="onboarding_blockingmode_desc">How aggressively should TrackerControl block trackers? Higher modes block more but will require you to manually exclude some apps. You can change this later in Settings, and find help under Troubleshooting in the app menu.</string>
     <string name="onboarding_blockingmode_minimal_label">Minimal</string>
-    <string name="onboarding_blockingmode_minimal_desc">Blocks only confirmed trackers that are safe to block. Fewest app issues. Good for most users.</string>
-    <string name="onboarding_blockingmode_standard_label">Standard (Recommended)</string>
-    <string name="onboarding_blockingmode_standard_desc">Blocks all known trackers from multiple lists. Essential services are allowed. Good balance of privacy and compatibility.</string>
+    <string name="onboarding_blockingmode_minimal_desc">Blocks only confirmed trackers that are safe to block. Limited app breakage. Good for most users.</string>
+    <string name="onboarding_blockingmode_standard_label">Standard</string>
+    <string name="onboarding_blockingmode_standard_desc">Blocks all known trackers from multiple lists. Some apps will break and need to be manually excluded.</string>
     <string name="onboarding_blockingmode_strict_label">Strict</string>
-    <string name="onboarding_blockingmode_strict_desc">Blocks everything including essential services and ambiguous domains. Maximum privacy but some apps may break.</string>
+    <string name="onboarding_blockingmode_strict_desc">Blocks everything including essential services and ambiguous domains. Significant app breakage — many apps will need to be manually excluded.</string>
 
     <string name="exclude_vpn" translatable="false">Tracker Protection</string>
     <string name="exclude_vpn_explanation">Detects and blocks trackers for this app.</string>
@@ -619,8 +619,8 @@ Sincerely,\n\n]]></string>
     <string name="insights_see_more">See More →</string>
 
     <!-- What's New onboarding slide (not translated) -->
-    <string name="onboarding_whatsnew_title" translatable="false">Major update ahead!</string>
-    <string name="onboarding_whatsnew_desc" translatable="false">• New Insights: View statistics on blocked trackers and tracking companies, directly from the main screen.\n• DuckDuckGo Tracker Radar: Added mobile-specific tracker detection for even better coverage.\n• Secure DNS: Added support for Encrypted DNS (DoH) for better privacy.\n• Enhanced Blocking: Support for multiple blocklists and auto-updates.\n• Simpler Settings: \"Monitor\" is now \"Exclude from VPN\" for clarity.\n• Performance: 50% smaller app size, faster startup, and improved battery life.\n• Revamped Analysis: Faster and cleaner tracker library scanner.\n• Improved Stability: Fixed bugs, crashes, and improved backups.</string>
+    <string name="onboarding_whatsnew_title" translatable="false">What\'s New</string>
+    <string name="onboarding_whatsnew_desc" translatable="false">• Blocking Modes: Choose between Minimal, Standard, or Strict blocking to balance privacy and app compatibility.\n• Minimal Mode: DuckDuckGo-compatible blocking that avoids app breakage. Browsers and known incompatible apps are automatically excluded.\n• Privacy Fix: SNI extraction is now off by default — it was leaking your IP address to tracker servers.\n• Improved Performance: Faster scrolling, reduced memory usage, and better battery life.\n• Troubleshooting: New troubleshooting screen in settings to diagnose common issues.\n• Better Tracker Detection: Improved handling of shared IPs and DNS-cloaked trackers.</string>
 
     <string name="title_blocklists">Additional host files</string>
     <string name="summary_manage_blocklists">These are only for fallback. TrackerControl includes its own host lists that give insights on the companies behind tracking.</string>