diff options
| author | Ivo van Dongen <info@ivovandongen.nl> | 2016-11-15 19:53:47 +0100 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-11-17 01:04:17 +0100 |
| commit | e6c28d4f62d30d59644822cd92922e57ad8b9add (patch) | |
| tree | 80b3ff12cfad746077e01471afb95980a9f2451e | |
| parent | e89af2f8977403986098de6d1687c9bee1ffd735 (diff) | |
| download | qtlocation-mapboxgl-e6c28d4f62d30d59644822cd92922e57ad8b9add.tar.gz | |
[android] remove redundant assertions
| -rwxr-xr-x | platform/android/src/jni.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp index 134b72a5e9..90a3c4e19e 100755 --- a/platform/android/src/jni.cpp +++ b/platform/android/src/jni.cpp @@ -1264,7 +1264,6 @@ void listOfflineRegions(JNIEnv *env, jni::jobject* obj, jlong defaultFileSourceP defaultFileSource->listOfflineRegions([obj, defaultFileSourcePtr, listCallback](std::exception_ptr error, mbgl::optional<std::vector<mbgl::OfflineRegion>> regions) mutable { // Reattach, the callback comes from a different thread - assert(theJVM != nullptr); JNIEnv *env2; jboolean renderDetach = attach_jni_thread(theJVM, &env2, "Offline Thread"); if (renderDetach) { @@ -1356,7 +1355,6 @@ void createOfflineRegion(JNIEnv *env, jni::jobject* obj, jlong defaultFileSource // Reattach, the callback comes from a different thread JNIEnv *env2; - assert(theJVM != nullptr); jboolean renderDetach = attach_jni_thread(theJVM, &env2, "Offline Thread"); if (renderDetach) { mbgl::Log::Debug(mbgl::Event::JNI, "Attached."); @@ -1448,7 +1446,6 @@ void setOfflineRegionObserver(JNIEnv *env, jni::jobject* offlineRegion_, jni::jo mbgl::Log::Debug(mbgl::Event::JNI, "~Observer()"); // Env JNIEnv* env2; - assert(theJVM != nullptr); jboolean renderDetach = attach_jni_thread(theJVM, &env2, "Offline Thread"); jni::DeleteGlobalRef(*env2, std::move(observerCallback)); detach_jni_thread(theJVM, &env2, renderDetach); @@ -1457,7 +1454,6 @@ void setOfflineRegionObserver(JNIEnv *env, jni::jobject* offlineRegion_, jni::jo void statusChanged(mbgl::OfflineRegionStatus status) override { // Env JNIEnv* env2; - assert(theJVM != nullptr); jboolean renderDetach = attach_jni_thread(theJVM, &env2, "Offline Thread"); // Conver to jint @@ -1493,7 +1489,6 @@ void setOfflineRegionObserver(JNIEnv *env, jni::jobject* offlineRegion_, jni::jo void responseError(mbgl::Response::Error error) override { // Env JNIEnv* env2; - assert(theJVM != nullptr); jboolean renderDetach = attach_jni_thread(theJVM, &env2, "Offline Thread"); // Handle the value of reason independently of the underlying int value @@ -1533,7 +1528,6 @@ void setOfflineRegionObserver(JNIEnv *env, jni::jobject* offlineRegion_, jni::jo void mapboxTileCountLimitExceeded(uint64_t limit) override { // Env JNIEnv* env2; - assert(theJVM != nullptr); jboolean renderDetach = attach_jni_thread(theJVM, &env2, "Offline Thread"); // Send limit @@ -1592,7 +1586,6 @@ void getOfflineRegionStatus(JNIEnv *env, jni::jobject* offlineRegion_, jni::jobj // Reattach, the callback comes from a different thread JNIEnv *env2; - assert(theJVM != nullptr); jboolean renderDetach = attach_jni_thread(theJVM, &env2, "Offline Thread"); if (renderDetach) { mbgl::Log::Debug(mbgl::Event::JNI, "Attached."); @@ -1647,7 +1640,6 @@ void deleteOfflineRegion(JNIEnv *env, jni::jobject* offlineRegion_, jni::jobject // Reattach, the callback comes from a different thread JNIEnv *env2; - assert(theJVM != nullptr); jboolean renderDetach = attach_jni_thread(theJVM, &env2, "Offline Thread"); if (renderDetach) { mbgl::Log::Debug(mbgl::Event::JNI, "Attached."); @@ -1691,7 +1683,6 @@ void updateOfflineRegionMetadata(JNIEnv *env, jni::jobject* offlineRegion_, jni: defaultFileSource->updateOfflineMetadata(id, metadata, [updateCallback] (std::exception_ptr error, mbgl::optional<mbgl::OfflineRegionMetadata> data) mutable { // Reattach, the callback comes from a different thread JNIEnv *env2; - assert(theJVM != nullptr); jboolean renderDetach = attach_jni_thread(theJVM, &env2, "Offline Thread"); if (renderDetach) { mbgl::Log::Debug(mbgl::Event::JNI, "Attached."); @@ -1719,7 +1710,6 @@ namespace mbgl { namespace android { void registerNatives(JavaVM *vm) { - assert(vm != nullptr); theJVM = vm; jni::JNIEnv& env = jni::GetEnv(*vm, jni::jni_version_1_6); |