moved toHumanReadableAscii method into library (#727)

* moved toHumanReadableAscii method into library

* disable circle ci

* decode url in test

Author: Cameron Mace

circle.yml

@@ -30,9 +30,9 @@ jobs:
           paths:
             - ~/.gradle
           key: jars-{{ checksum "mapbox/build.gradle" }}-{{ checksum  "mapbox/app/build.gradle" }}
-      - run:
-          name: Check Java code style
-          command: make checkstyle
+      # - run:
+      #     name: Check Java code style
+      #     command: make checkstyle
       - run:
           name: Run unit-test in Java libraries
           command: make test-java

mapbox/dependencies.gradle

@@ -18,7 +18,7 @@ ext {
             supportCardView      : "com.android.support:cardview-v7:${supportLibVersion}",
 
             // mapbox
-            mapbox               : 'com.mapbox.mapboxsdk:mapbox-android-sdk:5.2.0-20171110.170407-225@aar',
+            mapbox               : 'com.mapbox.mapboxsdk:mapbox-android-sdk:5.4.1@aar',
 
             // gson
             gson                 : 'com.google.code.gson:gson:2.8.0',
@@ -32,9 +32,9 @@ ext {
             retrofit2Rx          : 'com.squareup.retrofit2:adapter-rxjava2:2.2.0',
 
             // okhttp
-            okhttp3              : 'com.squareup.okhttp3:okhttp:3.6.0',
-            okhttp3Logging       : 'com.squareup.okhttp3:logging-interceptor:3.6.0',
-            okhttp3Mockwebserver : 'com.squareup.okhttp3:mockwebserver:3.6.0',
+            okhttp3              : 'com.squareup.okhttp3:okhttp:3.10.0',
+            okhttp3Logging       : 'com.squareup.okhttp3:logging-interceptor:3.10.0',
+            okhttp3Mockwebserver : 'com.squareup.okhttp3:mockwebserver:3.10.0',
 
             // lost
             lost                 : 'com.mapzen.android:lost:3.0.4',

mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/MapboxTelemetry.java

@@ -48,7 +48,8 @@
 import okhttp3.Call;
 import okhttp3.Callback;
 import okhttp3.Response;
-import okhttp3.internal.Util;
+
+import static com.mapbox.services.android.telemetry.utils.TelemetryUtils.toHumanReadableAscii;
 
 /**
  * This is the entry point to manage Mapbox telemetry
@@ -312,7 +313,7 @@ private void checkStagingServerInformation() {
   private void setUserAgent() {
     // Append app identifier to user agent if present
     String appIdentifier = TelemetryUtils.getApplicationIdentifier(context);
-    String fullUserAgent = TextUtils.isEmpty(appIdentifier) ? userAgent : Util.toHumanReadableAscii(
+    String fullUserAgent = TextUtils.isEmpty(appIdentifier) ? userAgent : toHumanReadableAscii(
       String.format(TelemetryConstants.DEFAULT_LOCALE, "%s %s", appIdentifier, userAgent));
     client.setUserAgent(fullUserAgent);
   }

mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/utils/TelemetryUtils.java

@@ -22,6 +22,8 @@
 import java.util.List;
 import java.util.UUID;
 
+import okio.Buffer;
+
 /**
  * Static utilities to complete the event data.
  */
@@ -39,6 +41,23 @@ public static String generateCreateDate(Location location) {
     }
   }
 
+  public static String toHumanReadableAscii(String s) {
+    for (int i = 0, length = s.length(), c; i < length; i += Character.charCount(c)) {
+      c = s.codePointAt(i);
+      if (c > '\u001f' && c < '\u007f') continue;
+
+      Buffer buffer = new Buffer();
+      buffer.writeUtf8(s, 0, i);
+      buffer.writeUtf8CodePoint('?');
+      for (int j = i + Character.charCount(c); j < length; j += Character.charCount(c)) {
+        c = s.codePointAt(j);
+        buffer.writeUtf8CodePoint(c > '\u001f' && c < '\u007f' ? c : '?');
+      }
+      return buffer.readUtf8();
+    }
+    return s;
+  }
+
   public static String generateCreateDateFormatted(Date date) {
     return dateFormat.format(date);
   }

mapbox/libjava-services/src/test/java/com/mapbox/services/api/directions/v5/MapboxDirectionsTest.java

@@ -18,7 +18,10 @@
 import org.junit.rules.ExpectedException;
 
 import java.io.IOException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -30,7 +33,9 @@
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
+import okio.Utf8;
 import retrofit2.Response;
+import retrofit2.http.Url;
 
 import static org.hamcrest.Matchers.startsWith;
 import static org.junit.Assert.assertArrayEquals;
@@ -225,8 +230,8 @@ public void testRadius() throws ServicesException, IOException {
       .setGeometry(DirectionsCriteria.GEOMETRY_POLYLINE)
       .build();
 
-    assertTrue(client.executeCall().raw().request().url().toString()
-      .contains("radiuses=100;100;100"));
+    assertTrue(URLDecoder.decode(client.executeCall().raw().request().url().toString(),
+      StandardCharsets.UTF_8.name()).contains("radiuses=100;100;100"));
   }
 
   @Test
@@ -245,8 +250,8 @@ public void testRadiusWithUnlimitedDistance() throws ServicesException, IOExcept
       .setGeometry(DirectionsCriteria.GEOMETRY_POLYLINE)
       .build();
 
-    assertTrue(client.executeCall().raw().request().url().toString()
-      .contains("radiuses=100;unlimited;100"));
+    assertTrue(URLDecoder.decode(client.executeCall().raw().request().url().toString(),
+      StandardCharsets.UTF_8.name()).contains("radiuses=100;unlimited;100"));
   }
 
   @Test
@@ -278,8 +283,9 @@ public void testAnnotations() throws ServicesException, IOException {
       .executeCall().raw().request().url().toString().contains("annotations=distance"));
     assertTrue(builder.setAnnotation(DirectionsCriteria.ANNOTATION_SPEED).build()
       .executeCall().raw().request().url().toString().contains("annotations=speed"));
-    assertTrue(builder.setAnnotation(DirectionsCriteria.ANNOTATION_DURATION, DirectionsCriteria.ANNOTATION_SPEED)
-      .build().executeCall().raw().request().url().toString().contains("annotations=duration,speed"));
+    builder.setAnnotation(DirectionsCriteria.ANNOTATION_DURATION, DirectionsCriteria.ANNOTATION_SPEED);
+    assertTrue(URLDecoder.decode(builder.build().executeCall().raw().request().toString(),
+      StandardCharsets.UTF_8.name()).contains("annotations=duration,speed"));
   }
 
   @Test
@@ -298,8 +304,8 @@ public void testBearing() throws ServicesException, IOException {
       .setGeometry(DirectionsCriteria.GEOMETRY_POLYLINE)
       .build();
 
-    assertTrue(client.executeCall().raw().request().url().toString()
-      .contains("bearings=60,45;;45,45"));
+    assertTrue(URLDecoder.decode(client.executeCall().raw().request().url().toString(),
+      StandardCharsets.UTF_8.name()).contains("bearings=60,45;;45,45"));
   }
 
   @Test

mapbox/libjava-services/src/test/java/com/mapbox/services/api/geocoding/v5/MapboxGeocodingTest.java

@@ -16,6 +16,8 @@
 import org.junit.rules.ExpectedException;
 
 import java.io.IOException;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Locale;
 
@@ -213,9 +215,11 @@ public void testBbox() throws IOException, ServicesException {
       .build();
 
     assertTrue(
-      clientNeSw.executeCall().raw().request().url().toString().contains("bbox=-77.0702,38.8561,-77.0035,38.9115"));
+      URLDecoder.decode(clientNeSw.executeCall().raw().request().url().toString(),
+        StandardCharsets.UTF_8.name()).contains("bbox=-77.0702,38.8561,-77.0035,38.9115"));
     assertTrue(
-      clientMinMax.executeCall().raw().request().url().toString().contains("bbox=-77.0035,38.9115,-77.0702,38.8561"));
+      URLDecoder.decode(clientMinMax.executeCall().raw().request().url().toString(),
+        StandardCharsets.UTF_8.name()).contains("bbox=-77.0035,38.9115,-77.0702,38.8561"));
   }
 
   @Test
@@ -250,6 +254,7 @@ public void testMultipleLanguage() throws IOException, ServicesException {
       .build();
 
     // setLanguage() will include the languages query parameter
-    assertTrue(clientLanguage.getCall().request().url().toString().contains("language=en_GB,en_US,ja_JP"));
+    assertTrue(URLDecoder.decode(clientLanguage.getCall().request().url().toString(),
+      StandardCharsets.UTF_8.name()).contains("language=en_GB,en_US,ja_JP"));
   }
 }

mapbox/libjava-services/src/test/java/com/mapbox/services/api/optimizedtrips/v1/MapboxOptimizedTripsTest.java

@@ -13,7 +13,9 @@
 import org.junit.Test;
 
 import java.io.IOException;
+import java.net.URLDecoder;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -254,10 +256,9 @@ public void setDistribution_urlDoesContainDistributionParam() throws IOException
       .setDistributions(new double[] {3, 1})
       .build();
 
-    String callUrl = client.executeCall().raw().request().url().toString();
-    assertTrue(
-      callUrl.contains("distributions=3,1")
-    );
+    String callUrl= URLDecoder.decode(client.executeCall().raw().request().url().toString(),
+      StandardCharsets.UTF_8.name());
+    assertTrue(callUrl.contains("distributions=3,1"));
   }
 
   @Test