Release 4.2.0-beta.4 (#170)

* minor changes to match website examples * fixes retrofit memory leak on device rotation * gets rid of unused import * bumped version to beta.4 * added missing file back
mapbox · Oct 25, 2016 · 67dd094 · 67dd094
1 parent e36c97c
commit 67dd094
Show file tree

Hide file tree

Showing 24 changed files with 43 additions and 28 deletions.
diff --git a/MapboxAndroidDemo/build.gradle b/MapboxAndroidDemo/build.gradle
@@ -11,8 +11,8 @@ android {
   defaultConfig {
     minSdkVersion 15
     targetSdkVersion 25
-    versionCode 31
-    versionName "4.2.0-beta.3"
+    versionCode 32
+    versionName "4.2.0-beta.4"
   }
 
   buildTypes {
@@ -25,7 +25,7 @@ android {
 
 repositories {
   maven { url "https://jitpack.io" }
-  maven { url "http://oss.sonatype.org/content/repositories/snapshots/" }
+//  maven { url "http://oss.sonatype.org/content/repositories/snapshots/" }
 }
 
 dependencies {
@@ -39,8 +39,8 @@ dependencies {
   compile 'com.squareup.picasso:picasso:2.5.2'
 
   // Mapbox dependencies
-//  compile('com.mapbox.mapboxsdk:mapbox-android-sdk:4.2.0-beta.3@aar') {
-  compile('com.mapbox.mapboxsdk:mapbox-android-sdk:4.2.0-SNAPSHOT@aar') {
+//  compile('com.mapbox.mapboxsdk:mapbox-android-sdk:4.2.0-SNAPSHOT@aar') {
+  compile('com.mapbox.mapboxsdk:mapbox-android-sdk:4.2.0-beta.4@aar') {
     transitive = true
   }
   compile('com.mapbox.mapboxsdk:mapbox-android-services:1.3.1@aar') {

diff --git a/.../main/java/com/mapbox/mapboxandroiddemo/examples/annotations/DrawGeojsonLineActivity.java b/.../main/java/com/mapbox/mapboxandroiddemo/examples/annotations/DrawGeojsonLineActivity.java
@@ -27,7 +27,7 @@
 
 public class DrawGeojsonLineActivity extends AppCompatActivity implements OnMapReadyCallback {
 
-  private static final String TAG = "MainActivity";
+  private static final String TAG = "DrawGeojsonLineActivity";
 
   private MapView mapView;
   private MapboxMap mapboxMap;

diff --git a/...droidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/mas/DirectionsActivity.java b/...droidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/mas/DirectionsActivity.java
@@ -36,6 +36,7 @@ public class DirectionsActivity extends AppCompatActivity {
   private MapView mapView;
   private MapboxMap map;
   private DirectionsRoute currentRoute;
+  private MapboxDirections client;
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
@@ -85,7 +86,7 @@ public void onMapReady(MapboxMap mapboxMap) {
 
   private void getRoute(Position origin, Position destination) throws ServicesException {
 
-    MapboxDirections client = new MapboxDirections.Builder()
+    client = new MapboxDirections.Builder()
       .setOrigin(origin)
       .setDestination(destination)
       .setProfile(DirectionsCriteria.PROFILE_CYCLING)
@@ -164,6 +165,10 @@ protected void onSaveInstanceState(Bundle outState) {
   @Override
   protected void onDestroy() {
     super.onDestroy();
+    // Cancel the directions API request
+    if (client != null) {
+      client.cancelCall();
+    }
     mapView.onDestroy();
   }
 

diff --git a/...roidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/mas/MapMatchingActivity.java b/...roidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/mas/MapMatchingActivity.java
@@ -41,6 +41,7 @@ public class MapMatchingActivity extends AppCompatActivity {
 
   private MapView mapView;
   private MapboxMap map;
+  private MapboxMapMatching client;
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
@@ -88,6 +89,10 @@ public void onLowMemory() {
   @Override
   protected void onDestroy() {
     super.onDestroy();
+    // Cancel the MapMatching API request
+    if (client != null) {
+      client.cancelCall();
+    }
     mapView.onDestroy();
   }
 
@@ -171,7 +176,7 @@ private void drawBeforeMapMatching(List<Position> points) {
   private void drawMapMatched(LineString lineString, int precision) {
     try {
       // Setup the request using a client.
-      MapboxMapMatching client = new MapboxMapMatching.Builder()
+      client = new MapboxMapMatching.Builder()
         .setAccessToken(MapboxAccountManager.getInstance().getAccessToken())
         .setProfile(DirectionsCriteria.PROFILE_DRIVING)
         .setGpsPrecison(precision)

diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_annotation_basic_marker_view.xml b/MapboxAndroidDemo/src/main/res/layout/activity_annotation_basic_marker_view.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".examples.annotations.BasicMarkerViewActivity">
 
     <com.mapbox.mapboxsdk.maps.MapView
         android:id="@+id/mapView"

diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_annotation_custom_info_window.xml b/MapboxAndroidDemo/src/main/res/layout/activity_annotation_custom_info_window.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".examples.basics.SimpleMapViewActivity">
+    tools:context=".examples.annotations.CustomInfoWindowActivity">
 
     <com.mapbox.mapboxsdk.maps.MapView
         android:id="@+id/mapView"

diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_annotation_geojson_line.xml b/MapboxAndroidDemo/src/main/res/layout/activity_annotation_geojson_line.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".examples.annotations.DrawGeojsonLineActivity">
 
     <com.mapbox.mapboxsdk.maps.MapView
         android:id="@+id/mapView"

diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_annotation_marker.xml b/MapboxAndroidDemo/src/main/res/layout/activity_annotation_marker.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".examples.annotations.DrawMarkerActivity">
 
     <com.mapbox.mapboxsdk.maps.MapView
         android:id="@+id/mapView"

diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_annotation_polygon.xml b/MapboxAndroidDemo/src/main/res/layout/activity_annotation_polygon.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".examples.annotations.DrawPolygonActivity">
 
     <com.mapbox.mapboxsdk.maps.MapView
         android:id="@+id/mapView"

diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_basic_support_map_frag.xml b/MapboxAndroidDemo/src/main/res/layout/activity_basic_support_map_frag.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".examples.basics.SupportMapFragmentActivity">
 
     <FrameLayout
         android:id="@+id/container"

diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_camera_animate.xml b/MapboxAndroidDemo/src/main/res/layout/activity_camera_animate.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".examples.camera.AnimateMapCameraActivity">
 
     <com.mapbox.mapboxsdk.maps.MapView
         android:id="@+id/mapView"

diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_camera_bounding_box.xml b/MapboxAndroidDemo/src/main/res/layout/activity_camera_bounding_box.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".examples.camera.BoundingBoxCameraActivity">
 
     <com.mapbox.mapboxsdk.maps.MapView
         android:id="@+id/mapView"

diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_location_basic.xml b/MapboxAndroidDemo/src/main/res/layout/activity_location_basic.xml
@@ -7,7 +7,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".MainActivity">
+    tools:context=".examples.location.BasicUserLocation">
 
     <com.mapbox.mapboxsdk.maps.MapView
         android:id="@+id/mapView"

diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_location_tracking.xml b/MapboxAndroidDemo/src/main/res/layout/activity_location_tracking.xml
@@ -2,9 +2,10 @@
 <android.support.design.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    tools:context=".examples.location.LocationTrackingActivity">
 
     <com.mapbox.mapboxsdk.maps.MapView
         android:id="@+id/mapView"

diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_mas_directions.xml b/MapboxAndroidDemo/src/main/res/layout/activity_mas_directions.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".examples.mas.DirectionsActivity">
 
     <com.mapbox.mapboxsdk.maps.MapView
         android:id="@+id/mapView"

diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_mas_geocoding.xml b/MapboxAndroidDemo/src/main/res/layout/activity_mas_geocoding.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".MainActivity">
+    tools:context=".examples.mas.GeocodingActivity">
 
     <com.mapbox.mapboxsdk.maps.MapView
         android:id="@+id/mapView"

diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_mas_map_matching.xml b/MapboxAndroidDemo/src/main/res/layout/activity_mas_map_matching.xml
@@ -2,9 +2,11 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:context=".examples.mas.MapMatchingActivity">
 
     <com.mapbox.mapboxsdk.maps.MapView
         android:id="@+id/mapView"

diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_mas_static_image.xml b/MapboxAndroidDemo/src/main/res/layout/activity_mas_static_image.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".examples.mas.StaticImageActivity">
 
     <ImageView
         android:id="@+id/mapImage"

diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_offline_simple.xml b/MapboxAndroidDemo/src/main/res/layout/activity_offline_simple.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".examples.offline.SimpleOfflineMapActivity">
 
     <com.mapbox.mapboxsdk.maps.MapView
         android:id="@+id/mapView"

diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_simplify_polyline.xml b/MapboxAndroidDemo/src/main/res/layout/activity_simplify_polyline.xml
@@ -2,9 +2,11 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:context=".examples.mas.SimplifyPolylineActivity">
 
     <com.mapbox.mapboxsdk.maps.MapView
         android:id="@+id/mapview"

diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_style_default.xml b/MapboxAndroidDemo/src/main/res/layout/activity_style_default.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".examples.styles.DefaultStyleActivity">
 
     <com.mapbox.mapboxsdk.maps.MapView
         android:id="@+id/mapView"

diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_style_mapbox_studio.xml b/MapboxAndroidDemo/src/main/res/layout/activity_style_mapbox_studio.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".examples.styles.MapboxStudioStyleActivity">
 
     <!--
     Use your custom style by replacing the style url with the line below:

diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_style_raster.xml b/MapboxAndroidDemo/src/main/res/layout/activity_style_raster.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".examples.styles.CustomRasterStyleActivity">
 
     <com.mapbox.mapboxsdk.maps.MapView
         android:id="@+id/mapView"

diff --git a/MapboxAndroidDemo/src/main/res/layout/activity_style_satellite.xml b/MapboxAndroidDemo/src/main/res/layout/activity_style_satellite.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".examples.styles.SatelliteStyleActivity">
 
     <com.mapbox.mapboxsdk.maps.MapView
         android:id="@+id/mapView"