diff options
| author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2020-02-27 11:39:01 +0200 |
|---|---|---|
| committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2020-02-27 12:21:50 +0200 |
| commit | 382a6000da3e77fe32da060380b584a548c2e2dd (patch) | |
| tree | 2ad662dda93489047499fca6be37ee939783dc5c /platform/android/src/file_source.cpp | |
| parent | 56616ad4ec15e08dc49fd5c24f9c6026058055af (diff) | |
| download | qtlocation-mapboxgl-upstream/mikhail_improve_DatabaseFileSource_API.tar.gz | |
[glfw][android][darwin] Access DatabaseFileSource only with JointDatabaseStorage interfaceupstream/mikhail_improve_DatabaseFileSource_API
Diffstat (limited to 'platform/android/src/file_source.cpp')
| -rw-r--r-- | platform/android/src/file_source.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/platform/android/src/file_source.cpp b/platform/android/src/file_source.cpp index f95066546a..c8e57e66ff 100644 --- a/platform/android/src/file_source.cpp +++ b/platform/android/src/file_source.cpp @@ -41,8 +41,7 @@ FileSource::FileSource(jni::JNIEnv& _env, const jni::String& accessToken, const // TODO: Split Android FileSource API to smaller interfaces resourceLoader = mbgl::FileSourceManager::get()->getFileSource(mbgl::FileSourceType::ResourceLoader, resourceOptions); - databaseSource = std::static_pointer_cast<mbgl::DatabaseFileSource>(std::shared_ptr<mbgl::FileSource>( - mbgl::FileSourceManager::get()->getFileSource(mbgl::FileSourceType::Database, resourceOptions))); + databaseStorage = mbgl::FileSourceManager::get()->getDatabaseStorage(resourceOptions); onlineSource = mbgl::FileSourceManager::get()->getFileSource(mbgl::FileSourceType::Network, resourceOptions); } @@ -110,7 +109,7 @@ void FileSource::setResourceTransform(jni::JNIEnv& env, const jni::Object<FileSo void FileSource::setResourceCachePath(jni::JNIEnv& env, const jni::String& path, const jni::Object<FileSource::ResourcesCachePathChangeCallback>& _callback) { - if (!databaseSource) { + if (!databaseStorage) { ThrowNew(env, jni::FindClass(env, "java/lang/IllegalStateException"), "Offline functionality is disabled."); return; } @@ -132,7 +131,7 @@ void FileSource::setResourceCachePath(jni::JNIEnv& env, pathChangeCallback = {}; }); - databaseSource->setDatabasePath(newPath + DATABASE_FILE, pathChangeCallback); + databaseStorage->setDatabasePath(newPath + DATABASE_FILE, pathChangeCallback); } void FileSource::resume(jni::JNIEnv&) { |