From 1ff9073b4dc65fb274e650c4c7ed883f1333d6eb Mon Sep 17 00:00:00 2001
From: Brad Leege <bleege@gmail.com>
Date: Thu, 25 Feb 2016 17:29:58 -0600
Subject: [PATCH] [android] #3888 - Setting SHA1 Certificate Pins for Staging,
 Prod Geotrust, and Prod DigiCert

---
 .../telemetry/MapboxEventManager.java         | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java
index 6451e8ea0..c1f956f5f 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java
@@ -583,11 +583,31 @@ public class MapboxEventManager {
                 }
 
                 // Based on http://square.github.io/okhttp/3.x/okhttp/okhttp3/CertificatePinner.html
+
+                // SHA256 Values for Certs when OkHttp 3.2.0 Is Released
+                // Staging - Geotrust
+//                .add("cloudfront-staging.tilestream.net", "sha256/kR9ysyN/lzBl/ecearDERV7qO7xqSN4jt6XuQjIVL0I=")
+//                .add("cloudfront-staging.tilestream.net", "sha256/sPbNCVpVasMJxps3IqFfLTRKkVnRCLrTlZVc5kspqlkw=")
+//                .add("cloudfront-staging.tilestream.net", "sha256/h6801m+z8v3zbgkRHpq6L29Esgfzhj89C1SyUCOQmqU=")
+                // Prod - Geotrust
+//                .add("api.mapbox.com", "sha256/svaiYM/ZVIfxC+CMDe4kj1KsviQmzyZ9To8nQqUJwFI=")
+//                .add("api.mapbox.com", "sha256/owrR9U9FWDWtrFF+myoRIu75JwU4sJwzvhCNLZoY37g=")
+//                .add("api.mapbox.com", "sha256/SQVGZiOrQXi+kqxcvWWE96HhfydlLVqFr4lQTqI5qqo=")
+                // Prod - DigiCert
+//                .add("api.mapbox.com", "sha256/JL+uwAwpA2U1UVl/AFdZy1ZnvkZJ1P1hRfmfPaPVSLU=")
+//                .add("api.mapbox.com", "sha256/RRM1dGqnDFsCJXBTHky16vi1obOlCgFFn/yOhI/y+ho=")
+//                .add("api.mapbox.com", "sha256/WoiWRyIOVNa9ihaBciRSC7XHjliYS9VwUGOIud4PB18=")
+
                 CertificatePinner certificatePinner = new CertificatePinner.Builder()
+                        // Staging - Geotrust SHA1
                         .add("cloudfront-staging.tilestream.net", "sha1/KcdiTca54HxWTV8VuAd67x8I=")
                         .add("cloudfront-staging.tilestream.net", "sha1//KDE76PP0DQBDcTnMFBv+efp4eg=")
+                        // Prod - Geotrust SHA1
                         .add("api.mapbox.com", "sha1/Uv71ooi32pyba+oLD7egnXm7/GQ=")
                         .add("api.mapbox.com", "sha1/hOP0d37/ZTSGgCSseE3DIZ1uSg0=")
+                        // Prod - DigiCert SHA1
+                        .add("api.mapbox.com", "sha1/EoBG4XgG0B1cTNYJbFJDlNuxpII=")
+                        .add("api.mapbox.com", "sha1/LHspp8BlMzJeqfRrY/MmhzxEa3Q=")
                         .build();
 
                 OkHttpClient client = new OkHttpClient.Builder().certificatePinner(certificatePinner).build();
@@ -601,12 +621,14 @@ public class MapboxEventManager {
                         .post(body)
                         .build();
                 Response response = client.newCall(request).execute();
+                Log.i(TAG, "response code = " + response.code() + " for events " + events.size());
 
                 // Reset Events
                 // ============
                 events.removeAllElements();
             } catch (Exception e) {
                 Log.e(TAG, "FlushTheEventsTask borked: " + e);
+                e.printStackTrace();
             }
 
             return null;