Added support for Marshmallow on Android Emulators using new build type that is signed with the platform keystore

Author: jpkrause

README.md

@@ -1,9 +1,14 @@
 # AndroidProxySetter
-An android app that sets the proxy settings for a wifi access point by using adb. 
-This DOES NOT require root and will work with any device that has USB debugging on or any simulator (including Genymotion).
+An android app that sets the proxy settings for a wifi access point by using adb.
+This DOES NOT require root and will work with any device that has USB debugging on or any emulator (including Genymotion).
 
 This app uses the Android Proxy Library from [here](https://github.com/shouldit/android-proxy/tree/master/android-proxy-library)
 
+#NOTE
+This app now works on Android Emulators and Genymotion Emulators on Android Marshmallow 6.0 if you build/install the `emulator` build variant or APK.
+The `emulator` variant is signed with the Android Emulator platform keystore and thus has permissions to modify the wifi access points again.
+The `emulator` apk will only work on emulators, not real devices.
+
 # Usage
 
 Build (or [download](https://github.com/jpkrause/AndroidProxySetter/releases)) and install the apk to your device, then perform the following actions. 

app/build.gradle

@@ -20,27 +20,33 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion '23.0.3'
     defaultConfig {
         applicationId 'tk.elevenk.proxysetter'
         minSdkVersion 15
-        targetSdkVersion 22
-        versionCode 4
-        versionName "0.1.4"
+        targetSdkVersion 24
+        versionCode 5
+        versionName "0.2"
     }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+    signingConfigs {
+        emulatorSystemKeystore {
+            storeFile file("keystore/platform.keystore")
+            keyAlias "platform"
+
+            storePassword "android"
+            keyPassword "android"
         }
     }
-    productFlavors {
+    buildTypes {
+        emulator {
+            signingConfig signingConfigs.emulatorSystemKeystore
+        }
     }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.2.1'
-	compile 'be.shouldit:android-proxy-library:4.2.6'
+    compile fileTree(include: ['*.jar'], dir: 'libs')
+    compile 'com.android.support:appcompat-v7:24.2.0'
+    compile 'be.shouldit:android-proxy-library:4.2.6'
 }

app/keystore/platform.keystore

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2016 John Paul Krause.
+  ~ AndroidManifest.xml is part of AndroidProxySetter.
+  ~
+  ~ AndroidProxySetter is free software: you can redistribute it and/or modify
+  ~ iit under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ AndroidProxySetter 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 AndroidProxySetter.  If not, see <http://www.gnu.org/licenses/>.
+  ~
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="tk.elevek.proxysetter"
+    android:sharedUserId="android.uid.system">
+</manifest>

app/src/emulator/AndroidManifest.xml

@@ -20,38 +20,15 @@
 package tk.elevenk.proxysetter;
 
 import android.app.Activity;
-import android.content.BroadcastReceiver;
-import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-import android.os.AsyncTask;
 import android.os.Bundle;
-import android.os.Looper;
 import android.util.Log;
 import android.widget.Toast;
-import be.shouldit.proxy.lib.APL;
-import be.shouldit.proxy.lib.APLNetworkId;
-import be.shouldit.proxy.lib.WiFiApConfig;
-import be.shouldit.proxy.lib.enums.SecurityType;
-import be.shouldit.proxy.lib.reflection.android.ProxySetting;
-
-import java.util.BitSet;
-import java.util.Map;
-import java.util.concurrent.TimeoutException;
 
 
 public class MainActivity extends Activity {
 
 	private static final String TAG = "ProxySetterApp";
-	private static Activity thisActivity;
-
-	public MainActivity(){
-		thisActivity = this;
-	}
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -80,13 +57,12 @@ private boolean validateIntent(Intent intent) {
 	 *
 	 * @param msg Message to show/log
 	 */
-	public static void showPopup(final String msg) {
-		thisActivity.runOnUiThread(new Runnable() {
+	public void showPopup(final String msg) {
+		this.runOnUiThread(new Runnable() {
 			@Override
 			public void run() {
-				Toast.makeText(thisActivity.getBaseContext(), msg, Toast.LENGTH_SHORT).show();
+				Toast.makeText(getBaseContext(), msg, Toast.LENGTH_SHORT).show();
 				Log.d(TAG, msg);
-
 			}
 		});
 	}

app/src/main/java/tk/elevenk/proxysetter/MainActivity.java

@@ -32,12 +32,12 @@
  */
 public class ProxyChangeAsync extends AsyncTask<Object, String, Void> {
 
-	private Activity activity;
+	private MainActivity activity;
 	private ProxyChangeExecutor executor;
 
 	private static final String TAG = "ProxySetterApp";
 
-	public ProxyChangeAsync(Activity activity) {
+	public ProxyChangeAsync(MainActivity activity) {
 		this.activity = activity;
 	}
 
@@ -47,12 +47,11 @@ protected void onPreExecute() {
 		// init executor and register it to receive wifi state change broadcasts
 		executor = new ProxyChangeExecutor(activity, this);
 		activity.getApplicationContext().registerReceiver(executor, new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
+		onProgressUpdate("Executing proxy change request...");
 	}
 
 	@Override
 	protected Void doInBackground(Object... params) {
-		onProgressUpdate("Executing proxy change request...");
-
 		// Looper is needed to handle broadcast messages
 		try {
 			Looper.prepare();
@@ -68,7 +67,7 @@ protected Void doInBackground(Object... params) {
 	public void onProgressUpdate(String... values) {
 		super.onProgressUpdate(values);
 		final String msg = values[0];
-		MainActivity.showPopup(msg);
+		activity.showPopup(msg);
 	}
 
 	@Override

app/src/main/java/tk/elevenk/proxysetter/ProxyChangeAsync.java

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

build.gradle

@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Tue Aug 23 14:17:23 PDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip