From 5502000bc6ff3fb99a309a4ee5d7a83d643184cc Mon Sep 17 00:00:00 2001 From: Arnold <40414978+PatriceJiang@users.noreply.github.com> Date: Tue, 4 Jun 2019 17:21:04 +0800 Subject: [PATCH] prevent downloader callbacks when app exits (#1763) --- native/cocos/network/CCDownloader-android.cpp | 9 +++++++++ native/cocos/platform/android/jni/JniImp.cpp | 8 ++++++++ native/cocos/platform/android/jni/JniImp.h | 2 ++ 3 files changed, 19 insertions(+) diff --git a/native/cocos/network/CCDownloader-android.cpp b/native/cocos/network/CCDownloader-android.cpp index 13b537c22e..b025eb0ae1 100644 --- a/native/cocos/network/CCDownloader-android.cpp +++ b/native/cocos/network/CCDownloader-android.cpp @@ -27,6 +27,7 @@ #include "network/CCDownloader.h" #include "platform/android/jni/JniHelper.h" +#include "platform/android/jni/JniImp.h" #include @@ -263,6 +264,10 @@ extern "C" { JNIEXPORT void JNICALL JNI_DOWNLOADER(nativeOnProgress)(JNIEnv *env, jclass clazz, jint id, jint taskId, jlong dl, jlong dlnow, jlong dltotal) { + if(getApplicationExited()) { + return; + } + DLLOG("_nativeOnProgress(id: %d, taskId: %d, dl: %lld, dlnow: %lld, dltotal: %lld)", id, taskId, dl, dlnow, dltotal); //It's not thread-safe here, use thread-safe method instead cocos2d::network::DownloaderAndroid *downloader = _findDownloaderAndroid(id); @@ -276,6 +281,10 @@ JNIEXPORT void JNICALL JNI_DOWNLOADER(nativeOnProgress)(JNIEnv *env, jclass claz JNIEXPORT void JNICALL JNI_DOWNLOADER(nativeOnFinish)(JNIEnv *env, jclass clazz, jint id, jint taskId, jint errCode, jstring errStr, jbyteArray data) { + if(getApplicationExited()) + { + return; + } DLLOG("_nativeOnFinish(id: %d, taskId: %d)", id, taskId); //It's not thread-safe here, use thread-safe method instead cocos2d::network::DownloaderAndroid *downloader = _findDownloaderAndroid(id); diff --git a/native/cocos/platform/android/jni/JniImp.cpp b/native/cocos/platform/android/jni/JniImp.cpp index b86f0ec463..5e506e9d78 100644 --- a/native/cocos/platform/android/jni/JniImp.cpp +++ b/native/cocos/platform/android/jni/JniImp.cpp @@ -640,3 +640,11 @@ void exitApplication() { g_isGameFinished = true; } + + +bool getApplicationExited() +{ + return g_isGameFinished; +} + + diff --git a/native/cocos/platform/android/jni/JniImp.h b/native/cocos/platform/android/jni/JniImp.h index ac23548127..81bf153f67 100644 --- a/native/cocos/platform/android/jni/JniImp.h +++ b/native/cocos/platform/android/jni/JniImp.h @@ -28,6 +28,8 @@ typedef void (*EditTextCallback)(const std::string& text, void* ctx); +extern bool getApplicationExited(); + extern void restartJSVM(); extern void exitApplication();