[android] adjusted HttpRequestUrl to partition offline from SKU

2 files changed, 9 insertions, 6 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUrl.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUrl.java
index 706f57ce9c..f53040f399 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUrl.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUrl.java
@@ -10,7 +10,10 @@ public class HttpRequestUrl {
   }
 
   /**
-   * Adapts a resource request url based on the host and query size.
+   * Adapts a resource request url based on the host, query size, and offline requirement.
+   * The Maps SDK SKU token is not included with offline tile requests because offline requests
+   * are counted as billable Vector Tile API requests. The offline tile requests are considered
+   * raster Tile API requests if satellite imagery is being fetched.
    *
    * @param host        the host used as endpoint
    * @param resourceUrl the resource to download
@@ -25,10 +28,10 @@ public class HttpRequestUrl {
       } else {
         resourceUrl = resourceUrl + "&";
       }
-      resourceUrl = resourceUrl + "sku=" + Mapbox.getSkuToken();
-
       if (offline) {
-        resourceUrl = resourceUrl + "&offline=true";
+        resourceUrl = resourceUrl + "offline=true";
+      } else {
+        resourceUrl = resourceUrl + "sku=" + Mapbox.getSkuToken();
       }
     }
     return resourceUrl;
diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/http/HttpRequestUrlTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/http/HttpRequestUrlTest.kt
index 994a41938b..5db7b0b0f9 100644
--- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/http/HttpRequestUrlTest.kt
+++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/http/HttpRequestUrlTest.kt
@@ -20,14 +20,14 @@ class HttpRequestUrlTest {
 
   @Test
   fun testOfflineFlagMapboxCom() {
-    val expected = "http://mapbox.com/path/of/no/return.pbf?sku=foobar&offline=true"
+    val expected = "http://mapbox.com/path/of/no/return.pbf?offline=true"
     val actual = HttpRequestUrl.buildResourceUrl("mapbox.com", "http://mapbox.com/path/of/no/return.pbf", 0, true)
     assertEquals(expected, actual)
   }
 
   @Test
   fun testOfflineFlagMapboxCn() {
-    val expected = "http://mapbox.cn/path/of/no/return.pbf?sku=foobar&offline=true"
+    val expected = "http://mapbox.cn/path/of/no/return.pbf?offline=true"
     val actual = HttpRequestUrl.buildResourceUrl("mapbox.cn", "http://mapbox.cn/path/of/no/return.pbf", 0, true)
     assertEquals(expected, actual)
   }