1 files changed, 10 insertions, 11 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 8c6ab3e211..d4ec95ce5c 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,9 +2,10 @@ package com.mapbox.mapboxsdk.testapp.utils;
 
 import android.support.annotation.NonNull;
 
-import timber.log.Timber;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
 
-import org.json.JSONObject;
+import timber.log.Timber;
 
 import static com.mapbox.mapboxsdk.testapp.activity.offline.OfflineActivity.JSON_CHARSET;
 import static com.mapbox.mapboxsdk.testapp.activity.offline.OfflineActivity.JSON_FIELD_REGION_NAME;
@@ -14,24 +15,22 @@ public class OfflineUtils {
   public static String convertRegionName(@NonNull byte[] metadata) {
     try {
       String json = new String(metadata, JSON_CHARSET);
-      JSONObject jsonObject = new JSONObject(json);
-      return jsonObject.getString(JSON_FIELD_REGION_NAME);
+      JsonObject jsonObject = new Gson().fromJson(json, JsonObject.class);
+      return jsonObject.get(JSON_FIELD_REGION_NAME).getAsString();
     } catch (Exception exception) {
       return null;
     }
   }
 
   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();
-      metadata = json.getBytes(JSON_CHARSET);
+      JsonObject jsonObject = new JsonObject();
+      jsonObject.addProperty(JSON_FIELD_REGION_NAME, regionName);
+      return jsonObject.toString().getBytes(JSON_CHARSET);
     } catch (Exception exception) {
-      Timber.e("Failed to encode metadata: " + exception.getMessage());
+      Timber.e(exception, "Failed to encode metadata: ");
     }
-    return metadata;
+    return null;
   }
 
 }