diff --git a/android/jni/com/mapswithme/platform/HttpThread.cpp b/android/jni/com/mapswithme/platform/HttpThread.cpp index ba985fb495..71353d3685 100644 --- a/android/jni/com/mapswithme/platform/HttpThread.cpp +++ b/android/jni/com/mapswithme/platform/HttpThread.cpp @@ -48,8 +48,8 @@ public: ~HttpThread() { JNIEnv * env = jni::GetEnv(); - jmethodID methodId = jni::GetJavaMethodID(env, m_self, "safeCancel", "()V"); - ASSERT(methodId, ("Can't find java method 'safeCancel' in com/mapswithme/maps/downloader/DownloadChunkTask")); + jmethodID methodId = jni::GetJavaMethodID(env, m_self, "cancel", "(Z)Z"); + ASSERT(methodId, ("Can't find java method 'cancel' in com/mapswithme/maps/downloader/DownloadChunkTask")); env->CallBooleanMethod(m_self, methodId, false); env->DeleteGlobalRef(m_self); diff --git a/android/src/com/mapswithme/maps/downloader/DownloadChunkTask.java b/android/src/com/mapswithme/maps/downloader/DownloadChunkTask.java index 01b917daf6..8527743e30 100644 --- a/android/src/com/mapswithme/maps/downloader/DownloadChunkTask.java +++ b/android/src/com/mapswithme/maps/downloader/DownloadChunkTask.java @@ -51,8 +51,7 @@ class DownloadChunkTask extends AsyncTask @Override protected void onPostExecute(Void resCode) { - if (!mIsCancelled) - onFinish(m_httpCallbackID, 200, m_beg, m_end); + onFinish(m_httpCallbackID, 200, m_beg, m_end); } @Override @@ -66,7 +65,7 @@ class DownloadChunkTask extends AsyncTask @Override protected void onProgressUpdate(byte []... data) { - if (!mIsCancelled) + if (!isCancelled()) { // Use progress event to save downloaded bytes onWrite(m_httpCallbackID, m_beg + m_downloadedBytes, data[0], data[0].length); @@ -89,7 +88,7 @@ class DownloadChunkTask extends AsyncTask HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection(); - if (mIsCancelled) + if (isCancelled()) { urlConnection.disconnect(); return null; @@ -121,7 +120,7 @@ class DownloadChunkTask extends AsyncTask os.flush(); } - if (mIsCancelled) + if (isCancelled()) { urlConnection.disconnect(); return null; @@ -143,7 +142,7 @@ class DownloadChunkTask extends AsyncTask long readBytes; while ((readBytes = is.read(tempBuf)) != -1) { - if (mIsCancelled) + if (isCancelled()) { urlConnection.disconnect(); return null; @@ -171,12 +170,4 @@ class DownloadChunkTask extends AsyncTask return null; } - - private boolean mIsCancelled = false; - - void safeCancel() - { - mIsCancelled = true; - cancel(false); - } }