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

[androd] - add weak references checks to all jni callbacks

Browse Source
This commit is contained in:
Tobrun
2018-12-12 13:02:14 +01:00
committed by Tobrun
parent e94a7fc405
commit aedbdc21d0
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platform/android/src/native_map_view.cpp
View File

@@ -225,7 +225,10 @@ void NativeMapView::onDidBecomeIdle() {
android::UniqueEnv _env = android::AttachEnv();
static auto& javaClass = jni::Class<NativeMapView>::Singleton(*_env);
static auto onDidBecomeIdle = javaClass.GetMethod<void ()>(*_env, "onDidBecomeIdle");
javaPeer.get(*_env).Call(*_env, onDidBecomeIdle);
auto weakReference = javaPeer.get(*_env);
if (weakReference) {
weakReference.Call(*_env, onDidBecomeIdle);
}
}
void NativeMapView::onDidFinishLoadingStyle() {
@@ -501,7 +504,10 @@ void NativeMapView::scheduleSnapshot(jni::JNIEnv&) {
// invoke Mapview#OnSnapshotReady
static auto& javaClass = jni::Class<NativeMapView>::Singleton(*_env);
static auto onSnapshotReady = javaClass.GetMethod<void (jni::Object<Bitmap>)>(*_env, "onSnapshotReady");
javaPeer.get(*_env).Call(*_env, onSnapshotReady, bitmap);
auto weakReference = javaPeer.get(*_env);
if (weakReference) {
weakReference.Call(*_env, onSnapshotReady, bitmap);
}
});
}