[android] Simplify offline metadata API on Android

Fixes #4139
This commit is contained in:
Antonio Zugaldia
2016-02-29 13:44:44 -05:00
parent bef7fe76ff
commit 55cacfafd4
7 changed files with 41 additions and 122 deletions

View File

@@ -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);

View File

@@ -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;
}

View File

@@ -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 + "}";
}
}