diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2013-12-08 01:44:09 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2013-12-08 01:44:09 +0100 |
| commit | 594e61c64780e4dd0bd91feab3a3afe56c4dbb2e (patch) | |
| tree | 2cc44bd19e40f3e903541e007fde320c32617427 | |
| parent | 2956c144d30558141ec43bec798a424974ffa6f1 (diff) | |
| parent | 948d4c0445f006640d08d96dc3d6e604df78bc99 (diff) | |
| download | mitmproxy-594e61c64780e4dd0bd91feab3a3afe56c4dbb2e.tar.gz mitmproxy-594e61c64780e4dd0bd91feab3a3afe56c4dbb2e.tar.bz2 mitmproxy-594e61c64780e4dd0bd91feab3a3afe56c4dbb2e.zip | |
Merge branch 'master' into 0.10
| -rw-r--r-- | doc-src/certinstall/android.html | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/doc-src/certinstall/android.html b/doc-src/certinstall/android.html index e4efec1d..f215d91d 100644 --- a/doc-src/certinstall/android.html +++ b/doc-src/certinstall/android.html @@ -1,4 +1,3 @@ - The proxy situation on Android is [an 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 @@ -15,12 +14,12 @@ below - your device may differ, but the broad process should be similar. ## Getting the certificate onto the device 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 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 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"/> @@ -33,7 +32,7 @@ and select "Install from storage": <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 disk: |