(Android) Reverted to requiring full filesystem access for the application

This commit is contained in:
Leon Styhre 2024-01-03 17:33:59 +01:00
parent 83ff89acb2
commit 0deec0865d

View file

@ -546,10 +546,6 @@ int main(int argc, char* argv[])
std::locale::global(std::locale("C")); std::locale::global(std::locale("C"));
#if defined(__ANDROID__)
Utils::Platform::Android::setDataDirectories();
#endif
#if defined(__APPLE__) #if defined(__APPLE__)
// This is a workaround to disable the incredibly annoying save state functionality in // This is a workaround to disable the incredibly annoying save state functionality in
// macOS which forces a restore of the previous window state. The problem is that this // macOS which forces a restore of the previous window state. The problem is that this
@ -596,19 +592,22 @@ int main(int argc, char* argv[])
} }
#endif #endif
#if defined(__ANDROID__)
Utils::Platform::Android::requestStoragePermission();
while (AndroidVariables::sHold)
SDL_Delay(20);
Utils::Platform::Android::setDataDirectories();
Utils::Platform::Android::setROMDirectory();
#endif
if (!Settings::getInstance()->getBool("DebugFlag") && if (!Settings::getInstance()->getBool("DebugFlag") &&
Settings::getInstance()->getBool("DebugMode")) { Settings::getInstance()->getBool("DebugMode")) {
Settings::getInstance()->setBool("Debug", true); Settings::getInstance()->setBool("Debug", true);
Log::setReportingLevel(LogDebug); Log::setReportingLevel(LogDebug);
} }
#if defined(__ANDROID__)
Utils::Platform::Android::startConfigurator();
while (AndroidVariables::sHold)
SDL_Delay(20);
Utils::Platform::Android::setROMDirectory();
#endif
#if defined(FREEIMAGE_LIB) #if defined(FREEIMAGE_LIB)
// Call this ONLY when linking with FreeImage as a static library. // Call this ONLY when linking with FreeImage as a static library.
FreeImage_Initialise(); FreeImage_Initialise();