From 1a465e1f636553771e2509e8dd0c763e6095b60f Mon Sep 17 00:00:00 2001
From: Chris Athanas <realityexpander@gmail.com>
Date: Mon, 14 May 2018 03:47:59 -0500
Subject: [PATCH] Add support for debugging with Charles Proxy

---
 app/src/main/AndroidManifest.xml              |  1 +
 .../alamohunt/AutocompleteAdapter.java        |  2 +-
 .../alamohunt/PlacePickerActivity.java        |  1 -
 .../alamohunt/PlacePickerAdapter.java         |  1 -
 app/src/main/res/layout/activity_main.xml     |  2 +-
 .../res/raw/charles_ssl_proxying_certificate  | 26 +++++++++++++++++++
 .../main/res/xml/network_security_config.xml  | 13 ++++++++++
 7 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/raw/charles_ssl_proxying_certificate
 create mode 100644 app/src/main/res/xml/network_security_config.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 37abc1b..718f60d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/AppTheme">
         <activity android:name=".MainActivity">
             <intent-filter>
diff --git a/app/src/main/java/com/realityexpander/alamohunt/AutocompleteAdapter.java b/app/src/main/java/com/realityexpander/alamohunt/AutocompleteAdapter.java
index 9b1c018..0612bb5 100644
--- a/app/src/main/java/com/realityexpander/alamohunt/AutocompleteAdapter.java
+++ b/app/src/main/java/com/realityexpander/alamohunt/AutocompleteAdapter.java
@@ -147,8 +147,8 @@ private ArrayList<Venue> findVenues(String searchString) {
 
             if(response.body() == null) {
                 try {
+                    // Get the error message from Foursquare server
                     JSONObject jObjError = new JSONObject(response.errorBody().string());
-
                     Toast.makeText(mContext, ((JSONObject)jObjError.get("meta")).getString("errorDetail"), Toast.LENGTH_LONG).show();
                 } catch (Exception e) {
                     Toast.makeText(mContext, e.getMessage(), Toast.LENGTH_LONG).show();
diff --git a/app/src/main/java/com/realityexpander/alamohunt/PlacePickerActivity.java b/app/src/main/java/com/realityexpander/alamohunt/PlacePickerActivity.java
index 6b52d12..b433507 100644
--- a/app/src/main/java/com/realityexpander/alamohunt/PlacePickerActivity.java
+++ b/app/src/main/java/com/realityexpander/alamohunt/PlacePickerActivity.java
@@ -386,7 +386,6 @@ public void onRestoreInstanceState(Bundle savedInstanceState) {
         super.onRestoreInstanceState(savedInstanceState);
         // Restore UI state from the savedInstanceState.
         // This bundle has also been passed to onCreate.
-
         frsResults = (ArrayList<FoursquareResults>)savedInstanceState.getSerializable("frsResults");
     }
 
diff --git a/app/src/main/java/com/realityexpander/alamohunt/PlacePickerAdapter.java b/app/src/main/java/com/realityexpander/alamohunt/PlacePickerAdapter.java
index 295a4a9..116ecf6 100755
--- a/app/src/main/java/com/realityexpander/alamohunt/PlacePickerAdapter.java
+++ b/app/src/main/java/com/realityexpander/alamohunt/PlacePickerAdapter.java
@@ -39,7 +39,6 @@ public class PlacePickerAdapter extends RecyclerView.Adapter<PlacePickerAdapter.
 
     private static final double AUSTIN_TX_LATITUDE = 30.2672;
     private static final double AUSTIN_TX_LONGITUDE = -97.7431;
-
     private static final int FIRST_CATEGORY = 0;
 
     // The list of frsResults from the Foursquare API
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f31aac5..f1fa315 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -73,7 +73,7 @@
     <ImageView
         android:id="@+id/imageView4"
         android:layout_width="wrap_content"
-        android:layout_height="40dp"
+        android:layout_height="50dp"
         android:layout_marginBottom="28dp"
         android:layout_marginEnd="8dp"
         app:layout_constraintBottom_toBottomOf="@+id/imageView3"
diff --git a/app/src/main/res/raw/charles_ssl_proxying_certificate b/app/src/main/res/raw/charles_ssl_proxying_certificate
new file mode 100644
index 0000000..ae7cfd5
--- /dev/null
+++ b/app/src/main/res/raw/charles_ssl_proxying_certificate
@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE-----
+MIIFSDCCBDCgAwIBAgIGAV7vmlEXMA0GCSqGSIb3DQEBCwUAMIGoMTkwNwYDVQQDDDBDaGFybGVz
+IFByb3h5IENBICg1IE9jdCAyMDE3LCBNYWNCb29rLVByby5sb2NhbCkxJTAjBgNVBAsMHGh0dHBz
+Oi8vY2hhcmxlc3Byb3h5LmNvbS9zc2wxETAPBgNVBAoMCFhLNzIgTHRkMREwDwYDVQQHDAhBdWNr
+bGFuZDERMA8GA1UECAwIQXVja2xhbmQxCzAJBgNVBAYTAk5aMB4XDTAwMDEwMTAwMDAwMFoXDTQ2
+MTIwMzAyNTM0MVowgagxOTA3BgNVBAMMMENoYXJsZXMgUHJveHkgQ0EgKDUgT2N0IDIwMTcsIE1h
+Y0Jvb2stUHJvLmxvY2FsKTElMCMGA1UECwwcaHR0cHM6Ly9jaGFybGVzcHJveHkuY29tL3NzbDER
+MA8GA1UECgwIWEs3MiBMdGQxETAPBgNVBAcMCEF1Y2tsYW5kMREwDwYDVQQIDAhBdWNrbGFuZDEL
+MAkGA1UEBhMCTlowggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDiK6natezMyAlgttMV
+sPlIVZauzAKpvYCOqbzCGo5WjNzPy9pll2Lct9D8yH+Ji1m7hzBTCsgOTzbI9Fp8yFULLrzGamFH
+PLGVx1HjPQJAb0811zA11fdnDBMVFQBOShTkJAadcXv3Q8LcP1Lbxuf0WXgNeApnavcUa3siyb9u
+i7VpzdRPsR9Af0Q8n8fnbwd8qkz9gC7scfacKx/JeNsQluyrExbxaFp0UCwW+HCu7ytAuxJvfxYr
+zIiyUbjhpUNSy8XYTwToW0KnhRi9m+KDVvagbWHH8/0QYJtdZ4g55Vh8mjOSVRjQilN0I/BpOaQd
+Q9ssXUTr5B8568/xhezTAgMBAAGjggF0MIIBcDAPBgNVHRMBAf8EBTADAQH/MIIBLAYJYIZIAYb4
+QgENBIIBHROCARlUaGlzIFJvb3QgY2VydGlmaWNhdGUgd2FzIGdlbmVyYXRlZCBieSBDaGFybGVz
+IFByb3h5IGZvciBTU0wgUHJveHlpbmcuIElmIHRoaXMgY2VydGlmaWNhdGUgaXMgcGFydCBvZiBh
+IGNlcnRpZmljYXRlIGNoYWluLCB0aGlzIG1lYW5zIHRoYXQgeW91J3JlIGJyb3dzaW5nIHRocm91
+Z2ggQ2hhcmxlcyBQcm94eSB3aXRoIFNTTCBQcm94eWluZyBlbmFibGVkIGZvciB0aGlzIHdlYnNp
+dGUuIFBsZWFzZSBzZWUgaHR0cDovL2NoYXJsZXNwcm94eS5jb20vc3NsIGZvciBtb3JlIGluZm9y
+bWF0aW9uLjAOBgNVHQ8BAf8EBAMCAgQwHQYDVR0OBBYEFHJX+Gkr/yvifKoIsTy4mg0Icpt/MA0G
+CSqGSIb3DQEBCwUAA4IBAQB90cuWBJ6e3r0PlFmnssnNIOJScoBFetv14wZ8ip+5Tc3/SbIG1kWt
+fkDP5q9msB/IGHmaSO98gFwsHmUaubfXOxrG24+n25JHFNX5k/4vZVRBpZQe31lat/gyhM/FQ6FV
+22oZi6ixU8rxNQzNl1UVXCz+P8ajz4Q5TH6Vp73JzXOXsa8z/p9Jm4ADoZwyt/XyyIJvsWqy0AWl
+S0AT/ertFm52lZcWxG7nLx1aZohs0HhdH/RVjhSWuwWo2iS7m1nwes99RKGIbsMSxnD8+tOptR6Y
+Tc1RbZR66V0R/FVJLLzk/IClDXXNgifvJi4FlIv2pE6lGYxvdnHCs3GQC6sA
+-----END CERTIFICATE-----
diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
new file mode 100644
index 0000000..8d5ba88
--- /dev/null
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config>
+        <trust-anchors>
+            <certificates src="system" />
+        </trust-anchors>
+    </base-config>
+    <debug-overrides>
+        <trust-anchors>
+            <certificates src="@raw/charles_ssl_proxying_certificate" />
+        </trust-anchors>
+    </debug-overrides>
+</network-security-config>
\ No newline at end of file