From 99ba4e9c5770aa51222ab1139c5c4a056a46f085 Mon Sep 17 00:00:00 2001
From: Harsha Sura <harsha.sura@mapbox.com>
Date: Mon, 16 Mar 2020 16:23:41 -0700
Subject: [PATCH] Apply commits in #443 #444 #445 #457 as a patch

---
 app/build.gradle                              |  3 ++
 .../android/events/testapp/MainActivity.java  | 13 ++++++
 app/src/main/res/layout/activity_main.xml     | 11 +++++
 gradle/dependencies.gradle                    |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  4 +-
 .../mapbox/android/telemetry/CrashEvent.java  | 18 ++++++++
 .../android/telemetry/MapboxTelemetry.java    | 13 +++++-
 .../android/telemetry/AppUserTurnstile.java   | 12 ++++++
 .../mapbox/android/telemetry/Attachment.java  |  3 ++
 .../android/telemetry/LocationEvent.java      |  2 +
 .../android/telemetry/TelemetryUtils.java     | 43 +++++++++++++++++++
 .../mapbox/android/telemetry/VisionEvent.java |  5 ++-
 .../telemetry/VisionObjectDetectionEvent.java |  4 ++
 .../mapbox/android/telemetry/SchemaTest.java  | 16 ++++++-
 package.json                                  |  4 +-
 15 files changed, 143 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e0e439152..1a45a0a11 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,6 +16,9 @@ android {
         release {
             minifyEnabled true
         }
+        debug {
+            minifyEnabled true
+        }
     }
 
     flavorDimensions "version"
diff --git a/app/src/main/java/com/mapbox/android/events/testapp/MainActivity.java b/app/src/main/java/com/mapbox/android/events/testapp/MainActivity.java
index 234c4924e..b3f74fe9e 100644
--- a/app/src/main/java/com/mapbox/android/events/testapp/MainActivity.java
+++ b/app/src/main/java/com/mapbox/android/events/testapp/MainActivity.java
@@ -66,6 +66,15 @@ public void onClick(View v) {
         }
       }
     });
+
+    Button sendTurnstile = findViewById(R.id.turnstile);
+
+    sendTurnstile.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        mapboxTelemetry.push(new AppUserTurnstile("fooSdk", "1.0.0"));
+      }
+    });
   }
 
   @SuppressLint("MissingPermission")
@@ -175,6 +184,9 @@ public void run() {
         });
       }
       Log.i(LOG_TAG, message);
+      if (!successful) {
+        throw new AssertionError("Failed to POST Event: " + code);
+      }
     }
 
     @Override
@@ -189,6 +201,7 @@ public void run() {
         });
       }
       Log.e(LOG_TAG, "Failure: " + message);
+      throw new AssertionError("Failed to POST Event");
     }
   }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5927c39cf..771e27da7 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -30,4 +30,15 @@
             app:layout_constraintTop_toTopOf="parent" android:layout_marginBottom="8dp"
             app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintVertical_bias="0.076"/>
 
+    <Button
+        android:text="Send Turnstile"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/turnstile"
+        android:layout_marginTop="20dp"
+        android:padding="10dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/fill_queue"/>
+
 </android.support.constraint.ConstraintLayout>
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 79487d92f..544f420ed 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -23,7 +23,7 @@ ext {
 
     pluginVersion = [
             checkstyle       : '8.4',
-            gradle           : '3.4.1',
+            gradle           : '3.5.3',
             dependencyGraph  : '0.5.0',
             mapboxSdkVersions: '1.0.1'
     ]
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 014700299..88628e2e5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jun 06 12:04:38 PDT 2019
+#Fri Dec 06 11:54:00 PST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/libtelemetry/src/full/java/com/mapbox/android/telemetry/CrashEvent.java b/libtelemetry/src/full/java/com/mapbox/android/telemetry/CrashEvent.java
index 66a946cd2..971df73b4 100644
--- a/libtelemetry/src/full/java/com/mapbox/android/telemetry/CrashEvent.java
+++ b/libtelemetry/src/full/java/com/mapbox/android/telemetry/CrashEvent.java
@@ -2,8 +2,12 @@
 
 import android.annotation.SuppressLint;
 import android.os.Parcel;
+import android.support.annotation.Keep;
 import android.text.TextUtils;
 
+
+import com.google.gson.annotations.SerializedName;
+
 /**
  * This class is temporary and exists only
  * to comply with legacy telemetry interface,
@@ -12,20 +16,34 @@
  * back and forth json serialization overhead.
  */
 @SuppressLint("ParcelCreator")
+@Keep
 public class CrashEvent extends Event {
+  @SerializedName("event")
   private final String event;
+  @SerializedName("created")
   private final String created;
 
+  @SerializedName("sdkIdentifier")
   private String sdkIdentifier;
+  @SerializedName("sdkVersion")
   private String sdkVersion;
+  @SerializedName("osVersion")
   private String osVersion;
+  @SerializedName("model")
   private String model;
+  @SerializedName("device")
   private String device;
+  @SerializedName("isSilent")
   private String isSilent;
+  @SerializedName("stackTraceHash")
   private String stackTraceHash;
+  @SerializedName("stackTrace")
   private String stackTrace;
+  @SerializedName("threadDetails")
   private String threadDetails;
+  @SerializedName("appId")
   private String appId;
+  @SerializedName("appVersion")
   private String appVersion;
 
   public CrashEvent(String event, String created) {
diff --git a/libtelemetry/src/full/java/com/mapbox/android/telemetry/MapboxTelemetry.java b/libtelemetry/src/full/java/com/mapbox/android/telemetry/MapboxTelemetry.java
index 3ba47cfe5..0d63997b8 100644
--- a/libtelemetry/src/full/java/com/mapbox/android/telemetry/MapboxTelemetry.java
+++ b/libtelemetry/src/full/java/com/mapbox/android/telemetry/MapboxTelemetry.java
@@ -24,6 +24,7 @@
 import android.support.v4.content.LocalBroadcastManager;
 
 import android.util.Log;
+
 import okhttp3.Call;
 import okhttp3.Callback;
 import okhttp3.OkHttpClient;
@@ -225,8 +226,16 @@ private boolean isUserAgentValid(String userAgent) {
 
   private void initializeTelemetryClient() {
     if (configurationClient == null) {
-      this.configurationClient = new ConfigurationClient(applicationContext,
-        TelemetryUtils.createFullUserAgent(userAgent, applicationContext), sAccessToken.get(), new OkHttpClient());
+      if (BuildConfig.DEBUG) {
+        // Strict mode work around : https://github.com/square/okhttp/issues/3537
+        this.configurationClient = new ConfigurationClient(applicationContext,
+          TelemetryUtils.createFullUserAgent(userAgent, applicationContext), sAccessToken.get(),
+          TelemetryUtils.createOkHttpClientWithStrictModeWorkAround());
+      } else {
+        this.configurationClient = new ConfigurationClient(applicationContext,
+          TelemetryUtils.createFullUserAgent(userAgent, applicationContext), sAccessToken.get(),
+          new OkHttpClient());
+      }
     }
 
     if (certificateBlacklist == null) {
diff --git a/libtelemetry/src/main/java/com/mapbox/android/telemetry/AppUserTurnstile.java b/libtelemetry/src/main/java/com/mapbox/android/telemetry/AppUserTurnstile.java
index eba582d31..a39c3f04a 100644
--- a/libtelemetry/src/main/java/com/mapbox/android/telemetry/AppUserTurnstile.java
+++ b/libtelemetry/src/main/java/com/mapbox/android/telemetry/AppUserTurnstile.java
@@ -5,28 +5,40 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import android.support.annotation.Keep;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+
 import com.google.gson.annotations.SerializedName;
 
 import static com.mapbox.android.telemetry.TelemetryEnabler.TELEMETRY_STATES;
 
+@Keep
 public class AppUserTurnstile extends Event implements Parcelable {
   private static final String APP_USER_TURNSTILE = "appUserTurnstile";
   private static final String OPERATING_SYSTEM = "Android - " + Build.VERSION.RELEASE;
   private static final String APPLICATION_CONTEXT_CANT_BE_NULL = "Create a MapboxTelemetry instance before calling "
     + "this method.";
 
+  @SerializedName("event")
   private final String event;
+  @SerializedName("created")
   private final String created;
+  @SerializedName("userId")
   private final String userId;
   @SerializedName("enabled.telemetry")
   private final boolean enabledTelemetry;
+  @SerializedName("device")
   private final String device;
+  @SerializedName("sdkIdentifier")
   private final String sdkIdentifier;
+  @SerializedName("sdkVersion")
   private final String sdkVersion;
+  @SerializedName("model")
   private final String model;
+  @SerializedName("operatingSystem")
   private final String operatingSystem;
+  @SerializedName("skuId")
   private String skuId;
 
   public AppUserTurnstile(String sdkIdentifier, String sdkVersion) {
diff --git a/libtelemetry/src/main/java/com/mapbox/android/telemetry/Attachment.java b/libtelemetry/src/main/java/com/mapbox/android/telemetry/Attachment.java
index d8881451e..6a4a27bf6 100644
--- a/libtelemetry/src/main/java/com/mapbox/android/telemetry/Attachment.java
+++ b/libtelemetry/src/main/java/com/mapbox/android/telemetry/Attachment.java
@@ -2,12 +2,15 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.support.annotation.Keep;
+
 
 import com.google.gson.annotations.SerializedName;
 
 import java.util.ArrayList;
 import java.util.List;
 
+@Keep
 public class Attachment extends Event implements Parcelable {
   private static final String VIS_ATTACHMENT = "vis.attachment";
 
diff --git a/libtelemetry/src/main/java/com/mapbox/android/telemetry/LocationEvent.java b/libtelemetry/src/main/java/com/mapbox/android/telemetry/LocationEvent.java
index 14f3ecdd9..0f1292266 100644
--- a/libtelemetry/src/main/java/com/mapbox/android/telemetry/LocationEvent.java
+++ b/libtelemetry/src/main/java/com/mapbox/android/telemetry/LocationEvent.java
@@ -4,9 +4,11 @@
 import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.support.annotation.Keep;
 
 import com.google.gson.annotations.SerializedName;
 
+@Keep
 public class LocationEvent extends Event implements Parcelable {
   private static final String LOCATION = "location";
   private static final String SOURCE_MAPBOX = "mapbox";
diff --git a/libtelemetry/src/main/java/com/mapbox/android/telemetry/TelemetryUtils.java b/libtelemetry/src/main/java/com/mapbox/android/telemetry/TelemetryUtils.java
index d00504988..825704e48 100644
--- a/libtelemetry/src/main/java/com/mapbox/android/telemetry/TelemetryUtils.java
+++ b/libtelemetry/src/main/java/com/mapbox/android/telemetry/TelemetryUtils.java
@@ -8,12 +8,17 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.net.TrafficStats;
 import android.os.BatteryManager;
 import android.os.Build;
 import android.support.annotation.Nullable;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -26,6 +31,9 @@
 
 import com.mapbox.android.core.MapboxSdkInfoForUserAgentGenerator;
 
+import javax.net.SocketFactory;
+
+import okhttp3.OkHttpClient;
 import okio.Buffer;
 
 import static com.mapbox.android.telemetry.MapboxTelemetryConstants.MAPBOX_SHARED_PREFERENCES;
@@ -292,4 +300,39 @@ static boolean adjustWakeUpMode(Context context) {
     }
     return false;
   }
+
+  static OkHttpClient createOkHttpClientWithStrictModeWorkAround() {
+    return new OkHttpClient().newBuilder()
+      .socketFactory(new SocketFactory() {
+        SocketFactory socketFactory = SocketFactory.getDefault();
+        private static final int THREAD_ID = 10000;
+
+        @Override
+        public Socket createSocket(String host, int port) throws IOException, UnknownHostException {
+          TrafficStats.setThreadStatsTag(THREAD_ID);
+          return socketFactory.createSocket(host, port);
+        }
+
+        @Override
+        public Socket createSocket(String host, int port, InetAddress localHost, int localPort) throws
+          IOException, UnknownHostException {
+          TrafficStats.setThreadStatsTag(THREAD_ID);
+          return socketFactory.createSocket(host, port, localHost, localPort);
+        }
+
+        @Override
+        public Socket createSocket(InetAddress host, int port) throws IOException {
+          TrafficStats.setThreadStatsTag(THREAD_ID);
+          return socketFactory.createSocket(host, port);
+        }
+
+        @Override
+        public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort) throws
+          IOException {
+          TrafficStats.setThreadStatsTag(THREAD_ID);
+          return socketFactory.createSocket(address, port, localAddress, localPort);
+        }
+      })
+      .build();
+  }
 }
diff --git a/libtelemetry/src/main/java/com/mapbox/android/telemetry/VisionEvent.java b/libtelemetry/src/main/java/com/mapbox/android/telemetry/VisionEvent.java
index 430295f62..33fda2ca8 100644
--- a/libtelemetry/src/main/java/com/mapbox/android/telemetry/VisionEvent.java
+++ b/libtelemetry/src/main/java/com/mapbox/android/telemetry/VisionEvent.java
@@ -2,12 +2,15 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.support.annotation.Keep;
+
 
 import com.google.gson.annotations.SerializedName;
 
 import java.util.HashMap;
 
-public class VisionEvent  extends Event implements Parcelable {
+@Keep
+public class VisionEvent extends Event implements Parcelable {
   private static final String VIS_GENERAL = "vision.general";
 
   @SerializedName("event")
diff --git a/libtelemetry/src/main/java/com/mapbox/android/telemetry/VisionObjectDetectionEvent.java b/libtelemetry/src/main/java/com/mapbox/android/telemetry/VisionObjectDetectionEvent.java
index 5c14e63f3..d6b4ecc9b 100644
--- a/libtelemetry/src/main/java/com/mapbox/android/telemetry/VisionObjectDetectionEvent.java
+++ b/libtelemetry/src/main/java/com/mapbox/android/telemetry/VisionObjectDetectionEvent.java
@@ -2,11 +2,15 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.support.annotation.Keep;
+
 import com.google.gson.annotations.SerializedName;
 
 /**
  * Vision object detection event v2.
  */
+
+@Keep
 public class VisionObjectDetectionEvent extends Event implements Parcelable {
   static final String VIS_OBJECT_DETECTION = "vision.objectDetection";
 
diff --git a/libtelemetry/src/test/java/com/mapbox/android/telemetry/SchemaTest.java b/libtelemetry/src/test/java/com/mapbox/android/telemetry/SchemaTest.java
index 02c2151ff..1fd0646a6 100644
--- a/libtelemetry/src/test/java/com/mapbox/android/telemetry/SchemaTest.java
+++ b/libtelemetry/src/test/java/com/mapbox/android/telemetry/SchemaTest.java
@@ -32,6 +32,13 @@ public class SchemaTest {
   private static final String LOCATION = "location";
   private static ArrayList<JsonObject> schemaArray;
 
+  /**
+   * Properties in Location Schema that are added in backend
+   * but not incorporated into the Android SDK yet.
+   **/
+  private String[] additionalLocationProperties =
+    {"speed", "course", "floor", "speedAccuracy", "courseAccuracy", "verticalAccuracy"};
+
   @BeforeClass
   public static void downloadSchema() throws Exception {
     unpackSchemas();
@@ -56,6 +63,12 @@ public void checkAppUserTurnstileEventFields() throws Exception {
   @Test
   public void checkLocationEventSize() throws Exception {
     JsonObject schema = grabSchema(LOCATION);
+    if (schema != null) {
+      // Ignore the location properties that are not incorporated into the android sdk yet.
+      for (String string : additionalLocationProperties) {
+        schema.remove(string);
+      }
+    }
     List<Field> fields = grabClassFields(LocationEvent.class);
 
     assertEquals(schema.size(), fields.size());
@@ -70,7 +83,6 @@ public void checkLocationEventFields() throws Exception {
   }
 
 
-
   @Test
   public void validateVisionEventFormat() {
     JsonObject schema = grabSchema(VisionObjectDetectionEvent.VIS_OBJECT_DETECTION);
@@ -175,7 +187,7 @@ private static void unpackSchemas() throws IOException {
   }
 
   private JsonObject grabSchema(String eventName) {
-    for (JsonObject thisSchema: schemaArray) {
+    for (JsonObject thisSchema : schemaArray) {
       String name = thisSchema.get("name").getAsString();
 
       if (name.equalsIgnoreCase(eventName)) {
diff --git a/package.json b/package.json
index 918dcea83..26cf9bfd3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mapbox/mapbox-events-android",
-  "version": "4.0.0",
+  "version": "4.7.1",
   "description": "Telemetry and Location Services",
   "keywords": [
     "mapbox",
@@ -20,7 +20,7 @@
     "pretty-bytes": "^5.1.0"
   },
   "engines": {
-    "node": ">=6"
+    "node": ">=10"
   },
   "dependencies": {
     "@mapbox/cloudfriend": "^2.5.0"