From 39e2d6a0975fa3d60687445524713bf768cb7136 Mon Sep 17 00:00:00 2001
From: Alexander Batalov <alex.batalov@gmail.com>
Date: Wed, 17 Aug 2022 09:20:09 +0300
Subject: [PATCH] Tweak onActivityResult

---
 .../fallout2ce/ImportActivity.java            | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/os/android/app/src/main/java/com/alexbatalov/fallout2ce/ImportActivity.java b/os/android/app/src/main/java/com/alexbatalov/fallout2ce/ImportActivity.java
index 1af1f8d..25f88ff 100644
--- a/os/android/app/src/main/java/com/alexbatalov/fallout2ce/ImportActivity.java
+++ b/os/android/app/src/main/java/com/alexbatalov/fallout2ce/ImportActivity.java
@@ -23,16 +23,21 @@ public class ImportActivity extends Activity {
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent resultData) {
-        if (requestCode != IMPORT_REQUEST_CODE || resultCode != Activity.RESULT_OK) {
-            finish();
-        }
-
-        final Uri treeUri = resultData.getData();
-        if (treeUri != null) {
-            final DocumentFile treeDocument = DocumentFile.fromTreeUri(this, treeUri);
-            if (treeDocument != null) {
-                copyFiles(treeDocument);
+        if (requestCode == IMPORT_REQUEST_CODE) {
+            if (resultCode == Activity.RESULT_OK) {
+                final Uri treeUri = resultData.getData();
+                if (treeUri != null) {
+                    final DocumentFile treeDocument = DocumentFile.fromTreeUri(this, treeUri);
+                    if (treeDocument != null) {
+                        copyFiles(treeDocument);
+                        return;
+                    }
+                }
             }
+
+            finish();
+        } else {
+            super.onActivityResult(requestCode, resultCode, resultData);
         }
     }