tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] Remove redundant arguments from offline native methods

Browse Source 
`this` is automatically provided as the first argument to a native method.
This commit is contained in:
John Firebaugh
2016-03-04 18:15:14 -08:00
parent 6aa8be56f6
commit c8b100ffe4
2 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java
View File

@@ -144,7 +144,7 @@ public class OfflineRegion {
* Register an observer to be notified when the state of the region changes.
*/
public void setObserver(@NonNull final OfflineRegionObserver observer) {
setOfflineRegionObserver(this, new OfflineRegionObserver() {
setOfflineRegionObserver(new OfflineRegionObserver() {
@Override
public void onStatusChanged(final OfflineRegionStatus status) {
getHandler().post(new Runnable() {
@@ -181,7 +181,7 @@ public class OfflineRegion {
* Pause or resume downloading of regional resources.
*/
public void setDownloadState(@DownloadState int state) {
setOfflineRegionDownloadState(this, state);
setOfflineRegionDownloadState(state);
}
/**
@@ -190,7 +190,7 @@ public class OfflineRegion {
* executed on the main thread.
*/
public void getStatus(@NonNull final OfflineRegionStatusCallback callback) {
getOfflineRegionStatus(this, new OfflineRegionStatusCallback() {
getOfflineRegionStatus(new OfflineRegionStatusCallback() {
@Override
public void onStatus(final OfflineRegionStatus status) {
getHandler().post(new Runnable() {
@@ -226,7 +226,7 @@ public class OfflineRegion {
* After you call this method, you may not call any additional methods on this object.
*/
public void delete(@NonNull final OfflineRegionDeleteCallback callback) {
deleteOfflineRegion(this, new OfflineRegionDeleteCallback() {
deleteOfflineRegion(new OfflineRegionDeleteCallback() {
@Override
public void onDelete() {
getHandler().post(new Runnable() {
@@ -254,8 +254,7 @@ public class OfflineRegion {
protected void finalize() {
try {
super.finalize();
destroyOfflineRegion(mOfflineRegionPtr);
mOfflineRegionPtr = 0;
destroyOfflineRegion();
} catch (Throwable throwable) {
Log.e(LOG_TAG, "Failed to finalize OfflineRegion: " + throwable.getMessage());
}
@@ -265,22 +264,18 @@ public class OfflineRegion {
* Native methods
*/
private native void destroyOfflineRegion(long offlineRegionPtr);
private native void destroyOfflineRegion();
private native void setOfflineRegionObserver(
OfflineRegion offlineRegion,
OfflineRegionObserver observerCallback);
private native void setOfflineRegionDownloadState(
OfflineRegion offlineRegion,
@DownloadState int offlineRegionDownloadState);
private native void getOfflineRegionStatus(
OfflineRegion offlineRegion,
OfflineRegionStatusCallback statusCallback);
private native void deleteOfflineRegion(
OfflineRegion offlineRegion,
OfflineRegionDeleteCallback deleteCallback);
}

21
platform/android/src/jni.cpp
View File

@@ -1469,7 +1469,7 @@ void setOfflineMapboxTileCountLimit(JNIEnv *env, jni::jobject* obj, jlong defaul
defaultFileSource->setOfflineMapboxTileCountLimit(limit);
}
void destroyOfflineRegion(JNIEnv *env, jni::jobject* offlineRegion_, jlong) {
void destroyOfflineRegion(JNIEnv *env, jni::jobject* offlineRegion_) {
mbgl::Log::Debug(mbgl::Event::JNI, "destroyOfflineRegion");
// Offline region
@@ -1486,10 +1486,11 @@ void destroyOfflineRegion(JNIEnv *env, jni::jobject* offlineRegion_, jlong) {
// Release the observer and delete the region
mbgl::OfflineRegion *offlineRegion = reinterpret_cast<mbgl::OfflineRegion *>(offlineRegionPtr);
defaultFileSource->setOfflineRegionObserver(*offlineRegion, nullptr);
jni::SetField<jlong>(*env, offlineRegion_, *offlineRegionPtrId, 0);
delete offlineRegion;
}
void setOfflineRegionObserver(JNIEnv *env, jni::jobject* obj, jni::jobject* offlineRegion_, jni::jobject* observerCallback) {
void setOfflineRegionObserver(JNIEnv *env, jni::jobject* offlineRegion_, jni::jobject* observerCallback) {
mbgl::Log::Debug(mbgl::Event::JNI, "setOfflineRegionObserver");
// Offline region
@@ -1601,7 +1602,7 @@ void setOfflineRegionObserver(JNIEnv *env, jni::jobject* obj, jni::jobject* offl
std::make_unique<Observer>(jni::NewGlobalRef(*env, observerCallback)));
}
void setOfflineRegionDownloadState(JNIEnv *env, jni::jobject* obj, jni::jobject* offlineRegion_, jint offlineRegionDownloadState) {
void setOfflineRegionDownloadState(JNIEnv *env, jni::jobject* offlineRegion_, jint offlineRegionDownloadState) {
mbgl::Log::Debug(mbgl::Event::JNI, "setOfflineRegionDownloadState");
// State
@@ -1628,7 +1629,7 @@ void setOfflineRegionDownloadState(JNIEnv *env, jni::jobject* obj, jni::jobject*
defaultFileSource->setOfflineRegionDownloadState(*offlineRegion, state);
}
void getOfflineRegionStatus(JNIEnv *env, jni::jobject* obj, jni::jobject* offlineRegion_, jni::jobject* statusCallback) {
void getOfflineRegionStatus(JNIEnv *env, jni::jobject* offlineRegion_, jni::jobject* statusCallback) {
mbgl::Log::Debug(mbgl::Event::JNI, "getOfflineRegionStatus");
// Offline region
@@ -1684,7 +1685,7 @@ void getOfflineRegionStatus(JNIEnv *env, jni::jobject* obj, jni::jobject* offlin
});
}
void deleteOfflineRegion(JNIEnv *env, jni::jobject* obj, jni::jobject* offlineRegion_, jni::jobject* deleteCallback) {
void deleteOfflineRegion(JNIEnv *env, jni::jobject* offlineRegion_, jni::jobject* deleteCallback) {
mbgl::Log::Debug(mbgl::Event::JNI, "deleteOfflineRegion");
// Offline region
@@ -1948,11 +1949,11 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) {
offlineRegionPtrId = &jni::GetFieldID(env, *offlineRegionClass, "mOfflineRegionPtr", "J");
jni::RegisterNatives(env, *offlineRegionClass,
MAKE_NATIVE_METHOD(destroyOfflineRegion, "(J)V"),
MAKE_NATIVE_METHOD(setOfflineRegionObserver, "(Lcom/mapbox/mapboxsdk/offline/OfflineRegion;Lcom/mapbox/mapboxsdk/offline/OfflineRegion$OfflineRegionObserver;)V"),
MAKE_NATIVE_METHOD(setOfflineRegionDownloadState, "(Lcom/mapbox/mapboxsdk/offline/OfflineRegion;I)V"),
MAKE_NATIVE_METHOD(getOfflineRegionStatus, "(Lcom/mapbox/mapboxsdk/offline/OfflineRegion;Lcom/mapbox/mapboxsdk/offline/OfflineRegion$OfflineRegionStatusCallback;)V"),
MAKE_NATIVE_METHOD(deleteOfflineRegion, "(Lcom/mapbox/mapboxsdk/offline/OfflineRegion;Lcom/mapbox/mapboxsdk/offline/OfflineRegion$OfflineRegionDeleteCallback;)V")
MAKE_NATIVE_METHOD(destroyOfflineRegion, "()V"),
MAKE_NATIVE_METHOD(setOfflineRegionObserver, "(Lcom/mapbox/mapboxsdk/offline/OfflineRegion$OfflineRegionObserver;)V"),
MAKE_NATIVE_METHOD(setOfflineRegionDownloadState, "(I)V"),
MAKE_NATIVE_METHOD(getOfflineRegionStatus, "(Lcom/mapbox/mapboxsdk/offline/OfflineRegion$OfflineRegionStatusCallback;)V"),
MAKE_NATIVE_METHOD(deleteOfflineRegion, "(Lcom/mapbox/mapboxsdk/offline/OfflineRegion$OfflineRegionDeleteCallback;)V")
);
// This needs to be updated once we support more than one type of region definition