Add settings screen and monitoring of system apps. Clean up.

Author: kasnder

app/build.gradle

@@ -25,8 +25,8 @@ android {
         applicationId 'net.kollnig.missioncontrol'
         minSdkVersion 22
         targetSdkVersion 26
-        versionCode 1
-        versionName "1.0.0-alpha2"
+        versionCode 3
+        versionName "1.0.0-alpha3"
     }
 
     buildTypes {
@@ -93,6 +93,7 @@ dependencies {
     implementation 'com.android.support:support-v4:28.0.0'
     implementation 'com.android.support:cardview-v7:28.0.0'
     implementation 'com.android.support:recyclerview-v7:28.0.0'
+    implementation 'com.android.support:preference-v7:28.0.0'
 
     implementation 'com.google.guava:guava:28.0-android'
     implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'

app/src/main/AndroidManifest.xml

@@ -1,63 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Konrad Kollnig, University of Oxford
-  ~
-  ~ TrackerControl is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 2 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ TrackerControl is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with TrackerControl. If not, see <http://www.gnu.org/licenses/>.
-  -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="net.kollnig.missioncontrol">
 
-<manifest package="net.kollnig.missioncontrol"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/><!--VPN Service-->
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <!--CSV export-->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- VPN Service -->
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
         android:name=".AppWithCrashReporting"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-
-        <activity android:name=".MainActivity"
-                  android:launchMode="singleTop"
-                  android:theme="@style/AppTheme.NoActionBar">
+        <activity
+            android:name=".main.SettingsActivity"
+            android:label="Settings"
+            android:parentActivityName=".MainActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".MainActivity" />
+        </activity>
+        <activity
+            android:name=".MainActivity"
+            android:launchMode="singleTop"
+            android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <intent-filter>
-                <action android:name="edu.uci.calit2.anteater.ACTION.NOTIFICATION"/>
+                <action android:name="edu.uci.calit2.anteater.ACTION.NOTIFICATION" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
+                <action android:name="android.intent.action.VIEW" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".DetailsActivity"
             android:label="@string/title_activity_detail"
             android:parentActivityName=".MainActivity"
             android:theme="@style/AppTheme.NoActionBar">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="net.kollnig.missioncontrol.MainActivity"/>
+                android:value="net.kollnig.missioncontrol.MainActivity" />
         </activity>
-
         <!--
         No UI activity that requests VPN rights.
         If VPN rights can be obtained, the activity initiates a connection attempt
@@ -66,13 +55,13 @@
             android:name=".vpn.VpnStarterActivity"
             android:excludeFromRecents="true"
             android:launchMode="singleTask"
-            android:theme="@android:style/Theme.NoDisplay"/>
+            android:theme="@android:style/Theme.NoDisplay" />
 
         <receiver android:name=".vpn.DeviceBootListener">
 
             <!-- Attempts to reestablish VPN on reboot -->
             <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
 
@@ -83,7 +72,7 @@
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths"/>
+                android:resource="@xml/provider_paths" />
         </provider>
     </application>
 

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

@@ -59,13 +59,13 @@
 public class DetailsActivity extends AppCompatActivity {
 	public static final int MY_PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE = 1;
 	public static PlayStore.AppInfo app = null;
+	public static String consent;
 	private final String TAG = DetailsActivity.class.getSimpleName();
 	Set<OnAppInfoLoadedListener> listeners = new HashSet<>();
 	File exportDir = new File(
 			Environment.getExternalStorageDirectory(), "mission_control");
 	private String appId;
 	private String appName;
-	public static String consent;
 
 	@Override
 	protected void onCreate (Bundle savedInstanceState) {
@@ -79,7 +79,7 @@ protected void onCreate (Bundle savedInstanceState) {
 
 		// Check if consent to contact external servers
 		final SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
-		consent = sharedPref.getString(MainActivity.CONSENT_PREF, MainActivity.CONSENT_NO);
+		consent = sharedPref.getString(MainActivity.FIRST_START, MainActivity.CONSENT_NO);
 
 		// Set up paging
 		DetailsPagesAdapter detailsPagesAdapter =
@@ -105,12 +105,9 @@ protected void onCreate (Bundle savedInstanceState) {
 				@Override
 				public void run () {
 					app = PlayStore.getInfo(appId);
-					runOnUiThread(new Runnable() {
-						@Override
-						public void run () {
-							for (OnAppInfoLoadedListener listener : listeners) {
-								listener.appInfoLoaded();
-							}
+					runOnUiThread(() -> {
+						for (OnAppInfoLoadedListener listener : listeners) {
+							listener.appInfoLoaded();
 						}
 					});
 				}
@@ -131,7 +128,7 @@ public boolean onOptionsItemSelected (MenuItem item) {
 			case android.R.id.home:
 				NavUtils.navigateUpFromSameTask(this);
 				return true;
-			case R.id.menu_option_export_csv:
+			case R.id.action_export_csv:
 				if (hasPermissions()) {
 					exportCsv();
 				}
@@ -274,12 +271,7 @@ protected void onPostExecute (final Boolean success) {
 			// Export successul, ask user to further share file!
 			View v = findViewById(R.id.view_pager);
 			Snackbar s = Snackbar.make(v, R.string.exported, Snackbar.LENGTH_LONG);
-			s.setAction(R.string.share_csv, new View.OnClickListener() {
-				@Override
-				public void onClick (View v) {
-					shareExport();
-				}
-			});
+			s.setAction(R.string.share_csv, v1 -> shareExport());
 			s.setActionTextColor(getResources().getColor(R.color.colorPrimary));
 			s.show();
 		}

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

@@ -19,7 +19,6 @@
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
@@ -41,6 +40,7 @@
 
 import net.kollnig.missioncontrol.main.AppBlocklistController;
 import net.kollnig.missioncontrol.main.AppsFragment;
+import net.kollnig.missioncontrol.main.SettingsActivity;
 import net.kollnig.missioncontrol.vpn.InConsumer;
 import net.kollnig.missioncontrol.vpn.OutConsumer;
 import net.kollnig.missioncontrol.vpn.OutFilter;
@@ -53,10 +53,10 @@
 public class MainActivity extends AppCompatActivity implements AntMonitorActivity,
 		View.OnClickListener {
 	private static final String TAG = MainActivity.class.getSimpleName();
-	private final String APPS_FRAG_TAG = "appsFragTag";
-	public static String CONSENT_PREF = "consent";
+	public static String FIRST_START = "first-start";
 	public static String CONSENT_YES = "yes";
 	public static String CONSENT_NO = "no";
+	private final String APPS_FRAG_TAG = "appsFragTag";
 	SwitchCompat mSwitchMonitoring;
 	Toolbar mToolbar;
 	FragmentManager fm;
@@ -88,46 +88,49 @@ protected void onCreate (Bundle savedInstanceState) {
 
 		// Use click events only, for simplicity, disable swipe
 		mSwitchMonitoring.setOnClickListener(this);
-		mSwitchMonitoring.setOnTouchListener(new View.OnTouchListener() {
-			@Override
-			public boolean onTouch (View v, MotionEvent event) {
-				return event.getActionMasked() == MotionEvent.ACTION_MOVE;
-			}
-		});
+		mSwitchMonitoring.setOnTouchListener((v, event) -> event.getActionMasked() == MotionEvent.ACTION_MOVE);
 
 		// Initialise VPN controller
 		mVpnController = VpnController.getInstance(this);
 		VpnController.setDnsCacheEnabled(true);
 
+		// Initialise default settings (only first app start)
+		android.support.v7.preference.PreferenceManager
+				.setDefaultValues(this, R.xml.preferences, false);
+		final SharedPreferences settingsPref =
+				android.support.v7.preference.PreferenceManager
+						.getDefaultSharedPreferences(this);
+		Boolean showSystemApps = settingsPref.getBoolean
+				(SettingsActivity.KEY_PREF_SYSTEMAPPS_SWITCH, false);
+
 		// Set up the bottom bottomNavigation
 		fm = getSupportFragmentManager();
 		Fragment fApps = fm.findFragmentByTag(APPS_FRAG_TAG);
 		if (fApps != null) {
 			fm.beginTransaction().show(fApps).commit();
 		} else {
-			fm.beginTransaction().add(R.id.main_container, AppsFragment.newInstance(), APPS_FRAG_TAG).commit();
+			fm.beginTransaction().add
+					(R.id.main_container, AppsFragment.newInstance(showSystemApps), APPS_FRAG_TAG)
+					.commit();
 		}
 
 		// Ask for consent to contact Google and other servers
-		final SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
-		final String consent = sharedPref.getString(CONSENT_PREF, null);
+		SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
+		final Boolean firstStart = sharedPref.getBoolean(FIRST_START, true);
+
+		if (firstStart) {
+			sharedPref.edit().putBoolean(FIRST_START, false).apply();
 
-		if (consent == null) {
 			AlertDialog.Builder builder = new AlertDialog.Builder(this);
 			builder.setMessage(R.string.confirm_google_info)
 					.setTitle(R.string.external_servers);
-			builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
-				public void onClick (DialogInterface dialog, int id) {
-					sharedPref.edit().putString(CONSENT_PREF, CONSENT_YES).apply();
-					dialog.dismiss();
-				}
+			builder.setPositiveButton(R.string.yes, (dialog, id) -> {
+				settingsPref.edit().putBoolean
+						(SettingsActivity.KEY_PREF_GOOGLEPLAY_SWITCH, true).apply();
+				dialog.dismiss();
 			});
-			builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
-				@Override
-				public void onClick (DialogInterface dialog, int i) {
-					sharedPref.edit().putString(CONSENT_PREF, CONSENT_NO).apply();
-					dialog.dismiss();
-				}
+			builder.setNegativeButton(R.string.no, (dialog, id) -> {
+				dialog.dismiss();
 			});
 			AlertDialog dialog = builder.create();
 			dialog.setCancelable(false); // avoid back button
@@ -143,12 +146,12 @@ public void onClick (DialogInterface dialog, int i) {
 	 */
 	private void startMonitoring () {
 		// Check if we are connected to the internet
-		if (!mVpnController.isConnectedToInternet()) {
+		/*if (!mVpnController.isConnectedToInternet()) {
 			Toast.makeText(MainActivity.this, R.string.no_service,
 					Toast.LENGTH_LONG).show();
 			updateMonitoringSwitch(true, false);
 			return;
-		}
+		}*/
 
 		// Check if we have VPN rights from the user
 		Intent intent = android.net.VpnService.prepare(MainActivity.this);
@@ -178,6 +181,8 @@ protected void onActivityResult (int request, int result, Intent data) {
 
 				// Connect - triggers onVpnStateChanged
 				mVpnController.connect(null, outFilter, inConsumer, outConsumer);
+
+				Toast.makeText(this, R.string.instructions_monitoring, Toast.LENGTH_SHORT).show();
 			} else {
 				// enable the switch again so user can try again
 				mSwitchMonitoring.setEnabled(true);
@@ -196,11 +201,15 @@ public boolean onCreateOptionsMenu (Menu menu) {
 	@Override
 	public boolean onOptionsItemSelected (MenuItem item) {
 		switch (item.getItemId()) {
-			case R.id.menu_option_about:
+			case R.id.action_about:
 				Uri aboutUri = Uri.parse(getString(R.string.about_url));
 				Intent browserIntent = new Intent(Intent.ACTION_VIEW, aboutUri);
 				startActivity(browserIntent);
 				return true;
+			case R.id.action_settings:
+				Intent intent = new Intent(this, SettingsActivity.class);
+				startActivity(intent);
+				return true;
 		}
 		return super.onOptionsItemSelected(item);
 	}

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

@@ -22,6 +22,7 @@
 public class App implements Comparable<App> {
 	public String name;
 	public String id;
+	public Boolean systemApp;
 	public Integer trackerCount = 0;
 	public Drawable icon;
 

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

@@ -100,17 +100,14 @@ public void onViewCreated (View v, Bundle savedInstanceState) {
 		pbPolicy = v.findViewById(R.id.pbPolicy);
 
 		fab = v.findViewById(R.id.fab);
-		fab.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick (View v) {
-				if (policyUrl == null) {
-					Snackbar.make(v, getString(R.string.policy_loading_error), Snackbar.LENGTH_LONG)
-							.show();
-				} else {
-					// Get URL
-					Intent browserIntent = Common.browse(policyUrl);
-					startActivity(browserIntent);
-				}
+		fab.setOnClickListener(v1 -> {
+			if (policyUrl == null) {
+				Snackbar.make(v1, getString(R.string.policy_loading_error), Snackbar.LENGTH_LONG)
+						.show();
+			} else {
+				// Get URL
+				Intent browserIntent = Common.browse(policyUrl);
+				startActivity(browserIntent);
 			}
 		});
 		fab.setVisibility(View.GONE);