diff --git a/android/cpp/NativeMapView.cpp b/android/cpp/NativeMapView.cpp index 4dea3d6f0..1ca474af6 100644 --- a/android/cpp/NativeMapView.cpp +++ b/android/cpp/NativeMapView.cpp @@ -56,8 +56,7 @@ NativeMapView::NativeMapView(JNIEnv* env, jobject obj_, // FIXME need way to load this from Java map->setAccessToken("pk.eyJ1IjoibGpiYWRlIiwiYSI6IlJSQ0FEZ2MifQ.7mE4aOegldh3595AG9dxpQ"); - - map->setStyleURL("http://mapbox.github.io/mapbox-gl-styles/styles/bright-v6.json"); + map->setStyleURL("https://mapbox.github.io/mapbox-gl-styles/styles/bright-v6.json"); } NativeMapView::~NativeMapView() { diff --git a/android/mapboxgl-app.gyp b/android/mapboxgl-app.gyp index 3d421942b..b4702be4f 100644 --- a/android/mapboxgl-app.gyp +++ b/android/mapboxgl-app.gyp @@ -44,7 +44,12 @@ 'dependencies': [ '../mapboxgl.gyp:mbgl-standalone', '../mapboxgl.gyp:mbgl-android', + '../mapboxgl.gyp:copy_certificate_bundle', ], + 'copies': [{ + 'files': [ '../styles/styles' ], + 'destination': '<(PRODUCT_DIR)' + }], }, ], } diff --git a/platform/default/http_request_baton_curl.cpp b/platform/default/http_request_baton_curl.cpp index 37b6a03a4..4b967c6c1 100644 --- a/platform/default/http_request_baton_curl.cpp +++ b/platform/default/http_request_baton_curl.cpp @@ -406,7 +406,9 @@ void start_request(void *const ptr) { // Carry on the shared pointer in the private information of the CURL handle. curl_easy_setopt(handle, CURLOPT_PRIVATE, context.release()); - curl_easy_setopt(handle, CURLOPT_CAINFO, "ca-bundle.crt"); + // FIXME temp work around + curl_easy_setopt(handle, CURLOPT_SSL_VERIFYPEER, 0); + //curl_easy_setopt(handle, CURLOPT_CAINFO, "ca-bundle.crt"); curl_easy_setopt(handle, CURLOPT_URL, baton->path.c_str()); curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, curl_write_cb); curl_easy_setopt(handle, CURLOPT_WRITEDATA, &baton->response->data); diff --git a/src/storage/http_request.cpp b/src/storage/http_request.cpp index e73a3b8f6..bce74649a 100644 --- a/src/storage/http_request.cpp +++ b/src/storage/http_request.cpp @@ -23,7 +23,7 @@ struct CacheRequestBaton { HTTPRequest::HTTPRequest(ResourceType type_, const std::string &path_, uv_loop_t *loop_, util::ptr store_) : BaseRequest(path_), thread_id(uv_thread_self()), loop(loop_), store(store_), type(type_) { - Log::Error(Event::HttpRequest, "HTTPRequest %s", path.c_str()); + Log::Debug(Event::HttpRequest, "HTTPRequest %s", path.c_str()); if (store) { startCacheRequest(); diff --git a/src/util/mapbox.cpp b/src/util/mapbox.cpp index 1245be405..dbde5d5d6 100644 --- a/src/util/mapbox.cpp +++ b/src/util/mapbox.cpp @@ -13,7 +13,7 @@ std::string normalizeURL(const std::string& url, const std::string& accessToken) throw std::runtime_error("You must provide a Mapbox API access token for Mapbox tile sources"); // FIXME for test only change back to https after - return std::string("http://api.tiles.mapbox.com/v4/") + return std::string("https://api.tiles.mapbox.com/v4/") + url.substr(mapbox.length()) + "?access_token=" + accessToken;