Refactor NativeMapView to hold std::unique_ptr to Map and DefaultFileSource

Add missing asserts to attach_jni_thread/detach_jni_thread
Fixes #2406

1 files changed, 2 insertions, 2 deletions

diff --git a/include/mbgl/android/native_map_view.hpp b/include/mbgl/android/native_map_view.hpp
index 0a4e856db4..fe619ba6f2 100644
--- a/include/mbgl/android/native_map_view.hpp
+++ b/include/mbgl/android/native_map_view.hpp
@@ -91,8 +91,8 @@ private:
 
     // Ensure these are initialised last
     std::shared_ptr<mbgl::SQLiteCache> fileCache;
-    mbgl::DefaultFileSource fileSource;
-    mbgl::Map map;
+    std::unique_ptr<mbgl::DefaultFileSource> fileSource;
+    std::unique_ptr<mbgl::Map> map;
 
     std::atomic_flag clean = ATOMIC_FLAG_INIT;
 };