Remove deprecated v4 directions (#260)

* remove deprecated v4 directions * replace v4.DirectionsCriteria with MapMatchingCriteria to fix tests * bring back DirectionsV5Activity
mapbox · Jan 10, 2017 · 18b7a87 · 18b7a87
1 parent 034efb7
commit 18b7a87
Show file tree

Hide file tree

Showing 17 changed files with 9 additions and 1,560 deletions.
diff --git a/mapbox/app/src/main/AndroidManifest.xml b/mapbox/app/src/main/AndroidManifest.xml
@@ -27,13 +27,6 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".directions.DirectionsV4Activity"
-            android:label="@string/title_directions_v4">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".MainActivity"/>
-        </activity>
         <activity
             android:name=".directions.DirectionsV5Activity"
             android:label="@string/title_directions_v5">

diff --git a/mapbox/app/src/main/java/com/mapbox/services/android/testapp/MainActivity.java b/mapbox/app/src/main/java/com/mapbox/services/android/testapp/MainActivity.java
@@ -13,7 +13,6 @@
 import android.widget.TextView;
 
 import com.mapbox.services.android.BuildConfig;
-import com.mapbox.services.android.testapp.directions.DirectionsV4Activity;
 import com.mapbox.services.android.testapp.directions.DirectionsV5Activity;
 import com.mapbox.services.android.testapp.directions.RouteUtilsV5Activity;
 import com.mapbox.services.android.testapp.distance.DistanceActivity;
@@ -69,11 +68,6 @@ protected void onCreate(Bundle savedInstanceState) {
         getString(R.string.description_route_utils),
         RouteUtilsV5Activity.class
       ),
-      new SampleItem(
-        getString(R.string.title_directions_v4),
-        getString(R.string.description_directions_v4),
-        DirectionsV4Activity.class
-      ),
       new SampleItem(
         getString(R.string.title_directions_icons),
         getString(R.string.description_directions_icons),

diff --git a/...java-services/src/main/java/com/mapbox/services/api/directions/v4/DirectionsCriteria.java b/...java-services/src/main/java/com/mapbox/services/api/directions/v4/DirectionsCriteria.java
diff --git a/...bjava-services/src/main/java/com/mapbox/services/api/directions/v4/DirectionsService.java b/...bjava-services/src/main/java/com/mapbox/services/api/directions/v4/DirectionsService.java