summaryrefslogtreecommitdiff
path: root/platform/android/src/file_source.hpp
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2019-03-19 16:57:36 +0200
committerAlf Watt <alf.watt@mapbox.com>2019-03-21 12:25:12 -0700
commitba6dfea248b6fc5224c840ea536ac7abf57d80f1 (patch)
tree9ad248db128b3d1847985efb5c79bf13a4d56d36 /platform/android/src/file_source.hpp
parent15c6dbe967f4150a0d9f555781c7e353ecf20043 (diff)
downloadqtlocation-mapboxgl-ba6dfea248b6fc5224c840ea536ac7abf57d80f1.tar.gz
[core] Remove file source from public Map ctor
Diffstat (limited to 'platform/android/src/file_source.hpp')
-rw-r--r--platform/android/src/file_source.hpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/platform/android/src/file_source.hpp b/platform/android/src/file_source.hpp
index 575702120e..3001a5e0f0 100644
--- a/platform/android/src/file_source.hpp
+++ b/platform/android/src/file_source.hpp
@@ -1,6 +1,7 @@
#pragma once
#include <mbgl/storage/default_file_source.hpp>
+#include <mbgl/storage/resource_options.hpp>
#include "asset_manager.hpp"
@@ -49,15 +50,16 @@ public:
static FileSource* getNativePeer(jni::JNIEnv&, const jni::Object<FileSource>&);
- static mbgl::DefaultFileSource& getDefaultFileSource(jni::JNIEnv&, const jni::Object<FileSource>&);
+ static mbgl::ResourceOptions getSharedResourceOptions(jni::JNIEnv&, const jni::Object<FileSource>&);
static void registerNative(jni::JNIEnv&);
private:
const std::string DATABASE_FILE = "/mbgl-offline.db";
optional<int> activationCounter;
+ mbgl::ResourceOptions resourceOptions;
std::unique_ptr<Actor<ResourceTransform>> resourceTransform;
- std::unique_ptr<mbgl::DefaultFileSource> fileSource;
+ std::shared_ptr<mbgl::DefaultFileSource> fileSource;
};