[android] Simplify offline metadata API on Android

Fixes #4139

3 files changed, 10 insertions, 44 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java
index b56ecfc057..e632bcd765 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java
@@ -126,7 +126,7 @@ public class OfflineManager {
      */
     public void createOfflineRegion(
             @NonNull OfflineRegionDefinition definition,
-            @NonNull OfflineRegionMetadata metadata,
+            @NonNull byte[] metadata,
             @NonNull final CreateOfflineRegionCallback callback) {
 
         createOfflineRegion(mDefaultFileSourcePtr, definition, metadata, new CreateOfflineRegionCallback() {
@@ -176,7 +176,7 @@ public class OfflineManager {
 
     private native void createOfflineRegion(
             long defaultFileSourcePtr, OfflineRegionDefinition definition,
-            OfflineRegionMetadata metadata, CreateOfflineRegionCallback callback);
+            byte[] metadata, CreateOfflineRegionCallback callback);
 
     private native void setOfflineMapboxTileCountLimit(
             long defaultFileSourcePtr, long limit);
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 9e518f1e6a..0f05549338 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
@@ -23,7 +23,13 @@ public class OfflineRegion {
     // Members
     private long mId = 0;
     private OfflineRegionDefinition mDefinition = null;
-    private OfflineRegionMetadata mMetadata = null;
+
+    /**
+     * Arbitrary binary region metadata. The contents are opaque to the SDK implementation;
+     * it just stores and retrieves a byte[]. Check the `OfflineActivity` in the TestApp
+     * for a sample implementation that uses JSON to store an offline region name.
+     */
+    private byte[] mMetadata = null;
 
     // Holds the pointer to JNI OfflineRegion
     private long mOfflineRegionPtr = 0;
@@ -122,7 +128,7 @@ public class OfflineRegion {
         return mDefinition;
     }
 
-    public OfflineRegionMetadata getMetadata() {
+    public byte[] getMetadata() {
         return mMetadata;
     }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionMetadata.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionMetadata.java
deleted file mode 100644
index d4445ca037..0000000000
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegionMetadata.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.mapbox.mapboxsdk.offline;
-
-/**
- * Arbitrary binary region metadata. The contents are opaque to the SDK implementation;
- * it just stores and retrieves a byte[].
- */
-public class OfflineRegionMetadata {
-
-    private byte[] metadata;
-
-    /*
-     * Constructor
-     */
-
-    public OfflineRegionMetadata(byte[] metadata) {
-        this.metadata = metadata;
-    }
-
-    /*
-     * Getters and setters
-     */
-
-    public byte[] getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(byte[] metadata) {
-        this.metadata = metadata;
-    }
-
-    /*
-     * Overrides
-     */
-
-    @Override
-    public String toString() {
-        return "OfflineRegionMetadata{metadata=" + metadata + "}";
-    }
-
-}