Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 13:30:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Create vital directories on Android storage permission grant. Should help #11020

Browse Source
This commit is contained in:
Henrik Rydgård 2018-05-10 19:32:28 +02:00
parent f82c3a3b18
commit 3976b03bcd
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/System.cpp
View File

@ -564,10 +564,6 @@ void InitSysDirectories() {
File::CreateDir(g_Config.memStickDirectory + "PSP/GAME");
File::CreateDir(g_Config.memStickDirectory + "PSP/SAVEDATA");
File::CreateDir(g_Config.memStickDirectory + "PSP/PPSSPP_STATE");
#ifdef ANDROID
// Avoid media scanners in PPSSPP_STATE directory
File::CreateEmptyFile(g_Config.memStickDirectory + "PSP/PPSSPP_STATE/.nomedia");
#endif
if (g_Config.currentDirectory.empty()) {
g_Config.currentDirectory = GetSysDirectory(DIRECTORY_GAME);

27
UI/NativeApp.cpp
View File

@ -326,6 +326,19 @@ static void PostLoadConfig() {
i18nrepo.LoadIni(g_Config.sLanguageIni, langOverridePath);
}
void CreateDirectoriesAndroid() {
// On Android, create a PSP directory tree in the external_dir,
// to hopefully reduce confusion a bit.
ILOG("Creating %s", (g_Config.memStickDirectory + "PSP").c_str());
File::CreateDir((g_Config.memStickDirectory + "PSP").c_str());
File::CreateDir((g_Config.memStickDirectory + "PSP/SAVEDATA").c_str());
File::CreateDir((g_Config.memStickDirectory + "PSP/PPSSPP_STATE").c_str());
File::CreateDir((g_Config.memStickDirectory + "PSP/GAME").c_str());
// Avoid media scanners in PPSSPP_STATE and SAVEDATA directories
File::CreateEmptyFile(g_Config.memStickDirectory + "PSP/PPSSPP_STATE/.nomedia");
File::CreateEmptyFile(g_Config.memStickDirectory + "PSP/SAVEDATA/.nomedia");
}
void NativeInit(int argc, const char *argv[], const char *savegame_dir, const char *external_dir, const char *cache_dir, bool fs) {
net::Init(); // This needs to happen before we load the config. So on Windows we also run it in Main. It's fine to call multiple times.
@ -409,17 +422,9 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
LogManager *logman = LogManager::GetInstance();
#ifdef __ANDROID__
// TODO: This is also done elsewhere. Remove?
// On Android, create a PSP directory tree in the external_dir,
// to hopefully reduce confusion a bit.
ILOG("Creating %s", (g_Config.memStickDirectory + "PSP").c_str());
File::CreateDir((g_Config.memStickDirectory + "PSP").c_str());
File::CreateDir((g_Config.memStickDirectory + "PSP/SAVEDATA").c_str());
File::CreateDir((g_Config.memStickDirectory + "PSP/GAME").c_str());
CreateDirectoriesAndroid();
#endif
const char *fileToLog = 0;
const char *stateToLoad = 0;
@ -963,10 +968,12 @@ void HandleGlobalMessage(const std::string &msg, const std::string &value) {
osm.Show(sy->T("WARNING: Battery save mode is on"), 2.0f, 0xFFFFFF, -1, true, "core_powerSaving");
#endif
}
Core_SetPowerSaving(value != "false");
}
if (msg == "permission_granted" && value == "storage") {
#ifdef __ANDROID__
CreateDirectoriesAndroid();
#endif
// We must have failed to load the config before, so load it now to avoid overwriting the old config
// with a freshly generated one.
ILOG("Reloading config after storage permission grant.");