Fix post-Christmas regression fixes

Author: kasnder

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

@@ -790,6 +790,10 @@ public void onReceive(Context context, Intent intent) {
                         adapter.setDisconnected();
                         ivMetered.setVisibility(View.INVISIBLE);
                     }
+                    if (intent.getBooleanExtra(EXTRA_REFRESH, false)) {
+                        updateApplicationList(null);
+                        loadInsightsData();
+                    }
                 } else
                     updateApplicationList(null);
         }

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

@@ -488,6 +488,10 @@ public void onCallStateChanged(int state, String incomingNumber) {
                 if (cmd == Command.start || cmd == Command.reload || cmd == Command.stop) {
                     // Update main view
                     Intent ruleset = new Intent(ActivityMain.ACTION_RULES_CHANGED);
+                    boolean refreshRules = "changed blocking_mode".equals(reason)
+                            || "blocklist changed".equals(reason)
+                            || "hosts file download".equals(reason);
+                    ruleset.putExtra(ActivityMain.EXTRA_REFRESH, refreshRules);
                     ruleset.putExtra(ActivityMain.EXTRA_CONNECTED, cmd == Command.stop ? false : last_connected);
                     ruleset.putExtra(ActivityMain.EXTRA_METERED, cmd == Command.stop ? false : last_metered);
                     LocalBroadcastManager.getInstance(ServiceSinkhole.this).sendBroadcast(ruleset);

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

@@ -30,6 +30,7 @@
 import java.util.Date;
 import java.util.List;
 
+import eu.faircode.netguard.ServiceSinkhole;
 import eu.faircode.netguard.Util;
 
 public class ActivityBlocklists extends AppCompatActivity {
@@ -86,9 +87,16 @@ private void showAddDialog(Blocklist item) {
                         Blocklist newItem = new Blocklist(url, true);
                         manager.addBlocklist(newItem);
                     } else {
+                        if (!url.equals(item.url)) {
+                            item.lastModified = 0;
+                            item.lastDownloadSuccess = true;
+                            item.lastErrorMessage = null;
+                            manager.getBlocklistFile(item.uuid).delete();
+                        }
                         item.url = url;
                         manager.updateBlocklist(item);
                     }
+                    applyBlocklists();
                     adapter.refresh();
                 } catch (MalformedURLException e) {
                     Toast.makeText(ActivityBlocklists.this, R.string.msg_invalid_url, Toast.LENGTH_SHORT).show();
@@ -147,6 +155,7 @@ public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
             holder.switchEnabled.setOnCheckedChangeListener((buttonView, isChecked) -> {
                 item.enabled = isChecked;
                 manager.updateBlocklist(item);
+                applyBlocklists();
             });
 
             // Edit on click
@@ -158,6 +167,7 @@ public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
                         .setMessage(R.string.msg_delete_blocklist_confirm)
                         .setPositiveButton(android.R.string.yes, (dialog, which) -> {
                             manager.removeBlocklist(item.uuid);
+                            applyBlocklists();
                             refresh();
                         })
                         .setNegativeButton(android.R.string.no, null)
@@ -187,4 +197,13 @@ public ViewHolder(View itemView) {
             }
         }
     }
+
+    private void applyBlocklists() {
+        if (!manager.mergeBlocklists()) {
+            Toast.makeText(this, R.string.msg_apply_blocklists_failed, Toast.LENGTH_SHORT).show();
+            return;
+        }
+
+        ServiceSinkhole.reload("blocklist changed", this, false);
+    }
 }

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

@@ -434,7 +434,8 @@ private void finishOnboarding() {
                 .putBoolean("enabled", vpnPrepared)
                 .apply();
 
-        ServiceSinkhole.start("onboarding", this);
+        if (vpnPrepared)
+            ServiceSinkhole.start("onboarding", this);
 
         startActivity(new Intent(this, ActivityMain.class));
         finish();

app/src/main/java/net/kollnig/missioncontrol/data/InsightsDataProvider.kt

@@ -106,7 +106,7 @@ class InsightsDataProvider(context: Context) {
                     uniqueCompanies.add(companyName)
                     appsWithTrackers.add(uid)
 
-                    // Count total trackers contacted (each row = 1 unique host)
+                    // Count tracker hosts seen over the last 7 days.
                     data.totalTrackingAttempts += 1
 
                     // Check if this tracker is currently blocked

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

@@ -630,5 +630,6 @@ Sincerely,\n\n]]></string>
     <string name="title_delete_blocklist">Delete host file</string>
     <string name="msg_delete_blocklist_confirm">Are you sure you want to delete this host file?</string>
     <string name="msg_invalid_url">Invalid URL</string>
+    <string name="msg_apply_blocklists_failed">Failed to apply host files</string>
     <string name="msg_last_update">Last update: %s</string>
 </resources>