From 9d04aa9145c5773185a04606bd8265fe62d90287 Mon Sep 17 00:00:00 2001 From: izzy2lost Date: Wed, 13 Aug 2025 07:17:26 -0400 Subject: [PATCH] be more like SK android port --- .../main/java/com/starship/android/MainActivity.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/android/app/src/main/java/com/starship/android/MainActivity.java b/android/app/src/main/java/com/starship/android/MainActivity.java index d40fe79c..08a7cab1 100644 --- a/android/app/src/main/java/com/starship/android/MainActivity.java +++ b/android/app/src/main/java/com/starship/android/MainActivity.java @@ -230,17 +230,15 @@ protected void onCreate(Bundle savedInstanceState) { "Pick an existing sf64.o2r file or use Torch to create one. It will be copied to your selected folder.", DialogActivity.DIALOG_TYPE_FILE_NOT_FOUND); } - // Don't count down the latch yet - wait for user to provide ROM } else { Log.i(TAG, "sf64.o2r found in internal storage, game should start normally."); - setupLatch.countDown(); } } public static void waitForSetupFromNative() { - try { - setupLatch.await(); - } catch (InterruptedException ignored) {} + // This method is called from C++ but we don't need it anymore + // The C++ polling system handles waiting for the file + Log.i(TAG, "waitForSetupFromNative() called from C++ - using polling system"); } // ===== Asset seeding (optional, safe if assets not present) ===== @@ -517,9 +515,6 @@ private void handleFolderSelection(Uri treeUri, int returnedFlags) { // Also sync mods syncModsFromUserFolder(); - // Now the game can start - count down the latch - setupLatch.countDown(); - showToast("Files copied. Game should start now."); } catch (IOException e) { Log.e(TAG, "Failed to copy sf64.o2r during folder selection", e);