Merge pull request #173 from joebowbeer/patch-1

Update android.html
This commit is contained in:
Maximilian Hils 2013-10-22 05:23:25 -07:00
commit f63380a04e

View File

@ -1,4 +1,3 @@
The proxy situation on Android is [an The proxy situation on Android is [an
embarrasment](http://code.google.com/p/android/issues/detail?id=1273). It's embarrasment](http://code.google.com/p/android/issues/detail?id=1273). It's
scarcely credible, but Android didn't have a global proxy setting at all until scarcely credible, but Android didn't have a global proxy setting at all until
@ -15,12 +14,12 @@ below - your device may differ, but the broad process should be similar.
## Getting the certificate onto the device ## Getting the certificate onto the device
First we need to get the __mitmproxy-ca-cert.cer__ file into the First we need to get the __mitmproxy-ca-cert.cer__ file into the
__/sdcard/Downloads__ folder on the device. There are a number of ways to do __/sdcard/Download__ folder on the device. There are a number of ways to do
this. If you have the Android Developer Tools installed, you can use [__adb this. If you have the Android Developer Tools installed, you can use [__adb
push__](http://developer.android.com/tools/help/adb.html) to accomplish this. push__](http://developer.android.com/tools/help/adb.html) to accomplish this.
Depending on your device, you could also transfer the file using external media Depending on your device, you could also transfer the file using external media
like an SD Card. In this example, we're using wget from within a terminal like an SD Card. In this example, we're using wget from within a terminal
emulator to transfer the certificate from a local HTTP server: emulator to transfer the certificate from a local HTTP server:
<img src="android-shellwgetmitmproxyca.png"/> <img src="android-shellwgetmitmproxyca.png"/>
@ -33,7 +32,7 @@ and select "Install from storage":
<img src="android-settingssecuritymenu.png"/> <img src="android-settingssecuritymenu.png"/>
The certificate in /sdcard/Downloads is automatically located and offered for The certificate in /sdcard/Download is automatically located and offered for
installation. Installing the cert will delete the download file from the local installation. Installing the cert will delete the download file from the local
disk: disk: