Show Toast in UI thread and fix unpacking on Android 10 (#9900)

[oweals/minetest.git] / build / android / app / src / main / java / net / minetest / minetest / MainActivity.java

diff --git a/build/android/app/src/main/java/net/minetest/minetest/MainActivity.java b/build/android/app/src/main/java/net/minetest/minetest/MainActivity.java
index 1e60beb55bed5cebdfff93a0bdaba6aaf771400c..2aa50d9ad5d2926dd13ea6969dc06b20dcd82c8c 100644 (file)
--- a/build/android/app/src/main/java/net/minetest/minetest/MainActivity.java
+++ b/build/android/app/src/main/java/net/minetest/minetest/MainActivity.java
@@ -43,6 +43,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import static net.minetest.minetest.UnzipService.ACTION_FAILURE;
 import static net.minetest.minetest.UnzipService.ACTION_PROGRESS;
 import static net.minetest.minetest.UnzipService.ACTION_UPDATE;
 import static net.minetest.minetest.UnzipService.FAILURE;
@@ -71,6 +72,7 @@ public class MainActivity extends AppCompatActivity {
                                }
                                mTextView.setVisibility(View.VISIBLE);
                        } else if (progress == FAILURE) {
+                               Toast.makeText(MainActivity.this, intent.getStringExtra(ACTION_FAILURE), Toast.LENGTH_LONG).show();
                                finish();
                        } else if (progress == SUCCESS)
                                startNative();
@@ -138,6 +140,11 @@ public class MainActivity extends AppCompatActivity {
                startActivity(intent);
        }
 
+       @Override
+       public void onBackPressed() {
+               // Prevent abrupt interruption when copy game files from assets
+       }
+
        @Override
        protected void onDestroy() {
                super.onDestroy();