From a8ebcb890c5bb4a5a91df88ff24b0e1bf3b3b2fe Mon Sep 17 00:00:00 2001
From: Peng Liu <peng.liu@mapbox.com>
Date: Thu, 13 Feb 2020 13:55:39 +0200
Subject: [PATCH] Revert "[sku] append sku token to offline download requests"
 (#173)

This reverts commit c275ad2e6d7c59b94d24179195cfbd423449c506.
---
 .../mapbox/mapboxsdk/http/HttpRequestUrl.java    | 16 +++++++---------
 .../mapboxsdk/module/http/HttpRequestUrlTest.kt  |  4 ++--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUrl.java b/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUrl.java
index c5e372772..2a85bdee8 100644
--- a/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUrl.java
+++ b/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUrl.java
@@ -6,8 +6,6 @@ import com.mapbox.mapboxsdk.Mapbox;
 
 public class HttpRequestUrl {
 
-  private static final StringBuilder requestBuilder = new StringBuilder();
-
   private HttpRequestUrl() {
   }
 
@@ -24,20 +22,20 @@ public class HttpRequestUrl {
    * @return the adapted resource url
    */
   public static String buildResourceUrl(@NonNull String host, String resourceUrl, int querySize, boolean offline) {
-    requestBuilder.setLength(0); // clear previous builder
-    requestBuilder.append(resourceUrl);
     if (isValidMapboxEndpoint(host)) {
       if (querySize == 0) {
-        requestBuilder.append("?");
+        resourceUrl = resourceUrl + "?";
       } else {
-        requestBuilder.append("&");
+        resourceUrl = resourceUrl + "&";
       }
+      // Only add SKU token to requests not tagged as "offline" usage.
       if (offline) {
-        requestBuilder.append("offline=true&");
+        resourceUrl = resourceUrl + "offline=true";
+      } else {
+        resourceUrl = resourceUrl + "sku=" + Mapbox.getSkuToken();
       }
-      requestBuilder.append("sku=").append(Mapbox.getSkuToken());
     }
-    return requestBuilder.toString();
+    return resourceUrl;
   }
 
   /**
diff --git a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/http/HttpRequestUrlTest.kt b/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/http/HttpRequestUrlTest.kt
index a50870f23..5db7b0b0f 100644
--- a/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/module/http/HttpRequestUrlTest.kt
+++ b/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?offline=true&sku=foobar"
+    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?offline=true&sku=foobar"
+    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)
   }