Skip to content

Do not capture this in Android GeoJSONSource #3976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Do not capture this in Android GeoJSONSource #3976

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions platform/android/MapLibreAndroid/src/cpp/style/sources/geojson_source.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,9 @@ GeoJSONSource::~GeoJSONSource() = default;
void GeoJSONSource::setGeoJSONString(jni::JNIEnv& env, const jni::String& jString) {
std::shared_ptr<std::string> json = std::make_shared<std::string>(jni::Make<std::string>(env, jString));

Update::Converter converterFn = [this, json](ActorRef<GeoJSONDataCallback> _callback) {
converter->self().invoke(&FeatureConverter::convertJson, json, _callback);
ActorRef<FeatureConverter> converterRef = converter->self();
Update::Converter converterFn = [converterRef, json](ActorRef<GeoJSONDataCallback> _callback) {
converterRef.invoke(&FeatureConverter::convertJson, json, _callback);
};

setAsync(converterFn);
Expand All @@ -72,8 +73,9 @@ void GeoJSONSource::setGeoJSONString(jni::JNIEnv& env, const jni::String& jStrin
void GeoJSONSource::setGeoJSONStringSync(jni::JNIEnv& env, const jni::String& jString) {
std::shared_ptr<std::string> json = std::make_shared<std::string>(jni::Make<std::string>(env, jString));

Update::Converter converterFn = [this, json](ActorRef<GeoJSONDataCallback> _callback) {
converter->self().ask(&FeatureConverter::convertJson, json, _callback).wait();
ActorRef<FeatureConverter> converterRef = converter->self();
Update::Converter converterFn = [converterRef, json](ActorRef<GeoJSONDataCallback> _callback) {
converterRef.ask(&FeatureConverter::convertJson, json, _callback).wait();
};

setAsync(converterFn);
Expand Down Expand Up @@ -193,8 +195,9 @@ void GeoJSONSource::setCollectionAsync(jni::JNIEnv& env, const jni::Object<JNITy
auto global = jni::NewGlobal<jni::EnvAttachingDeleter>(env, jObject);
auto object = std::make_shared<decltype(global)>(std::move(global));

Update::Converter converterFn = [this, object](ActorRef<GeoJSONDataCallback> _callback) {
converter->self().invoke(&FeatureConverter::convertObject<JNIType>, object, _callback);
ActorRef<FeatureConverter> converterRef = converter->self();
Update::Converter converterFn = [converterRef, object](ActorRef<GeoJSONDataCallback> _callback) {
converterRef.invoke(&FeatureConverter::convertObject<JNIType>, object, _callback);
};

setAsync(converterFn);
Expand Down Expand Up @@ -235,8 +238,9 @@ void GeoJSONSource::setCollectionSync(jni::JNIEnv& env, const jni::Object<JNITyp
auto global = jni::NewGlobal<jni::EnvAttachingDeleter>(env, jObject);
auto object = std::make_shared<decltype(global)>(std::move(global));

Update::Converter converterFn = [this, object](ActorRef<GeoJSONDataCallback> _callback) {
converter->self().ask(&FeatureConverter::convertObject<JNIType>, object, _callback).wait();
ActorRef<FeatureConverter> converterRef = converter->self();
Update::Converter converterFn = [converterRef, object](ActorRef<GeoJSONDataCallback> _callback) {
converterRef.ask(&FeatureConverter::convertObject<JNIType>, object, _callback).wait();
};

setAsync(converterFn);
Expand Down
Loading