1 files changed, 7 insertions, 6 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/OfflineUtils.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/OfflineUtils.java
index 4be0d6ea84..a22eac26e9 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/OfflineUtils.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/utils/OfflineUtils.java
@@ -2,7 +2,7 @@ package com.mapbox.mapboxsdk.testapp.utils;
 
 import android.support.annotation.NonNull;
 
-import org.json.JSONObject;
+import com.google.gson.JsonObject;
 
 import timber.log.Timber;
 
@@ -13,9 +13,10 @@ public class OfflineUtils {
 
   public static String convertRegionName(@NonNull byte[] metadata) {
     try {
+      JsonObject jsonObject = new JsonObject();
       String json = new String(metadata, JSON_CHARSET);
-      JSONObject jsonObject = new JSONObject(json);
-      return jsonObject.getString(JSON_FIELD_REGION_NAME);
+      jsonObject.addProperty(JSON_FIELD_REGION_NAME, json);
+      return jsonObject.getAsString();
     } catch (Exception exception) {
       return null;
     }
@@ -24,9 +25,9 @@ public class OfflineUtils {
   public static byte[] convertRegionName(String regionName) {
     byte[] metadata = null;
     try {
-      JSONObject jsonObject = new JSONObject();
-      jsonObject.put(JSON_FIELD_REGION_NAME, regionName);
-      String json = jsonObject.toString();
+      JsonObject jsonObject = new JsonObject();
+      jsonObject.addProperty(JSON_FIELD_REGION_NAME, regionName);
+      String json = jsonObject.getAsString();
       metadata = json.getBytes(JSON_CHARSET);
     } catch (Exception exception) {
       Timber.e(exception, "Failed to encode metadata: ");