diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline')
3 files changed, 7 insertions, 15 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition.java index 4fa15602ba..73e277dda3 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineGeometryRegionDefinition.java @@ -4,8 +4,6 @@ import android.os.Parcel; import android.os.Parcelable; import android.support.annotation.Keep; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import com.mapbox.geojson.Feature; import com.mapbox.geojson.Geometry; import com.mapbox.mapboxsdk.geometry.LatLngBounds; @@ -26,7 +24,6 @@ public class OfflineGeometryRegionDefinition implements OfflineRegionDefinition, @Keep private String styleURL; - @Nullable @Keep private Geometry geometry; @Keep @@ -77,7 +74,6 @@ public class OfflineGeometryRegionDefinition implements OfflineRegionDefinition, return styleURL; } - @Nullable public Geometry getGeometry() { return geometry; } @@ -87,7 +83,6 @@ public class OfflineGeometryRegionDefinition implements OfflineRegionDefinition, * to retain backwards compatibility * @return the {@link LatLngBounds} or null */ - @Nullable @Override public LatLngBounds getBounds() { if (geometry == null) { @@ -120,7 +115,7 @@ public class OfflineGeometryRegionDefinition implements OfflineRegionDefinition, } @Override - public void writeToParcel(@NonNull Parcel dest, int flags) { + public void writeToParcel(Parcel dest, int flags) { dest.writeString(styleURL); dest.writeString(Feature.fromGeometry(geometry).toJson()); dest.writeDouble(minZoom); @@ -129,7 +124,7 @@ public class OfflineGeometryRegionDefinition implements OfflineRegionDefinition, } public static final Creator CREATOR = new Creator() { - public OfflineGeometryRegionDefinition createFromParcel(@NonNull Parcel in) { + public OfflineGeometryRegionDefinition createFromParcel(Parcel in) { return new OfflineGeometryRegionDefinition(in); } 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 a6926d1c9f..c70db4f717 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 @@ -161,7 +161,7 @@ public class OfflineManager { * @param context the context used to host the offline manager * @return the single instance of offline manager */ - public static synchronized OfflineManager getInstance(@NonNull Context context) { + public static synchronized OfflineManager getInstance(Context context) { if (instance == null) { instance = new OfflineManager(context); } @@ -267,9 +267,7 @@ public class OfflineManager { } private static final class CopyTempDatabaseFileTask extends AsyncTask<Object, Void, Object> { - @NonNull private final WeakReference<OfflineManager> offlineManagerWeakReference; - @NonNull private final WeakReference<MergeOfflineRegionsCallback> callbackWeakReference; CopyTempDatabaseFileTask(OfflineManager offlineManager, MergeOfflineRegionsCallback callback) { @@ -307,7 +305,7 @@ public class OfflineManager { } } - private static void copyTempDatabaseFile(@NonNull File sourceFile, File destFile) throws IOException { + private static void copyTempDatabaseFile(File sourceFile, File destFile) throws IOException { if (!destFile.exists() && !destFile.createNewFile()) { throw new IOException("Unable to copy database file for merge."); } @@ -382,7 +380,7 @@ public class OfflineManager { * @param callback the callback to be invoked */ public void createOfflineRegion(@NonNull OfflineRegionDefinition definition, @NonNull byte[] metadata, - @NonNull final CreateOfflineRegionCallback callback) { + final CreateOfflineRegionCallback callback) { if (!isValidOfflineRegionDefinition(definition)) { callback.onError( String.format(context.getString(R.string.mapbox_offline_error_region_definition_invalid), diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineTilePyramidRegionDefinition.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineTilePyramidRegionDefinition.java index 57fc8298f4..b0d12859ed 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineTilePyramidRegionDefinition.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineTilePyramidRegionDefinition.java @@ -4,7 +4,6 @@ import android.os.Parcel; import android.os.Parcelable; import android.support.annotation.Keep; -import android.support.annotation.NonNull; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.geometry.LatLngBounds; @@ -102,7 +101,7 @@ public class OfflineTilePyramidRegionDefinition implements OfflineRegionDefiniti } @Override - public void writeToParcel(@NonNull Parcel dest, int flags) { + public void writeToParcel(Parcel dest, int flags) { dest.writeString(styleURL); dest.writeDouble(bounds.getLatNorth()); dest.writeDouble(bounds.getLonEast()); @@ -114,7 +113,7 @@ public class OfflineTilePyramidRegionDefinition implements OfflineRegionDefiniti } public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { - public OfflineTilePyramidRegionDefinition createFromParcel(@NonNull Parcel in) { + public OfflineTilePyramidRegionDefinition createFromParcel(Parcel in) { return new OfflineTilePyramidRegionDefinition(in); } |