From 8aa625bf96299583298fbd034dc702acf0f49882 Mon Sep 17 00:00:00 2001
From: Ivo van Dongen <info@ivovandongen.nl>
Date: Thu, 30 Mar 2017 14:53:59 +0300
Subject: [android] execute resource transform callback on the right thread

---
 platform/android/src/file_source.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'platform/android/src/file_source.cpp')

diff --git a/platform/android/src/file_source.cpp b/platform/android/src/file_source.cpp
index 30e1ff50fe..20715bf920 100644
--- a/platform/android/src/file_source.cpp
+++ b/platform/android/src/file_source.cpp
@@ -46,10 +46,10 @@ void FileSource::setResourceTransform(jni::JNIEnv& env, jni::Object<FileSource::
             // a subsequent call.
             // Note: we're converting it to shared_ptr because this lambda is converted to a std::function,
             // which requires copyability of its captured variables.
-            callback = std::shared_ptr<jni::jobject>(transformCallback.NewGlobalRef(env).release()->Get(), GenericGlobalRefDeleter()),
-            env
+            callback = std::shared_ptr<jni::jobject>(transformCallback.NewGlobalRef(env).release()->Get(), GenericGlobalRefDeleter())
         ](mbgl::Resource::Kind kind, std::string&& url_) {
-            return FileSource::ResourceTransformCallback::onURL(const_cast<jni::JNIEnv&>(env), jni::Object<FileSource::ResourceTransformCallback>(*callback), int(kind), url_);
+            android::UniqueEnv _env = android::AttachEnv();
+            return FileSource::ResourceTransformCallback::onURL(*_env, jni::Object<FileSource::ResourceTransformCallback>(*callback), int(kind), url_);
         });
     } else {
         // Reset the callback
-- 
cgit v1.2.1