test / debug downstream https://github.com/mapbox/mapbox-navigation-android/pull/1895 in gl-native

5 files changed, 37 insertions, 1 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java
index 863219854b..1411699fd5 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java
@@ -267,6 +267,7 @@ public class OfflineRegion {
             @Override
             public void run() {
               if (observer != null) {
+                System.out.println("DEBUG " + status.getCompletedResourceCount() + "/" + status.getRequiredResourceCount() + " resources; " + status.getCompletedResourceSize() + " bytes downloaded.");
                 observer.onStatusChanged(status);
               }
             }
@@ -281,6 +282,7 @@ public class OfflineRegion {
             @Override
             public void run() {
               if (observer != null) {
+                System.out.println("DEBUG onError " + error);
                 observer.onError(error);
               }
             }
@@ -295,6 +297,7 @@ public class OfflineRegion {
             @Override
             public void run() {
               if (observer != null) {
+                System.out.println("DEBUG mapboxTileCountLimitExceeded");
                 observer.mapboxTileCountLimitExceeded(limit);
               }
             }
diff --git a/platform/android/MapboxGLDownstreamTestApp/build.gradle b/platform/android/MapboxGLDownstreamTestApp/build.gradle
index 9046bb2788..8c2cda829e 100644
--- a/platform/android/MapboxGLDownstreamTestApp/build.gradle
+++ b/platform/android/MapboxGLDownstreamTestApp/build.gradle
@@ -44,9 +44,11 @@ android {
 
 dependencies {
     api(project(':MapboxGLAndroidSDK'))
-    implementation("com.mapbox.mapboxsdk:mapbox-android-navigation-ui:0.34.0") {
+    implementation("com.mapbox.mapboxsdk:mapbox-android-navigation-ui:0.37.0-20190424.152733-3") {
         exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-sdk'
+        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-navigation'
     }
+    implementation "com.mapbox.mapboxsdk:mapbox-android-navigation:0.37.0-20190424.152701-3"
 
     // Butter Knife
     implementation "com.jakewharton:butterknife:8.8.1"
diff --git a/platform/android/MapboxGLDownstreamTestApp/src/main/AndroidManifest.xml b/platform/android/MapboxGLDownstreamTestApp/src/main/AndroidManifest.xml
index f62d77f83d..6dc3e80008 100644
--- a/platform/android/MapboxGLDownstreamTestApp/src/main/AndroidManifest.xml
+++ b/platform/android/MapboxGLDownstreamTestApp/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.mapbox.mapboxsdk.downstream.testapp">
 
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/platform/android/MapboxGLDownstreamTestApp/src/main/java/com/mapbox/mapboxsdk/downstream/testapp/NavigationLauncherActivity.java b/platform/android/MapboxGLDownstreamTestApp/src/main/java/com/mapbox/mapboxsdk/downstream/testapp/NavigationLauncherActivity.java
index 0c04625696..8b067ac8dd 100644
--- a/platform/android/MapboxGLDownstreamTestApp/src/main/java/com/mapbox/mapboxsdk/downstream/testapp/NavigationLauncherActivity.java
+++ b/platform/android/MapboxGLDownstreamTestApp/src/main/java/com/mapbox/mapboxsdk/downstream/testapp/NavigationLauncherActivity.java
@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.location.Location;
 import android.os.Bundle;
+import android.os.Environment;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -26,6 +27,7 @@ import com.mapbox.api.directions.v5.DirectionsCriteria;
 import com.mapbox.api.directions.v5.models.DirectionsResponse;
 import com.mapbox.api.directions.v5.models.DirectionsRoute;
 import com.mapbox.core.constants.Constants;
+import com.mapbox.core.utils.TextUtils;
 import com.mapbox.geojson.LineString;
 import com.mapbox.geojson.Point;
 import com.mapbox.mapboxsdk.Mapbox;
@@ -49,6 +51,7 @@ import com.mapbox.services.android.navigation.ui.v5.route.OnRouteSelectionChange
 import com.mapbox.services.android.navigation.v5.navigation.NavigationRoute;
 import com.mapbox.services.android.navigation.v5.utils.LocaleUtils;
 
+import java.io.File;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
@@ -61,6 +64,8 @@ import retrofit2.Call;
 import retrofit2.Response;
 import timber.log.Timber;
 
+import static android.os.Environment.getExternalStoragePublicDirectory;
+
 public class NavigationLauncherActivity extends AppCompatActivity implements OnMapReadyCallback,
   MapboxMap.OnMapLongClickListener, OnRouteSelectionChangeListener {
 
@@ -264,6 +269,7 @@ public class NavigationLauncherActivity extends AppCompatActivity implements OnM
       .getRoute(new SimplifiedCallback() {
         @Override
         public void onResponse(Call<DirectionsResponse> call, Response<DirectionsResponse> response) {
+          System.out.println("PGS url " + call.request().url().toString());
           if (validRouteResponse(response)) {
             hideLoading();
             route = response.body().routes().get(0);
@@ -320,6 +326,16 @@ public class NavigationLauncherActivity extends AppCompatActivity implements OnM
     );
   }
 
+  private String obtainOfflinePath() {
+    File offline = getExternalStoragePublicDirectory("Offline");
+    return offline.getAbsolutePath();
+  }
+
+  private String retrieveOfflineVersionFromPreferences() {
+    SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+    return sharedPreferences.getString(getString(R.string.offline_version_key), "");
+  }
+
   private void launchNavigationWithRoute() {
     if (route == null) {
       Snackbar.make(mapView, R.string.error_route_not_available, Snackbar.LENGTH_SHORT).show();
@@ -334,6 +350,18 @@ public class NavigationLauncherActivity extends AppCompatActivity implements OnM
       .build();
     optionsBuilder.initialMapCameraPosition(initialPosition);
     optionsBuilder.directionsRoute(route);
+    String offlinePath = obtainOfflinePath();
+    if (!TextUtils.isEmpty(offlinePath)) {
+      optionsBuilder.offlineRoutingTilesPath(offlinePath);
+    }
+    String offlineVersion = retrieveOfflineVersionFromPreferences();
+    if (!offlineVersion.isEmpty()) {
+      optionsBuilder.offlineRoutingTilesVersion(offlineVersion);
+    }
+    // TODO Testing merging previously sideloaded region
+    optionsBuilder.offlineMapDatabasePath(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS) + "/" + "kingfarm_to_rockville.db");
+    // TODO Testing merging previously downloaded region
+    // optionsBuilder.offlineMapDatabasePath(getFilesDir().getPath() + "/" + "mbgl-offline.db");
     NavigationLauncher.startNavigation(this, optionsBuilder.build());
   }
 
diff --git a/platform/android/build.gradle b/platform/android/build.gradle
index 947e5adb1a..5090926746 100644
--- a/platform/android/build.gradle
+++ b/platform/android/build.gradle
@@ -18,6 +18,7 @@ buildscript {
 
 allprojects {
     repositories {
+        maven { url "http://oss.sonatype.org/content/repositories/snapshots/" }
         mavenCentral()
         google()
         jcenter()