libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 00:20:01 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

make android defaults smarter

Browse Source
This commit is contained in:
radius 2015-07-11 15:16:04 -04:00
parent 5fd65afae1
commit a1ffbfdec9
2 changed files with 88 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuFragment.java
View File

@ -23,6 +23,7 @@ import android.provider.Settings;
import android.util.Log;
import android.widget.Toast;
import android.os.Environment;
import android.content.Context;
import com.retroarch.R;
import com.retroarch.browser.NativeInterface;
@ -222,5 +223,10 @@ public final class MainMenuFragment extends PreferenceListFragment implements On
retro.putExtra("SDCARD", Environment.getExternalStorageDirectory().getAbsolutePath());
retro.putExtra("DOWNLOADS", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath());
retro.putExtra("SCREENSHOTS", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath());
String external = Environment.getExternalStorageDirectory().getAbsolutePath() + "/Android/data/com.retroarch/files";
retro.putExtra("EXTERNAL", external);
}
}

95
frontend/drivers/platform_android.c
View File

@ -28,6 +28,11 @@
#include "../frontend.h"
#include "../../general.h"
#include "../../msg_hash.h"
#include <file/file_path.h>
#define SDCARD_ROOT_WRITABLE 1
#define SDCARD_EXT_DIR_WRITABLE 2
#define SDCARD_NOT_WRITABLE 3
struct android_app *g_android;
static pthread_key_t thread_key;
@ -443,6 +448,17 @@ static char downloads_dir[PATH_MAX_LENGTH];
char apk_path[PATH_MAX_LENGTH];
static char sdcard_dir[PATH_MAX_LENGTH];
char app_dir[PATH_MAX_LENGTH];
char ext_dir[PATH_MAX_LENGTH];
static bool test_permissions(const char *path)
{
bool ret;
ret = path_mkdir(path);
if(ret)
rmdir(path);
return ret;
}
static void frontend_android_get_environment_settings(int *argc,
char *argv[], void *data, void *params_data)
@ -661,6 +677,26 @@ static void frontend_android_get_environment_settings(int *argc,
}
}
CALL_OBJ_METHOD_PARAM(env, jstr, obj, android_app->getStringExtra,
(*env)->NewStringUTF(env, "EXTERNAL"));
if (android_app->getStringExtra && jstr)
{
const char *argv = NULL;
*ext_dir = '\0';
argv = (*env)->GetStringUTFChars(env, jstr, 0);
if (argv && *argv)
strlcpy(ext_dir, argv, sizeof(ext_dir));
(*env)->ReleaseStringUTFChars(env, jstr, argv);
if (*ext_dir)
{
RARCH_LOG("External files dir [%s].\n", ext_dir);
}
}
/* Content. */
CALL_OBJ_METHOD_PARAM(env, jstr, obj, android_app->getStringExtra,
(*env)->NewStringUTF(env, "DATADIR"));
@ -672,11 +708,26 @@ static void frontend_android_get_environment_settings(int *argc,
*app_dir = '\0';
argv = (*env)->GetStringUTFChars(env, jstr, 0);
if (argv && *argv)
strlcpy(app_dir, argv, sizeof(app_dir));
(*env)->ReleaseStringUTFChars(env, jstr, argv);
//set paths depending on the ability to write to sdcard_dir
int perms = 0;
if(*sdcard_dir)
{
if(test_permissions(sdcard_dir))
perms = SDCARD_ROOT_WRITABLE;
}
else if(*ext_dir)
{
if(test_permissions(ext_dir))
perms = SDCARD_EXT_DIR_WRITABLE;
}
else
perms = SDCARD_NOT_WRITABLE;
if (*app_dir)
{
RARCH_LOG("Application Dir: [%s].\n", app_dir);
@ -714,26 +765,41 @@ static void frontend_android_get_environment_settings(int *argc,
app_dir, "remaps", sizeof(g_defaults.remap_dir));
fill_pathname_join(g_defaults.wallpapers_dir,
app_dir, "wallpapers", sizeof(g_defaults.wallpapers_dir));
if(*downloads_dir)
{
if(*downloads_dir && test_permissions(downloads_dir))
{
fill_pathname_join(g_defaults.core_assets_dir,
downloads_dir, "", sizeof(g_defaults.core_assets_dir));
}
else
{
}
else
{
fill_pathname_join(g_defaults.core_assets_dir,
app_dir, "downloads", sizeof(g_defaults.core_assets_dir));
}
if(*screenshot_dir)
{
}
if(*screenshot_dir && test_permissions(screenshot_dir))
{
fill_pathname_join(g_defaults.screenshot_dir,
screenshot_dir, "", sizeof(g_defaults.screenshot_dir));
}
else
{
}
else
{
fill_pathname_join(g_defaults.screenshot_dir,
app_dir, "screenshots", sizeof(g_defaults.screenshot_dir));
}
}
switch (perms)
{
case SDCARD_EXT_DIR_WRITABLE:
fill_pathname_join(g_defaults.sram_dir,
app_dir, "saves", sizeof(g_defaults.sram_dir));
break;
case SDCARD_NOT_WRITABLE:
fill_pathname_join(g_defaults.sram_dir,
app_dir, "saves", sizeof(g_defaults.sram_dir));
break;
case SDCARD_ROOT_WRITABLE:
default:
break;
}
}
}
}
@ -904,7 +970,10 @@ static int frontend_android_parse_drive_list(void *data)
menu_list_push(list,
app_dir, "Application Dir", MENU_FILE_DIRECTORY, 0, 0);
menu_list_push(list,
ext_dir, "External Application Dir", MENU_FILE_DIRECTORY, 0, 0);
menu_list_push(list,
sdcard_dir, "Internal Memory", MENU_FILE_DIRECTORY, 0, 0);
menu_list_push(list, "/", "",
MENU_FILE_DIRECTORY, 0, 0);