Fix misuse of AsyncTask (#8799)
authorLinjie Pan <408488316@qq.com>
Wed, 18 Sep 2019 22:37:06 +0000 (06:37 +0800)
committersfan5 <sfan5@live.de>
Wed, 18 Sep 2019 22:37:06 +0000 (00:37 +0200)
build/android/src/main/java/net.minetest.minetest/MinetestAssetCopy.java

index b570fe61a1a4830c6ac8651f315f88fadf1e819b..03b34f705d38feeb3a9a2f76dd9f4a6b5d536feb 100644 (file)
@@ -53,6 +53,14 @@ public class MinetestAssetCopy extends Activity {
                super.onResume();
                makeFullScreen();
        }
+       
+       @Override
+       protected void onDestroy() {
+               super.onDestroy();
+               if (m_AssetCopy != null) {
+                       m_AssetCopy.cancel(true);
+               }
+       }
 
        public void makeFullScreen() {
                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
@@ -77,7 +85,7 @@ public class MinetestAssetCopy extends Activity {
                return this;
        }
 
-       private class copyAssetTask extends AsyncTask<String, Integer, String> {
+       private static class copyAssetTask extends AsyncTask<String, Integer, String> {
                boolean m_copy_started = false;
                String m_Foldername = "media";
                Vector<String> m_foldernames;