Fix bugs, exclude some necessary trackers from blocking.

kasnder · kasnder · commit 9ff64b4f48c5 · 2019-11-21T10:58:50.000Z
diff --git a/app/build.gradle b/app/build.gradle
@@ -25,8 +25,8 @@ android {
         applicationId 'net.kollnig.missioncontrol'
         minSdkVersion 22
         targetSdkVersion 29
-        versionCode 7
-        versionName "1.0.0-alpha6"
+        versionCode 8
+        versionName "1.0.0-alpha7"
     }
 
     buildTypes {
diff --git a/app/src/main/assets/companyDomains.json b/app/src/main/assets/companyDomains.json
@@ -338,7 +338,8 @@
     ],
     "owner_name": "Akamai",
     "root_parent": null,
-    "parent": null
+    "parent": null,
+    "necessary": true
   },
   {
     "country": "us",
@@ -461,7 +462,8 @@
     ],
     "owner_name": "Amazon Web Services",
     "root_parent": "Amazon",
-    "parent": "Amazon"
+    "parent": "Amazon",
+    "necessary": true
   },
   {
     "country": "us",
diff --git a/app/src/main/java/net/kollnig/missioncontrol/Common.java b/app/src/main/java/net/kollnig/missioncontrol/Common.java
@@ -21,6 +21,7 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.ConnectivityManager;
@@ -148,4 +149,16 @@ public static String getAppNameQ (final ByteBuffer packet,
 
 		return getAppName(pm, uid);
 	}
+
+
+	/**
+	 * Check if the {@code FLAG_SYSTEM} or {@code FLAG_UPDATED_SYSTEM_APP} is set for the application.
+	 *
+	 * @param applicationInfo The application to check.
+	 * @return true if the {@code applicationInfo} belongs to a system or updated system application.
+	 */
+	public static boolean isSystemPackage (ApplicationInfo applicationInfo) {
+		return (((applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0)
+				|| (applicationInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0);
+	}
 }
diff --git a/app/src/main/java/net/kollnig/missioncontrol/data/Company.java b/app/src/main/java/net/kollnig/missioncontrol/data/Company.java
@@ -21,11 +21,13 @@ public class Company {
 	public final String country;
 	public final String name;
 	public final String owner;
+	public final Boolean necessary;
 
-	public Company (String country, String name, String owner) {
+	public Company (String country, String name, String owner, Boolean necessary) {
 		this.country = country;
 		this.name = name;
 		this.owner = owner;
+		this.necessary = necessary;
 	}
 
 	public String getOwner () {
diff --git a/app/src/main/java/net/kollnig/missioncontrol/data/Database.java b/app/src/main/java/net/kollnig/missioncontrol/data/Database.java
@@ -69,6 +69,7 @@ public class Database {
 	private static final String COLUMN_TIME = "timestampt";
 	private static final int DATABASE_VERSION = 3;
 	public static Map<String, Company> hostnameToCompany = new ArrayMap<>();
+	public static Set<String> necessaryCompanies = new HashSet<>();
 	private static Database instance;
 	private final SQLHandler sqlHandler;
 	private Set<OnDatabaseClearListener> clearListeners = new HashSet<>();
@@ -468,6 +469,7 @@ public void logPacketAsyncTask (Context context,
 		task.execute();
 	}
 
+
 	public void loadTrackerDomains (Context context) {
 		try {
 			// Read domain list
@@ -489,7 +491,14 @@ public void loadTrackerDomains (Context context) {
 				if (!jsonCompany.isNull("root_parent")) {
 					parent = jsonCompany.getString("root_parent");
 				}
-				company = new Company(country, name, parent);
+				Boolean necessary;
+				if (jsonCompany.has("necessary")) {
+					necessary = jsonCompany.getBoolean("necessary");
+					necessaryCompanies.add(name);
+				} else {
+					necessary = false;
+				}
+				company = new Company(country, name, parent, necessary);
 
 				JSONArray domains = jsonCompany.getJSONArray("doms");
 				for (int j = 0; j < domains.length(); j++) {
diff --git a/app/src/main/java/net/kollnig/missioncontrol/data/Tracker.java b/app/src/main/java/net/kollnig/missioncontrol/data/Tracker.java
@@ -32,7 +32,11 @@ public int compareTo (Tracker o) {
 
 	@Override
 	public String toString () {
-		return name;
+		if (Database.necessaryCompanies.contains(name))
+			return name + " (Unblocked)";
+		else {
+			return name;
+		}
 	}
 
 	public String getOwner () {
diff --git a/app/src/main/java/net/kollnig/missioncontrol/details/TransmissionsFragment.java b/app/src/main/java/net/kollnig/missioncontrol/details/TransmissionsFragment.java
@@ -61,7 +61,7 @@ public static TransmissionsFragment newInstance (String appId) {
 	public void onCreate (Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		Bundle bundle = getArguments();
-		mAppId = getArguments().getString(ARG_APP_ID);
+		mAppId = bundle.getString(ARG_APP_ID);
 	}
 
 	@Override
diff --git a/app/src/main/java/net/kollnig/missioncontrol/details/TransmissionsListAdapter.java b/app/src/main/java/net/kollnig/missioncontrol/details/TransmissionsListAdapter.java
@@ -40,7 +40,7 @@
  * {@link RecyclerView.Adapter} that can display a {@link Tracker}.
  */
 public class TransmissionsListAdapter extends RecyclerView.Adapter<TransmissionsListAdapter.ViewHolder> {
-
+	private final String TAG = TransmissionsListAdapter.class.getSimpleName();
 	private final List<Tracker> mValues;
 	private final RecyclerView recyclerView;
 	private final String mAppId;
@@ -89,7 +89,9 @@ public void onBindViewHolder (final ViewHolder holder, final int position) {
 		holder.mSwitch.setChecked(
 				w.blockedTracker(mAppId, tracker.name)
 		);
-		holder.mSwitch.setOnCheckedChangeListener((v, isChecked) -> {
+		holder.mSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
+			if (!buttonView.isPressed()) return;
+
 			if (isChecked) {
 				if (!w.blockedApp(mAppId)) {
 					w.addToBlocklist(mAppId);
diff --git a/app/src/main/java/net/kollnig/missioncontrol/main/AppBlocklistController.java b/app/src/main/java/net/kollnig/missioncontrol/main/AppBlocklistController.java
@@ -20,6 +20,7 @@
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.graphics.drawable.Drawable;
 
 import net.kollnig.missioncontrol.data.App;
 
@@ -30,18 +31,22 @@
 
 import androidx.preference.PreferenceManager;
 
+import static net.kollnig.missioncontrol.Common.isSystemPackage;
+
 public class AppBlocklistController extends BlocklistController {
 	private static final String SHARED_PREFS_BLOCKLIST_APPS_KEY = "APPS_BLOCKLIST_APPS_KEY";
 	private static AppBlocklistController instance;
-	final PackageManager pm;
+	private final PackageManager pm;
 	private final String ownPackageName;
-	public Set<String> systemApps = new HashSet<>();
+	private final Set<String> systemApps = new HashSet<>();
+	private final Drawable defaultIcon;
 
 	private AppBlocklistController (Context c) {
 		super(c);
 
 		pm = c.getPackageManager();
 		ownPackageName = c.getApplicationContext().getPackageName();
+		defaultIcon = c.getDrawable(android.R.drawable.sym_def_app_icon);
 
 		SharedPreferences settingsPref = PreferenceManager.getDefaultSharedPreferences(c);
 		boolean showSystemApps = settingsPref.getBoolean
@@ -72,7 +77,8 @@ public List<App> load (boolean showSystemApps) {
 		List<ApplicationInfo> appInfos = pm.getInstalledApplications(PackageManager.GET_META_DATA);
 		for (ApplicationInfo appInfo : appInfos) {
 			if (//!BuildConfig.DEBUG &&
-					(isSystemPackage(appInfo) || appInfo.packageName.equals(ownPackageName))) {
+					(isSystemPackage(appInfo)
+							|| appInfo.packageName.equals(ownPackageName))) {
 				if (initialisation) {
 					systemApps.add(appInfo.packageName);
 				}
@@ -82,7 +88,7 @@ public List<App> load (boolean showSystemApps) {
 				App app = new App();
 
 				app.id = appInfo.packageName;
-				app.icon = appInfo.loadIcon(pm);
+				app.icon = (appInfo.icon != 0) ? appInfo.loadIcon(pm) : defaultIcon;
 				app.name = appInfo.loadLabel(pm).toString();
 				app.systemApp = systemApps.contains(appInfo.packageName);
 
@@ -105,15 +111,4 @@ public boolean blockedTracker (String appId, String tracker) {
 	public String getPrefKey () {
 		return SHARED_PREFS_BLOCKLIST_APPS_KEY;
 	}
-
-	/**
-	 * Check if the {@code FLAG_SYSTEM} or {@code FLAG_UPDATED_SYSTEM_APP} is set for the application.
-	 *
-	 * @param applicationInfo The application to check.
-	 * @return true if the {@code applicationInfo} belongs to a system or updated system application.
-	 */
-	public boolean isSystemPackage (ApplicationInfo applicationInfo) {
-		return (((applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0)
-				|| (applicationInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0);
-	}
 }
diff --git a/app/src/main/java/net/kollnig/missioncontrol/main/AppsFragment.java b/app/src/main/java/net/kollnig/missioncontrol/main/AppsFragment.java
@@ -38,6 +38,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 import androidx.preference.PreferenceManager;
@@ -55,11 +56,11 @@ public class AppsFragment extends Fragment implements SwipeRefreshLayout.OnRefre
 		Database.OnDatabaseClearListener {
 
 	private static final String TAG = AppsFragment.class.getSimpleName();
-	AppsListAdapter mAppsListAdapter;
-	RecyclerView mRecyclerView;
-	Database database;
-	SwipeRefreshLayout mSwipeRefreshLayout;
-	ProgressBar pbApps;
+	private AppsListAdapter mAppsListAdapter;
+	private RecyclerView mRecyclerView;
+	private Database database;
+	private SwipeRefreshLayout mSwipeRefreshLayout;
+	private ProgressBar pbApps;
 
 	public AppsFragment () {
 		// Required empty public constructor
@@ -86,7 +87,7 @@ public static void savePrefs (Context c) {
 		editor.apply();
 	}
 
-	SharedPreferences settingsPref;
+	private SharedPreferences settingsPref;
 
 	@Override
 	public void onCreate (Bundle savedInstanceState) {
@@ -98,7 +99,7 @@ public void onCreate (Bundle savedInstanceState) {
 	}
 
 	@Override
-	public void onCreateOptionsMenu (Menu menu, MenuInflater inflater) {
+	public void onCreateOptionsMenu (@NonNull Menu menu, @NonNull MenuInflater inflater) {
 		super.onCreateOptionsMenu(menu, inflater);
 		//inflater.inflate(R.menu.menu_main, menu);
 	}
@@ -140,7 +141,7 @@ public View onCreateView (LayoutInflater inflater, ViewGroup container,
 	}
 
 	@Override
-	public void onViewCreated (View view, Bundle savedInstanceState) {
+	public void onViewCreated (@NonNull View view, Bundle savedInstanceState) {
 		super.onViewCreated(view, savedInstanceState);
 
 		mAppsListAdapter = new AppsListAdapter(this);
@@ -177,7 +178,7 @@ public void onDetach () {
 		database.removeListener(this);
 	}
 
-	public void updateUI (List<App> installedApps) {
+	private void updateUI (List<App> installedApps) {
 		mAppsListAdapter.setAppsList(installedApps);
 		mAppsListAdapter.notifyDataSetChanged();
 		mRecyclerView.scrollToPosition(0);
@@ -187,7 +188,7 @@ public void updateUI (List<App> installedApps) {
 		pbApps.setVisibility(View.GONE);
 	}
 
-	void refreshApps () {
+	private void refreshApps () {
 		boolean mShowSystemApps = settingsPref.getBoolean
 				(SettingsActivity.KEY_PREF_SYSTEMAPPS_SWITCH, false);
 		(new AppsRefreshTask(this, mShowSystemApps)).execute();
@@ -218,7 +219,6 @@ static class AppsRefreshTask extends AsyncTask<Void, Void, Boolean> {
 
 		@Override
 		protected Boolean doInBackground (Void... voids) {
-
 			installedApps = appBlocklistController.load(mShowSystemApps);
 			Map<String, Integer> trackerCounts = database.getApps();
 
diff --git a/app/src/main/java/net/kollnig/missioncontrol/main/AppsListAdapter.java b/app/src/main/java/net/kollnig/missioncontrol/main/AppsListAdapter.java
@@ -120,6 +120,8 @@ public void onBindViewHolder (final RecyclerView.ViewHolder h, final int pos) {
 
 			holder.getSwitch().setChecked(w.blockedApp(app.id));
 			holder.getSwitch().setOnCheckedChangeListener((buttonView, isChecked) -> {
+				if (!buttonView.isPressed()) return;
+
 				if (isChecked) {
 					w.addToBlocklist(app.id);
 				} else {
@@ -140,6 +142,8 @@ public void onBindViewHolder (final RecyclerView.ViewHolder h, final int pos) {
 
 			holder.getSwitch().setChecked(w.getBlockedCount() == mAppList.size());
 			holder.getSwitch().setOnCheckedChangeListener((buttonView, isChecked) -> {
+				if (!buttonView.isPressed()) return;
+
 				if (isChecked) {
 					BlockingConfirmDialog bd =
 							new BlockingConfirmDialog(mFragment.getContext(), w, switchBlockAll) {
diff --git a/app/src/main/java/net/kollnig/missioncontrol/main/BlockingConfirmDialog.java b/app/src/main/java/net/kollnig/missioncontrol/main/BlockingConfirmDialog.java
@@ -18,10 +18,8 @@
 package net.kollnig.missioncontrol.main;
 
 import android.content.Context;
-import android.content.Intent;
 import android.widget.Switch;
 
-import net.kollnig.missioncontrol.Common;
 import net.kollnig.missioncontrol.R;
 
 import androidx.appcompat.app.AlertDialog;
@@ -38,31 +36,20 @@ abstract class BlockingConfirmDialog {
 	}
 
 	void confirmBlocking () {
-		// Check if user has ad settings
-		final boolean hasAdSettings = Common.hasAdSettings(c);
-		final Intent adIntent = Common.adSettings();
-
 		String message;
-		if (hasAdSettings) {
-			message = c.getString(R.string.confirm_blocking_has_playservices);
-		} else {
-			message = c.getString(R.string.confirm_blocking_no_playservices);
-		}
+		message = c.getString(R.string.confirm_blocking);
 
 		// Show dialog
 		AlertDialog.Builder builder = new AlertDialog.Builder(c);
 		builder.setMessage(message)
 				.setTitle(R.string.confirm_blocking_title);
 		builder.setPositiveButton(R.string.yes, (dialog, id) -> {
-			if (hasAdSettings) {
-				c.startActivity(adIntent);
-			}
-			switchBlockAll.setChecked(false);
-		});
-		builder.setNegativeButton(R.string.no, (dialog, i) -> {
 			blockAll();
 			switchBlockAll.setChecked(true);
 		});
+		builder.setNegativeButton(R.string.no, (dialog, i) -> {
+			switchBlockAll.setChecked(false);
+		});
 		AlertDialog dialog = builder.create();
 		dialog.show();
 	}
diff --git a/app/src/main/java/net/kollnig/missioncontrol/main/BlocklistController.java b/app/src/main/java/net/kollnig/missioncontrol/main/BlocklistController.java
@@ -27,8 +27,6 @@
 
 public abstract class BlocklistController {
 	final static String PREF_BLOCKLIST = "blocklist";
-	// Concurrent HashSet
-	//Set<String> blocklist = Collections.newSetFromMap(new ConcurrentHashMap<String, Boolean>());
 
 	/**
 	 * Whilst blockmap is a list of apps to block, the set is a set of trackers not to block.
diff --git a/app/src/main/java/net/kollnig/missioncontrol/vpn/OutFilter.java b/app/src/main/java/net/kollnig/missioncontrol/vpn/OutFilter.java
@@ -65,7 +65,7 @@ public PacketAnnotation acceptIPDatagram (final ByteBuffer packet) {
 			return ALLOW;
 
 		Company tracker = Database.getCompany(hostname);
-		if (tracker == null)
+		if (tracker == null || tracker.necessary)
 			return ALLOW;
 
 		// Identify sending app
@@ -80,9 +80,8 @@ public PacketAnnotation acceptIPDatagram (final ByteBuffer packet) {
 			return ALLOW;
 
 		if (appBlocklist.blockedApp(appname)
-				&& appBlocklist.blockedTracker(appname, tracker.getRoot())
-		) {
-			database.logPacketAsyncTask(mContext, appname, remoteIp, hostname);
+				&& appBlocklist.blockedTracker(appname, tracker.getRoot())) {
+			database.logPacketAsyncTask(mContext, appname, remoteIp, hostname); // log despite blocking
 			return BLOCK;
 		}
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public static TransmissionsFragment newInstance (String appId) {`
`61`	`61`	`public void onCreate (Bundle savedInstanceState) {`
`62`	`62`	`super.onCreate(savedInstanceState);`
`63`	`63`	`Bundle bundle = getArguments();`
`64`		`- mAppId = getArguments().getString(ARG_APP_ID);`
	`64`	`+ mAppId = bundle.getString(ARG_APP_ID);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`@Override`