Android: some java-part improvements (#9760)

[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 f37ae6d4b09baf6df65e1ff40706ed4dc692d6a9..1e60beb55bed5cebdfff93a0bdaba6aaf771400c 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,11 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import static net.minetest.minetest.UnzipService.ACTION_PROGRESS;
+import static net.minetest.minetest.UnzipService.ACTION_UPDATE;
+import static net.minetest.minetest.UnzipService.FAILURE;
+import static net.minetest.minetest.UnzipService.SUCCESS;
+
 public class MainActivity extends AppCompatActivity {
        private final static int versionCode = BuildConfig.VERSION_CODE;
        private final static int PERMISSIONS = 1;
@@ -58,14 +63,16 @@ public class MainActivity extends AppCompatActivity {
                public void onReceive(Context context, Intent intent) {
                        int progress = 0;
                        if (intent != null)
-                               progress = intent.getIntExtra(UnzipService.ACTION_PROGRESS, 0);
+                               progress = intent.getIntExtra(ACTION_PROGRESS, 0);
                        if (progress >= 0) {
                                if (mProgressBar != null) {
                                        mProgressBar.setVisibility(View.VISIBLE);
                                        mProgressBar.setProgress(progress);
                                }
                                mTextView.setVisibility(View.VISIBLE);
-                       } else
+                       } else if (progress == FAILURE) {
+                               finish();
+                       } else if (progress == SUCCESS)
                                startNative();
                }
        };
@@ -74,7 +81,7 @@ public class MainActivity extends AppCompatActivity {
        public void onCreate(Bundle savedInstanceState) {
                super.onCreate(savedInstanceState);
                setContentView(R.layout.activity_main);
-               IntentFilter filter = new IntentFilter(UnzipService.ACTION_UPDATE);
+               IntentFilter filter = new IntentFilter(ACTION_UPDATE);
                registerReceiver(myReceiver, filter);
                mProgressBar = findViewById(R.id.progressBar);
                mTextView = findViewById(R.id.textView);