From 8f5f7fb7b714cbbb1345e747e29d6c3c171c9ae8 Mon Sep 17 00:00:00 2001
From: izzy2lost <izzynochill@gmail.com>
Date: Wed, 13 Aug 2025 10:18:24 -0400
Subject: [PATCH] oh boy. this rabbit hole

---
 .../main/java/com/starship/android/MainActivity.java   |  4 ----
 src/port/Engine.cpp                                    | 10 ++--------
 2 files changed, 2 insertions(+), 12 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 2b87234d..b5348431 100644
--- a/android/app/src/main/java/com/starship/android/MainActivity.java
+++ b/android/app/src/main/java/com/starship/android/MainActivity.java
@@ -176,7 +176,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
     super.onCreate(savedInstanceState);
     
-        try { nativeSetAppDirs(getSaveDir()); } catch (Throwable t) { Log.w(TAG, "nativeSetAppDirs failed", t); }
 setupControllerOverlay();
     attachController();
 
@@ -209,7 +208,6 @@ setupControllerOverlay();
                     out.getFD().sync();
                     Log.i(TAG, "sf64.o2r copied from user folder to internal storage");
                 
-        try { nativeSetAppDirs(getSaveDir()); } catch (Throwable t) { Log.w(TAG, "nativeSetAppDirs failed", t); }
 } catch (IOException e) {
                     Log.e(TAG, "Failed to copy sf64.o2r from user folder", e);
                 }
@@ -517,7 +515,6 @@ private void handleFolderSelection(Uri treeUri, int returnedFlags) {
             Log.i(TAG, "sf64.o2r copied from user folder to internal storage during folder selection");
             
             
-        try { nativeSetAppDirs(getSaveDir()); } catch (Throwable t) { Log.w(TAG, "nativeSetAppDirs failed", t); }
 // Also sync mods
             syncModsFromUserFolder();
             
@@ -635,7 +632,6 @@ private void handleRomFileSelection(Uri selectedFileUri) {
         Log.i(TAG, "sf64.o2r copied to internal (" + total + " bytes): " + dest.getAbsolutePath());
 
         
-        try { nativeSetAppDirs(getSaveDir()); } catch (Throwable t) { Log.w(TAG, "nativeSetAppDirs failed", t); }
 runOnUiThread(() -> showPortraitDialog("sf64.o2r ready",
             "sf64.o2r copied. Restart to load the game.",
             DialogActivity.DIALOG_TYPE_FILE_READY));
diff --git a/src/port/Engine.cpp b/src/port/Engine.cpp
index d2dfa418..d9f8cbf3 100644
--- a/src/port/Engine.cpp
+++ b/src/port/Engine.cpp
@@ -114,8 +114,6 @@ GameEngine::GameEngine() {
 {
     const char* sdlInternal = SDL_AndroidGetInternalStoragePath();
     if (sdlInternal && *sdlInternal) {
-pm->SetAppDirectoryPath(sdlInternal);
-        pm->SetUserDirectoryPath(sdlInternal);
         SPDLOG_INFO("Android app/user dir set to: {}", sdlInternal);
     } else {
         SPDLOG_WARN("SDL_AndroidGetInternalStoragePath() returned null; using defaults");
@@ -903,10 +901,6 @@ extern "C" void GameEngine_Free(void* ptr) {
 #ifdef __ANDROID__
 extern "C" JNIEXPORT void JNICALL
 Java_com_starship_android_MainActivity_nativeSetAppDirs(JNIEnv* env, jclass, jstring jpath) {
-    // No-op: paths resolved via SDL_AndroidGetInternalStoragePath in GameEngine::GameEngine
-}", p);
-        env->ReleaseStringUTFChars(jpath, p);
-    }
+    // No-op: paths resolved via SDL_AndroidGetInternalStoragePath in GameEngine::GameEngine()
 }
-#endif
-
+#endif
\ No newline at end of file