Add support for Android 10.

Author: kasnder

README.md

@@ -32,9 +32,6 @@ in Computer Science at the University of Oxford, under the supervision
 of Professor Max van Kleek.
 
 ## Installation / Download
-
-*Supported Android versions: 5.1 to 9. Android 10 is not supported.*
-
 The app can be [downloaded here](https://github.com/OxfordHCC/tracker-control-android/releases).
 
 Alternatively, there exists a [repository for F-Droid](https://apt.izzysoft.de/fdroid/index/apk/net.kollnig.missioncontrol).
@@ -106,6 +103,8 @@ The original data can be retrieved [here](https://osf.io/4nu9e/).
 
 The app uses icons made by [bqlqn](https://www.flaticon.com/authors/bqlqn) from [www.flaticon.com](https://www.flaticon.com/).
 
+For the GDPR requests, the templates from the website [My Data Done Right](https://www.mydatadoneright.eu/) by the NGO "Bits of Freedom" were adopted.
+
 ## License
 This project is licensed under
 [GPLv2](https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).

app/build.gradle

@@ -87,15 +87,14 @@ repositories {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation(name: 'antmonitorlib', ext: 'aar')
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.preference:preference:1.1.0'
-    implementation 'com.google.android.material:material:1.0.0'
 
     implementation 'com.google.guava:guava:28.0-android'
     implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'

app/libs/antmonitorlib.aar

@@ -22,7 +22,6 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
@@ -110,39 +109,29 @@ protected void onCreate (Bundle savedInstanceState) {
 		}
 
 		// Ask for consent to contact Google and other servers
-		SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
+		final SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
 		boolean firstStart = sharedPref.getBoolean(FIRST_START, true);
 
-		final SharedPreferences settingsPref = PreferenceManager
-						.getDefaultSharedPreferences(this);
-
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		if (firstStart && android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+		if (firstStart) {
 			sharedPref.edit().putBoolean(FIRST_START, false).apply();
 
+			AlertDialog.Builder builder = new AlertDialog.Builder(this);
 			builder.setMessage(R.string.confirm_google_info)
 					.setTitle(R.string.external_servers);
 			builder.setPositiveButton(R.string.yes, (dialog, id) -> {
-				settingsPref.edit().putBoolean
+				sharedPref.edit().putBoolean
 						(SettingsActivity.KEY_PREF_GOOGLEPLAY_SWITCH, true).apply();
 				dialog.dismiss();
 			});
 			builder.setNegativeButton(R.string.no, (dialog, id) -> {
 				dialog.dismiss();
 			});
-		} else {
-			builder.setMessage(R.string.android_10_unsupported_explanation)
-					.setTitle(R.string.android_10_unsupported_title);
-			builder.setPositiveButton(R.string.ok, (dialog, id) -> {
-				dialog.dismiss();
-			});
-		}
-		AlertDialog dialog = builder.create();
-		dialog.setCancelable(false); // avoid back button
-		dialog.setCanceledOnTouchOutside(false);
-		dialog.show();
 
-		//throw new RuntimeException("Dying on purpose"); // to test crash reporting
+			AlertDialog dialog = builder.create();
+			dialog.setCancelable(false); // avoid back button
+			dialog.setCanceledOnTouchOutside(false);
+			dialog.show();
+		}
 	}
 
 	/**

app/libs/antmonitorlib.aar

@@ -182,10 +182,14 @@ public void run () {
 				return;
 			}
 
-			String privacyHtml;
+			boolean fetchError = false;
+			String privacyHtml = null;
 			try {
 				privacyHtml = fetch(policyUrl);
 			} catch (Exception e) {
+				fetchError = true;
+			}
+			if (fetchError || privacyHtml == null) {
 				Log.d(TAG, "Fetching of policy from url failed.");
 				onError(policyUrl);
 				return;

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

@@ -17,11 +17,13 @@
 package net.kollnig.missioncontrol.vpn;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
+import android.net.ConnectivityManager;
 import android.util.Log;
 
 import net.kollnig.missioncontrol.data.Database;
-import net.kollnig.missioncontrol.main.AppBlocklistController;
 
+import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 
 import edu.uci.calit2.antmonitor.lib.logging.ConnectionValue;
@@ -31,17 +33,25 @@
 import edu.uci.calit2.antmonitor.lib.util.PacketDumpInfo;
 import edu.uci.calit2.antmonitor.lib.vpn.VpnController;
 
+import static android.os.Process.INVALID_UID;
+import static android.system.OsConstants.IPPROTO_TCP;
+import static android.system.OsConstants.IPPROTO_UDP;
+
 public class OutConsumer extends PacketConsumer {
 	private final String TAG = OutConsumer.class.getSimpleName();
 	private final Context mContext;
-	private final AppBlocklistController appBlocklist;
-	private Database database;
+	private final Database database;
+	private final PackageManager pm;
+
+	ConnectivityManager connectivityManager;
 
 	public OutConsumer (Context c, TrafficType trafficType) {
 		super(c, trafficType, null);
 		database = Database.getInstance(c);
 		mContext = c;
-		appBlocklist = AppBlocklistController.getInstance(c);
+
+		connectivityManager = (ConnectivityManager) c.getSystemService(Context.CONNECTIVITY_SERVICE);
+		pm = c.getPackageManager();
 	}
 
 	static String getHostname (String remoteIp) {
@@ -55,31 +65,44 @@ static String getHostname (String remoteIp) {
 	 */
 	@Override
 	protected void consumePacket (PacketDumpInfo packetDumpInfo) {
-		// Identify sending app
-		ConnectionValue cv = mapPacketToApp(packetDumpInfo);
-		String appname = cv.getAppName();
-		if (appname.startsWith(ConnectionValue.MappingErrors.PREFIX)
-			//		|| (appBlocklist.systemApps.contains(cv.getAppName()))
-		)
-			return;
-
 		// Parse IP packet
 		byte[] packet = packetDumpInfo.getDump();
 		IpDatagram ipDatagram = new IpDatagram(ByteBuffer.wrap(packet));
 
-		// Restrict logging to TCP
-		/*short protocol = ipDatagram.getProtocol();
-		if (protocol != IpDatagram.TCP) return;*/
+		// Identify sending app
+		String appname;
+		if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
+			// Only UDP and TCP are supported
+			short protocol = ipDatagram.getProtocol();
+			if (protocol != IpDatagram.UDP && protocol != IpDatagram.TCP)
+				return;
+
+			int lookupProtocol = (protocol == IpDatagram.TCP) ? IPPROTO_TCP : IPPROTO_UDP;
+
+			InetSocketAddress local = new InetSocketAddress
+					(ipDatagram.getSourceIP(), IpDatagram.readSourcePort(packet));
+			InetSocketAddress remote = new InetSocketAddress
+					(ipDatagram.getDestinationIP(), IpDatagram.readDestinationPort(packet));
+
+			int uid = connectivityManager.getConnectionOwnerUid(lookupProtocol, local, remote);
+			if (uid == INVALID_UID)
+				return;
+
+			appname = getAppName(uid);
+		} else {
+			ConnectionValue cv = mapPacketToApp(packetDumpInfo);
+			appname = cv.getAppName();
+			if (appname.startsWith
+					(ConnectionValue.MappingErrors.PREFIX)) {
+				return;
+			}
+		}
 
 		// Log packet in database
 		String remoteIp = ipDatagram.getDestinationIP().getHostAddress();
 		String hostname = getHostname(remoteIp);
 		if (hostname == null) hostname = remoteIp;
 		database.logPacketAsyncTask(mContext, appname, remoteIp, hostname);
-
-		if (remoteIp.equals("8.8.8.8")) {
-			Log.d(TAG, remoteIp);
-		}
 	}
 
 	/**
@@ -90,4 +113,36 @@ protected void consumePacket (PacketDumpInfo packetDumpInfo) {
 	protected void onStop () {
 
 	}
+
+	/**
+	 * Retrieves the name of the app based on the given uid
+	 *
+	 * @param uid - of the app
+	 * @return the name of the package of the app with the given uid, or "Unknown" if
+	 * no name could be found for the uid.
+	 */
+	public String getAppName (int uid) {
+		/* IMPORTANT NOTE:
+		 * From https://source.android.com/devices/tech/security/ : "The Android
+		 * system assigns a unique user ID (UID) to each Android application and
+		 * runs it as that user in a separate process"
+		 *
+		 * However, there is an exception: "A closer relationship with a shared
+		 * Application Sandbox is allowed via the shared UID feature where two
+		 * or more applications signed with same developer key can declare a
+		 * shared UID in their manifest."
+		 */
+
+		// See if this is root
+		if (uid == 0)
+			return "System";
+
+		// If we can't find a running app, just get a list of packages that map to the uid
+		String[] packages = pm.getPackagesForUid(uid);
+		if (packages != null && packages.length > 0)
+			return packages[0];
+
+		Log.w(TAG, "Process with uid " + uid + " does not appear to be running!");
+		return "Unknown";
+	}
 }

app/src/main/java/net/kollnig/missioncontrol/details/PolicyFragment.java

@@ -155,7 +155,4 @@ Sincerely,]]></string>
     <string name="menu_settings">Settings</string>
 
     <string name="instructions_monitoring">"Interact with your apps to detect some trackers."</string>
-
-    <string name="android_10_unsupported_title">Android 10 unsupported</string>
-    <string name="android_10_unsupported_explanation">Support will be added soon. Monitoring or blocking of trackers does not work in this version.</string>
 </resources>

app/src/main/java/net/kollnig/missioncontrol/vpn/OutConsumer.java

@@ -25,7 +25,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.5.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files