diff options
author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2015-11-18 17:30:32 +0200 |
---|---|---|
committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2015-12-01 11:49:02 +0200 |
commit | ae3f1c79faa34337628d671d071a82ac97a66081 (patch) | |
tree | 281cac639176edd7a16e33c2b6adddbd6e61a464 /platform/android | |
parent | 0cc31e1dda082b3ee448090c7d5bc2922e99b0ed (diff) | |
download | qtlocation-mapboxgl-ae3f1c79faa34337628d671d071a82ac97a66081.tar.gz |
[android] Removed libuv dependency from HTTPAndroid*
Diffstat (limited to 'platform/android')
-rw-r--r-- | platform/android/http_request_android.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/platform/android/http_request_android.cpp b/platform/android/http_request_android.cpp index c4deb6d11e..1ffdbff3f7 100644 --- a/platform/android/http_request_android.cpp +++ b/platform/android/http_request_android.cpp @@ -5,6 +5,7 @@ #include <mbgl/platform/log.hpp> #include <mbgl/android/jni.hpp> +#include <mbgl/util/async_task.hpp> #include <mbgl/util/time.hpp> #include <mbgl/util/util.hpp> #include <mbgl/util/string.hpp> @@ -26,7 +27,6 @@ public: HTTPRequestBase* createRequest(const Resource&, RequestBase::Callback, - uv_loop_t*, std::shared_ptr<const Response>) final; JavaVM *vm = nullptr; @@ -38,7 +38,6 @@ public: HTTPAndroidRequest(HTTPAndroidContext*, const Resource&, Callback, - uv_loop_t*, std::shared_ptr<const Response>); ~HTTPAndroidRequest(); @@ -59,7 +58,7 @@ private: jobject obj = nullptr; - uv::async async; + util::AsyncTask async; static const int connectionError = 0; static const int temporaryError = 1; @@ -113,16 +112,15 @@ HTTPAndroidContext::~HTTPAndroidContext() { HTTPRequestBase* HTTPAndroidContext::createRequest(const Resource& resource, RequestBase::Callback callback, - uv_loop_t* loop_, std::shared_ptr<const Response> response) { - return new HTTPAndroidRequest(this, resource, callback, loop_, response); + return new HTTPAndroidRequest(this, resource, callback, response); } -HTTPAndroidRequest::HTTPAndroidRequest(HTTPAndroidContext* context_, const Resource& resource_, Callback callback_, uv_loop_t* loop, std::shared_ptr<const Response> response_) +HTTPAndroidRequest::HTTPAndroidRequest(HTTPAndroidContext* context_, const Resource& resource_, Callback callback_, std::shared_ptr<const Response> response_) : HTTPRequestBase(resource_, callback_), context(context_), existingResponse(response_), - async(loop, [this] { finish(); }) { + async([this] { finish(); }) { std::string etagStr; std::string modifiedStr; @@ -250,7 +248,7 @@ void HTTPAndroidRequest::onFailure(int type, std::string message) { async.send(); } -std::unique_ptr<HTTPContextBase> HTTPContextBase::createContext(uv_loop_t* loop) { +std::unique_ptr<HTTPContextBase> HTTPContextBase::createContext() { return std::make_unique<HTTPAndroidContext>(); } |