diff options
| author | Wilhelm Berg <wb@BergWerk-GIS.at> | 2018-09-12 15:07:57 +0200 |
|---|---|---|
| committer | Wilhelm Berg <wb@BergWerk-GIS.at> | 2018-09-12 15:07:57 +0200 |
| commit | 98b34cb0dbf5c50d7f319724c93021418140b15f (patch) | |
| tree | 11cd51f86b5c672dda6bfe087f40f77df1553971 /platform/android/src/file_source.hpp | |
| parent | ee17d79f9420eb859303d977955454dacc470db6 (diff) | |
| parent | 079ba0209ed383c15123902f0810e658c2b0abf4 (diff) | |
| download | qtlocation-mapboxgl-upstream/bwg-vs2017.tar.gz | |
Merge remote-tracking branch 'origin' into bwg-vs2017upstream/bwg-vs2017
# Conflicts:
# cmake/mason-dependencies.cmake
Diffstat (limited to 'platform/android/src/file_source.hpp')
| -rw-r--r-- | platform/android/src/file_source.hpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/platform/android/src/file_source.hpp b/platform/android/src/file_source.hpp index e4295e1b84..572ac647b7 100644 --- a/platform/android/src/file_source.hpp +++ b/platform/android/src/file_source.hpp @@ -24,22 +24,20 @@ public: struct ResourceTransformCallback { static constexpr auto Name() { return "com/mapbox/mapboxsdk/storage/FileSource$ResourceTransformCallback"; } - static std::string onURL(jni::JNIEnv&, jni::Object<FileSource::ResourceTransformCallback>, int, std::string); - - static jni::Class<ResourceTransformCallback> javaClass; + static std::string onURL(jni::JNIEnv&, const jni::Object<FileSource::ResourceTransformCallback>&, int, std::string); }; - FileSource(jni::JNIEnv&, jni::String, jni::String, jni::Object<AssetManager>); + FileSource(jni::JNIEnv&, const jni::String&, const jni::String&, const jni::Object<AssetManager>&); ~FileSource(); - jni::String getAccessToken(jni::JNIEnv&); + jni::Local<jni::String> getAccessToken(jni::JNIEnv&); - void setAccessToken(jni::JNIEnv&, jni::String); + void setAccessToken(jni::JNIEnv&, const jni::String&); - void setAPIBaseUrl(jni::JNIEnv&, jni::String); + void setAPIBaseUrl(jni::JNIEnv&, const jni::String&); - void setResourceTransform(jni::JNIEnv&, jni::Object<FileSource::ResourceTransformCallback>); + void setResourceTransform(jni::JNIEnv&, const jni::Object<FileSource::ResourceTransformCallback>&); void resume(jni::JNIEnv&); @@ -47,11 +45,9 @@ public: jni::jboolean isResumed(jni::JNIEnv&); - static jni::Class<FileSource> javaClass; - - static FileSource* getNativePeer(jni::JNIEnv&, jni::Object<FileSource>); + static FileSource* getNativePeer(jni::JNIEnv&, const jni::Object<FileSource>&); - static mbgl::DefaultFileSource& getDefaultFileSource(jni::JNIEnv&, jni::Object<FileSource>); + static mbgl::DefaultFileSource& getDefaultFileSource(jni::JNIEnv&, const jni::Object<FileSource>&); static void registerNative(jni::JNIEnv&); |