Update proguard rules (#319)

* update proguard rules

* fixed up testapp so I could test proguard build

Author: zugaldia

mapbox/app/build.gradle

@@ -47,6 +47,7 @@ dependencies {
     compile ('com.mapbox.mapboxsdk:mapbox-android-sdk:5.0.0-SNAPSHOT@aar') {
         transitive=true
         exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-java-geojson'
+        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-telemetry'
     }
 
     // Leak Canary

mapbox/app/src/main/AndroidManifest.xml

@@ -187,7 +187,7 @@
             android:exported="false"/>
 
         <!-- Telemetry -->
-        <service android:name="com.mapbox.mapboxsdk.telemetry.TelemetryService"/>
+        <service android:name="com.mapbox.services.android.telemetry.service.TelemetryService"/>
 
     </application>
 

mapbox/app/src/main/java/com/mapbox/services/android/testapp/Utils.java

@@ -1,9 +1,16 @@
 package com.mapbox.services.android.testapp;
 
 import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
+import android.support.v4.content.res.ResourcesCompat;
 
 import com.mapbox.mapboxsdk.Mapbox;
+import com.mapbox.mapboxsdk.annotations.Icon;
+import com.mapbox.mapboxsdk.annotations.IconFactory;
 
 public class Utils {
 
@@ -34,4 +41,16 @@ public static String getMapboxAccessToken(@NonNull Context context) {
     }
   }
 
-}
+  /**
+   * Demonstrates converting any Drawable to an Icon, for use as a marker icon.
+   */
+  public static Icon drawableToIcon(@NonNull Context context, @DrawableRes int id) {
+    Drawable vectorDrawable = ResourcesCompat.getDrawable(context.getResources(), id, context.getTheme());
+    Bitmap bitmap = Bitmap.createBitmap(vectorDrawable.getIntrinsicWidth(),
+      vectorDrawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
+    Canvas canvas = new Canvas(bitmap);
+    vectorDrawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+    vectorDrawable.draw(canvas);
+    return IconFactory.getInstance(context).fromBitmap(bitmap);
+  }
+}

mapbox/app/src/main/java/com/mapbox/services/android/testapp/directions/RouteUtilsV5Activity.java

@@ -1,16 +1,13 @@
 package com.mapbox.services.android.testapp.directions;
 
 import android.graphics.Color;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.widget.Toast;
 
 import com.mapbox.mapboxsdk.annotations.Icon;
-import com.mapbox.mapboxsdk.annotations.IconFactory;
 import com.mapbox.mapboxsdk.annotations.Marker;
 import com.mapbox.mapboxsdk.annotations.MarkerOptions;
 import com.mapbox.mapboxsdk.annotations.Polyline;
@@ -65,10 +62,7 @@ protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_route_utils_v5);
 
-    // Create an Icon object for the marker to use
-    IconFactory iconFactory = IconFactory.getInstance(this);
-    Drawable iconDrawable = ContextCompat.getDrawable(this, R.drawable.ic_my_location_black_24dp);
-    tapIcon = iconFactory.fromDrawable(iconDrawable);
+    tapIcon = Utils.drawableToIcon(this, R.drawable.ic_my_location_black_24dp);
 
     // Set up a standard Mapbox map
     mapView = (MapView) findViewById(R.id.mapview);

mapbox/app/src/main/java/com/mapbox/services/android/testapp/nav/OffRouteDetectionActivity.java

@@ -4,11 +4,9 @@
 import android.animation.TypeEvaluator;
 import android.animation.ValueAnimator;
 import android.graphics.Color;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
@@ -17,7 +15,6 @@
 import android.widget.Toast;
 
 import com.mapbox.mapboxsdk.annotations.Icon;
-import com.mapbox.mapboxsdk.annotations.IconFactory;
 import com.mapbox.mapboxsdk.annotations.Marker;
 import com.mapbox.mapboxsdk.annotations.MarkerView;
 import com.mapbox.mapboxsdk.annotations.MarkerViewOptions;
@@ -197,9 +194,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
   private void addCar(LatLng position) {
     // Using a custom car icon for marker.
-    IconFactory iconFactory = IconFactory.getInstance(OffRouteDetectionActivity.this);
-    Drawable iconDrawable = ContextCompat.getDrawable(OffRouteDetectionActivity.this, R.drawable.ic_car_top);
-    Icon icon = iconFactory.fromDrawable(iconDrawable);
+    Icon icon = Utils.drawableToIcon(this, R.drawable.ic_car_top);
 
     // Add the car marker to the map.
     car = map.addMarker(new MarkerViewOptions()

mapbox/libandroid-services/proguard-rules.pro

@@ -1,4 +1,4 @@
-# Retrofit 2
+# Retrofit 2 (https://square.github.io/retrofit/#ProGuard)
 # Platform calls Class.forName on types which do not exist on Android to determine platform.
 -dontnote retrofit2.Platform
 # Platform used when running on RoboVM on iOS. Will not be used at runtime.
@@ -10,30 +10,32 @@
 # Retain declared checked exceptions for use by a Proxy instance.
 -keepattributes Exceptions
 
+# Gson (https://github.com/google/gson/blob/master/examples/android-proguard-example/proguard.cfg)
+# Gson uses generic type information stored in a class file when working with fields. Proguard
+# removes such information by default, so configure it to keep all of it.
+-keepattributes Signature
+
 # For using GSON @Expose annotation
 -keepattributes *Annotation*
+
 # Gson specific classes
--dontwarn sun.misc.**
+-keep class sun.misc.Unsafe { *; }
+#-keep class com.google.gson.stream.** { *; }
 
 # Prevent proguard from stripping interface information from TypeAdapterFactory,
 # JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
 -keep class * implements com.google.gson.TypeAdapterFactory
 -keep class * implements com.google.gson.JsonSerializer
 -keep class * implements com.google.gson.JsonDeserializer
 
-# MAS Data Models
--keep class com.mapbox.services.mapmatching.v4.models.** { *; }
--keep class com.mapbox.services.distance.v1.models.** { *; }
--keep class com.mapbox.services.directions.v4.models.** { *; }
--keep class com.mapbox.services.directions.v5.models.** { *; }
--keep class com.mapbox.services.geocoding.v5.models.** { *; }
+# MAS data models that will be serialized/deserialized over Gson
+-keep class com.mapbox.services.api.directions.v5.models.** { *; }
+-keep class com.mapbox.services.api.distance.v1.models.** { *; }
+-keep class com.mapbox.services.api.geocoding.v5.models.** { *; }
+-keep class com.mapbox.services.api.mapmatching.v5.models.** { *; }
+-keep class com.mapbox.services.commons.geojson.** { *; }
 
 -dontwarn javax.annotation.**
 
--keepclassmembers class rx.internal.util.unsafe.** {
-    long producerIndex;
-    long consumerIndex;
-}
-
 -keep class com.google.**
--dontwarn com.google.**
+-dontwarn com.google.**