From 3d348edcb32f2af1a06cd512f2111aebd78550b4 Mon Sep 17 00:00:00 2001 From: radius Date: Tue, 7 Jul 2015 13:31:59 -0500 Subject: [PATCH 1/8] add functions to look for certain extra folders that may be useful to set sane defaults --- .../browser/mainmenu/MainMenuFragment.java | 4 ++ .../retroactivity/RetroActivityCommon.java | 2 +- .../retroactivity/RetroActivityIntent.java | 16 +++++ frontend/drivers/platform_android.c | 69 +++++++++++++++++++ frontend/drivers/platform_android.h | 3 + 5 files changed, 93 insertions(+), 1 deletion(-) diff --git a/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuFragment.java b/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuFragment.java index 7d890f81f5..8fe80a702c 100644 --- a/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuFragment.java +++ b/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuFragment.java @@ -22,6 +22,7 @@ import android.preference.PreferenceManager; import android.provider.Settings; import android.util.Log; import android.widget.Toast; +import android.os.Environment; import com.retroarch.R; import com.retroarch.browser.NativeInterface; @@ -250,5 +251,8 @@ public final class MainMenuFragment extends PreferenceListFragment implements On retro.putExtra("CONFIGFILE", configFilePath); retro.putExtra("IME", imePath); retro.putExtra("DATADIR", dataDirPath); + retro.putExtra("SDCARD", Environment.getExternalStorageDirectory().getAbsolutePath()); + retro.putExtra("DOWNLOADS", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath()); + retro.putExtra("SCREENSHOTS", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath()); } } diff --git a/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java b/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java index de1e03e3e9..740d528d0e 100644 --- a/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java +++ b/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java @@ -6,7 +6,7 @@ import com.retroarch.browser.preferences.util.UserPreferences; * Class which provides common methods for RetroActivity related classes. */ public class RetroActivityCommon extends RetroActivityLocation -{ +{ @Override public void onLowMemory() { diff --git a/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityIntent.java b/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityIntent.java index b8250b20cf..91ccc3f8a6 100644 --- a/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityIntent.java +++ b/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityIntent.java @@ -7,6 +7,7 @@ import android.util.Log; public class RetroActivityIntent extends RetroActivityCommon { private Intent pendingIntent = null; + private static final String TAG = "RetroArch"; @Override public void onBackPressed() @@ -56,6 +57,21 @@ public class RetroActivityIntent extends RetroActivityCommon { return pendingIntent.getStringExtra("CONFIGFILE"); } + public String getPendingIntentStorageLocation() + { + return pendingIntent.getStringExtra("SDCARD"); + } + + public String getPendingIntentDownloadLocation() + { + return pendingIntent.getStringExtra("DOWNLOADS"); + } + + public String getPendingIntentScreenshotsLocation() + { + return pendingIntent.getStringExtra("SCREENSHOTS"); + } + /** * Gets the specified IME in the pending intent. * diff --git a/frontend/drivers/platform_android.c b/frontend/drivers/platform_android.c index d93b8bf891..64ea009321 100644 --- a/frontend/drivers/platform_android.c +++ b/frontend/drivers/platform_android.c @@ -568,6 +568,75 @@ static void frontend_android_get_environment_settings(int *argc, } } + /* External Storage */ + CALL_OBJ_METHOD_PARAM(env, jstr, obj, android_app->getStringExtra, + (*env)->NewStringUTF(env, "SDCARD")); + + if (android_app->getStringExtra && jstr) + { + static char path[PATH_MAX_LENGTH]; + const char *argv = NULL; + + *path = '\0'; + argv = (*env)->GetStringUTFChars(env, jstr, 0); + + if (argv && *argv) + strlcpy(path, argv, sizeof(path)); + (*env)->ReleaseStringUTFChars(env, jstr, argv); + + if (*path) + { + RARCH_LOG("External Storage Location %s.\n", path); + //todo base dir handler + } + } + + /* Screenshots */ + CALL_OBJ_METHOD_PARAM(env, jstr, obj, android_app->getStringExtra, + (*env)->NewStringUTF(env, "SCREENSHOTS")); + + if (android_app->getStringExtra && jstr) + { + static char path[PATH_MAX_LENGTH]; + const char *argv = NULL; + + *path = '\0'; + argv = (*env)->GetStringUTFChars(env, jstr, 0); + + if (argv && *argv) + strlcpy(path, argv, sizeof(path)); + (*env)->ReleaseStringUTFChars(env, jstr, argv); + + if (*path) + { + RARCH_LOG("Screenshot Location %s.\n", path); + //todo screenshot handler + } + } + + /* Downloads */ + CALL_OBJ_METHOD_PARAM(env, jstr, obj, android_app->getStringExtra, + (*env)->NewStringUTF(env, "DOWNLOADS")); + + if (android_app->getStringExtra && jstr) + { + static char path[PATH_MAX_LENGTH]; + const char *argv = NULL; + + *path = '\0'; + argv = (*env)->GetStringUTFChars(env, jstr, 0); + + if (argv && *argv) + strlcpy(path, argv, sizeof(path)); + (*env)->ReleaseStringUTFChars(env, jstr, argv); + + if (*path) + { + RARCH_LOG("Downloads Location %s.\n", path); + //todo downloads handler + } + } + /* Content. */ CALL_OBJ_METHOD_PARAM(env, jstr, obj, android_app->getStringExtra, (*env)->NewStringUTF(env, "DATADIR")); diff --git a/frontend/drivers/platform_android.h b/frontend/drivers/platform_android.h index 64e9003bcd..ca70f4adda 100644 --- a/frontend/drivers/platform_android.h +++ b/frontend/drivers/platform_android.h @@ -57,6 +57,9 @@ struct android_app jmethodID getPendingIntentLibretroPath; jmethodID getPendingIntentFullPath; jmethodID getPendingIntentIME; + jmethodID getPendingIntentStorageLocation; + jmethodID getPendingIntentDownloadsLocation; + jmethodID getPendingIntentScreenshotsLocation; }; enum From 6eca7858fc508d450a77ce97a349361214bd9d65 Mon Sep 17 00:00:00 2001 From: radius Date: Tue, 7 Jul 2015 13:33:02 -0500 Subject: [PATCH 2/8] fix nits --- .../retroarch/browser/retroactivity/RetroActivityCommon.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java b/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java index 740d528d0e..de1e03e3e9 100644 --- a/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java +++ b/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java @@ -6,7 +6,7 @@ import com.retroarch.browser.preferences.util.UserPreferences; * Class which provides common methods for RetroActivity related classes. */ public class RetroActivityCommon extends RetroActivityLocation -{ +{ @Override public void onLowMemory() { From 161a7166c504b18a6678ca04c7e8b5ae527f7580 Mon Sep 17 00:00:00 2001 From: radius Date: Tue, 7 Jul 2015 13:54:32 -0500 Subject: [PATCH 3/8] set default downloads path to internal sdcard Downloads folder if available --- frontend/drivers/platform_android.c | 44 +++++++++++++++++------------ 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/frontend/drivers/platform_android.c b/frontend/drivers/platform_android.c index 64ea009321..b3704e001d 100644 --- a/frontend/drivers/platform_android.c +++ b/frontend/drivers/platform_android.c @@ -449,7 +449,7 @@ static void frontend_android_get_environment_settings(int *argc, jobject obj = NULL; jstring jstr = NULL; struct android_app *android_app = (struct android_app*)data; - + if (!android_app) return; @@ -574,19 +574,19 @@ static void frontend_android_get_environment_settings(int *argc, if (android_app->getStringExtra && jstr) { - static char path[PATH_MAX_LENGTH]; + static char base_path[PATH_MAX_LENGTH]; const char *argv = NULL; - *path = '\0'; + *base_path = '\0'; argv = (*env)->GetStringUTFChars(env, jstr, 0); if (argv && *argv) - strlcpy(path, argv, sizeof(path)); + strlcpy(base_path, argv, sizeof(base_path)); (*env)->ReleaseStringUTFChars(env, jstr, argv); - if (*path) + if (*base_path) { - RARCH_LOG("External Storage Location %s.\n", path); + RARCH_LOG("External Storage Location %s.\n", base_path); //todo base dir handler } } @@ -597,19 +597,19 @@ static void frontend_android_get_environment_settings(int *argc, if (android_app->getStringExtra && jstr) { - static char path[PATH_MAX_LENGTH]; + static char screenshot_path[PATH_MAX_LENGTH]; const char *argv = NULL; - *path = '\0'; + *screenshot_path = '\0'; argv = (*env)->GetStringUTFChars(env, jstr, 0); if (argv && *argv) - strlcpy(path, argv, sizeof(path)); + strlcpy(screenshot_path, argv, sizeof(screenshot_path)); (*env)->ReleaseStringUTFChars(env, jstr, argv); - if (*path) + if (*screenshot_path) { - RARCH_LOG("Screenshot Location %s.\n", path); + RARCH_LOG("Screenshot Location %s.\n", screenshot_path); //todo screenshot handler } } @@ -620,19 +620,19 @@ static void frontend_android_get_environment_settings(int *argc, if (android_app->getStringExtra && jstr) { - static char path[PATH_MAX_LENGTH]; + static char downloads_path[PATH_MAX_LENGTH]; const char *argv = NULL; - *path = '\0'; + *downloads_path = '\0'; argv = (*env)->GetStringUTFChars(env, jstr, 0); if (argv && *argv) - strlcpy(path, argv, sizeof(path)); + strlcpy(downloads_path, argv, sizeof(downloads_path)); (*env)->ReleaseStringUTFChars(env, jstr, argv); - if (*path) + if (*downloads_path) { - RARCH_LOG("Downloads Location %s.\n", path); + RARCH_LOG("Downloads Location %s.\n", downloads_path); //todo downloads handler } } @@ -690,8 +690,16 @@ static void frontend_android_get_environment_settings(int *argc, path, "remaps", sizeof(g_defaults.remap_dir)); fill_pathname_join(g_defaults.wallpapers_dir, path, "wallpapers", sizeof(g_defaults.wallpapers_dir)); - fill_pathname_join(g_defaults.core_assets_dir, - path, "downloads", sizeof(g_defaults.core_assets_dir)); + if(*downloads_path) + { + fill_pathname_join(g_defaults.core_assets_dir, + downloads_path, "/", sizeof(g_defaults.core_assets_dir)); + } + else + { + fill_pathname_join(g_defaults.core_assets_dir, + path, "downloads", sizeof(g_defaults.core_assets_dir)); + } } } } From 6801a0de281315ec625d02123b38f9de8c99b245 Mon Sep 17 00:00:00 2001 From: radius Date: Tue, 7 Jul 2015 13:58:15 -0500 Subject: [PATCH 4/8] move variable declaration --- frontend/drivers/platform_android.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/drivers/platform_android.c b/frontend/drivers/platform_android.c index b3704e001d..3553b4d3e5 100644 --- a/frontend/drivers/platform_android.c +++ b/frontend/drivers/platform_android.c @@ -467,6 +467,9 @@ static void frontend_android_get_environment_settings(int *argc, args->sram_path = NULL; args->state_path = NULL; } + static char screenshot_path[PATH_MAX_LENGTH]; + static char downloads_path[PATH_MAX_LENGTH]; + static char base_path[PATH_MAX_LENGTH]; frontend_android_get_version(&major, &minor, &rel); @@ -574,7 +577,6 @@ static void frontend_android_get_environment_settings(int *argc, if (android_app->getStringExtra && jstr) { - static char base_path[PATH_MAX_LENGTH]; const char *argv = NULL; *base_path = '\0'; @@ -597,7 +599,6 @@ static void frontend_android_get_environment_settings(int *argc, if (android_app->getStringExtra && jstr) { - static char screenshot_path[PATH_MAX_LENGTH]; const char *argv = NULL; *screenshot_path = '\0'; @@ -620,7 +621,6 @@ static void frontend_android_get_environment_settings(int *argc, if (android_app->getStringExtra && jstr) { - static char downloads_path[PATH_MAX_LENGTH]; const char *argv = NULL; *downloads_path = '\0'; From 57ee3c0c3335f0a92338f58cb20c5f56dc4a4717 Mon Sep 17 00:00:00 2001 From: radius Date: Tue, 7 Jul 2015 14:38:39 -0500 Subject: [PATCH 5/8] rename a few variables --- frontend/drivers/platform_android.c | 86 +++++++++++++++-------------- 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/frontend/drivers/platform_android.c b/frontend/drivers/platform_android.c index 3553b4d3e5..1528050baf 100644 --- a/frontend/drivers/platform_android.c +++ b/frontend/drivers/platform_android.c @@ -437,6 +437,10 @@ static bool device_is_game_console(const char *name) return false; } +static char screenshot_dir[PATH_MAX_LENGTH]; +static char downloads_dir[PATH_MAX_LENGTH]; +static char base_dir[PATH_MAX_LENGTH]; +static char app_dir[PATH_MAX_LENGTH]; static void frontend_android_get_environment_settings(int *argc, char *argv[], void *data, void *params_data) @@ -467,9 +471,6 @@ static void frontend_android_get_environment_settings(int *argc, args->sram_path = NULL; args->state_path = NULL; } - static char screenshot_path[PATH_MAX_LENGTH]; - static char downloads_path[PATH_MAX_LENGTH]; - static char base_path[PATH_MAX_LENGTH]; frontend_android_get_version(&major, &minor, &rel); @@ -579,16 +580,16 @@ static void frontend_android_get_environment_settings(int *argc, { const char *argv = NULL; - *base_path = '\0'; + *base_dir = '\0'; argv = (*env)->GetStringUTFChars(env, jstr, 0); if (argv && *argv) - strlcpy(base_path, argv, sizeof(base_path)); + strlcpy(base_dir, argv, sizeof(base_dir)); (*env)->ReleaseStringUTFChars(env, jstr, argv); - if (*base_path) + if (*base_dir) { - RARCH_LOG("External Storage Location %s.\n", base_path); + RARCH_LOG("External Storage Location %s.\n", base_dir); //todo base dir handler } } @@ -601,16 +602,16 @@ static void frontend_android_get_environment_settings(int *argc, { const char *argv = NULL; - *screenshot_path = '\0'; + *screenshot_dir = '\0'; argv = (*env)->GetStringUTFChars(env, jstr, 0); if (argv && *argv) - strlcpy(screenshot_path, argv, sizeof(screenshot_path)); + strlcpy(screenshot_dir, argv, sizeof(screenshot_dir)); (*env)->ReleaseStringUTFChars(env, jstr, argv); - if (*screenshot_path) + if (*screenshot_dir) { - RARCH_LOG("Screenshot Location %s.\n", screenshot_path); + RARCH_LOG("Screenshot Location %s.\n", screenshot_dir); //todo screenshot handler } } @@ -623,16 +624,16 @@ static void frontend_android_get_environment_settings(int *argc, { const char *argv = NULL; - *downloads_path = '\0'; + *downloads_dir = '\0'; argv = (*env)->GetStringUTFChars(env, jstr, 0); if (argv && *argv) - strlcpy(downloads_path, argv, sizeof(downloads_path)); + strlcpy(downloads_dir, argv, sizeof(downloads_dir)); (*env)->ReleaseStringUTFChars(env, jstr, argv); - if (*downloads_path) + if (*downloads_dir) { - RARCH_LOG("Downloads Location %s.\n", downloads_path); + RARCH_LOG("Downloads Location %s.\n", downloads_dir); //todo downloads handler } } @@ -643,62 +644,63 @@ static void frontend_android_get_environment_settings(int *argc, if (android_app->getStringExtra && jstr) { - static char path[PATH_MAX_LENGTH]; + static char app_dir[PATH_MAX_LENGTH]; const char *argv = NULL; - *path = '\0'; + *app_dir = '\0'; argv = (*env)->GetStringUTFChars(env, jstr, 0); + if (argv && *argv) - strlcpy(path, argv, sizeof(path)); + strlcpy(app_dir, argv, sizeof(app_dir)); (*env)->ReleaseStringUTFChars(env, jstr, argv); - if (*path) + if (*app_dir) { - RARCH_LOG("Data path: [%s].\n", path); - if (args && *path) + RARCH_LOG("Data path: [%s].\n", app_dir); + if (args && *app_dir) { - fill_pathname_join(g_defaults.assets_dir, path, + fill_pathname_join(g_defaults.assets_dir, app_dir, "assets", sizeof(g_defaults.savestate_dir)); - fill_pathname_join(g_defaults.extraction_dir, path, + fill_pathname_join(g_defaults.extraction_dir, app_dir, "tmp", sizeof(g_defaults.extraction_dir)); - fill_pathname_join(g_defaults.shader_dir, path, + fill_pathname_join(g_defaults.shader_dir, app_dir, "shaders_glsl", sizeof(g_defaults.shader_dir)); - fill_pathname_join(g_defaults.overlay_dir, path, + fill_pathname_join(g_defaults.overlay_dir, app_dir, "overlays", sizeof(g_defaults.overlay_dir)); - fill_pathname_join(g_defaults.core_dir, path, + fill_pathname_join(g_defaults.core_dir, app_dir, "cores", sizeof(g_defaults.core_dir)); fill_pathname_join(g_defaults.core_info_dir, - path, "info", sizeof(g_defaults.core_info_dir)); + app_dir, "info", sizeof(g_defaults.core_info_dir)); fill_pathname_join(g_defaults.autoconfig_dir, - path, "autoconfig", sizeof(g_defaults.autoconfig_dir)); + app_dir, "autoconfig", sizeof(g_defaults.autoconfig_dir)); fill_pathname_join(g_defaults.audio_filter_dir, - path, "audio_filters", sizeof(g_defaults.audio_filter_dir)); + app_dir, "audio_filters", sizeof(g_defaults.audio_filter_dir)); fill_pathname_join(g_defaults.video_filter_dir, - path, "video_filters", sizeof(g_defaults.video_filter_dir)); + app_dir, "video_filters", sizeof(g_defaults.video_filter_dir)); strlcpy(g_defaults.content_history_dir, - path, sizeof(g_defaults.content_history_dir)); + app_dir, sizeof(g_defaults.content_history_dir)); fill_pathname_join(g_defaults.database_dir, - path, "database/rdb", sizeof(g_defaults.database_dir)); + app_dir, "database/rdb", sizeof(g_defaults.database_dir)); fill_pathname_join(g_defaults.cursor_dir, - path, "database/cursors", sizeof(g_defaults.cursor_dir)); + app_dir, "database/cursors", sizeof(g_defaults.cursor_dir)); fill_pathname_join(g_defaults.cheats_dir, - path, "cheats", sizeof(g_defaults.cheats_dir)); + app_dir, "cheats", sizeof(g_defaults.cheats_dir)); fill_pathname_join(g_defaults.playlist_dir, - path, "playlists", sizeof(g_defaults.playlist_dir)); + app_dir, "playlists", sizeof(g_defaults.playlist_dir)); fill_pathname_join(g_defaults.remap_dir, - path, "remaps", sizeof(g_defaults.remap_dir)); + app_dir, "remaps", sizeof(g_defaults.remap_dir)); fill_pathname_join(g_defaults.wallpapers_dir, - path, "wallpapers", sizeof(g_defaults.wallpapers_dir)); - if(*downloads_path) + app_dir, "wallpapers", sizeof(g_defaults.wallpapers_dir)); + if(*downloads_dir) { fill_pathname_join(g_defaults.core_assets_dir, - downloads_path, "/", sizeof(g_defaults.core_assets_dir)); + downloads_dir, "/", sizeof(g_defaults.core_assets_dir)); } else { fill_pathname_join(g_defaults.core_assets_dir, - path, "downloads", sizeof(g_defaults.core_assets_dir)); + app_dir, "downloads", sizeof(g_defaults.core_assets_dir)); } } } @@ -869,7 +871,9 @@ static int frontend_android_parse_drive_list(void *data) file_list_t *list = (file_list_t*)data; menu_list_push(list, - "/data/data/com.retroarch/", "", MENU_FILE_DIRECTORY, 0, 0); + "/data/data/com.retroarch/", "Application Dir", MENU_FILE_DIRECTORY, 0, 0); + menu_list_push(list, + "base_dir", "Internal Memory", MENU_FILE_DIRECTORY, 0, 0); menu_list_push(list, "/", "", MENU_FILE_DIRECTORY, 0, 0); From 3c5fe79df81c7db6b704edb8df69eb8decacfbf8 Mon Sep 17 00:00:00 2001 From: radius Date: Tue, 7 Jul 2015 14:48:09 -0500 Subject: [PATCH 6/8] rename a few variables --- frontend/drivers/platform_android.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/frontend/drivers/platform_android.c b/frontend/drivers/platform_android.c index 1528050baf..ed4a2ef0f6 100644 --- a/frontend/drivers/platform_android.c +++ b/frontend/drivers/platform_android.c @@ -439,7 +439,7 @@ static bool device_is_game_console(const char *name) static char screenshot_dir[PATH_MAX_LENGTH]; static char downloads_dir[PATH_MAX_LENGTH]; -static char base_dir[PATH_MAX_LENGTH]; +static char sdcard_dir[PATH_MAX_LENGTH]; static char app_dir[PATH_MAX_LENGTH]; static void frontend_android_get_environment_settings(int *argc, @@ -580,16 +580,16 @@ static void frontend_android_get_environment_settings(int *argc, { const char *argv = NULL; - *base_dir = '\0'; + *sdcard_dir = '\0'; argv = (*env)->GetStringUTFChars(env, jstr, 0); if (argv && *argv) - strlcpy(base_dir, argv, sizeof(base_dir)); + strlcpy(sdcard_dir, argv, sizeof(sdcard_dir)); (*env)->ReleaseStringUTFChars(env, jstr, argv); - if (*base_dir) + if (*sdcard_dir) { - RARCH_LOG("External Storage Location %s.\n", base_dir); + RARCH_LOG("External Storage Location %s.\n", sdcard_dir); //todo base dir handler } } @@ -611,7 +611,7 @@ static void frontend_android_get_environment_settings(int *argc, if (*screenshot_dir) { - RARCH_LOG("Screenshot Location %s.\n", screenshot_dir); + RARCH_LOG("Screenshot Directory [%s]s.\n", screenshot_dir); //todo screenshot handler } } @@ -633,7 +633,7 @@ static void frontend_android_get_environment_settings(int *argc, if (*downloads_dir) { - RARCH_LOG("Downloads Location %s.\n", downloads_dir); + RARCH_LOG("Download Directory [%s].\n", downloads_dir); //todo downloads handler } } @@ -643,8 +643,7 @@ static void frontend_android_get_environment_settings(int *argc, (*env)->NewStringUTF(env, "DATADIR")); if (android_app->getStringExtra && jstr) - { - static char app_dir[PATH_MAX_LENGTH]; + { const char *argv = NULL; *app_dir = '\0'; @@ -657,7 +656,7 @@ static void frontend_android_get_environment_settings(int *argc, if (*app_dir) { - RARCH_LOG("Data path: [%s].\n", app_dir); + RARCH_LOG("Application Dir: [%s].\n", app_dir); if (args && *app_dir) { fill_pathname_join(g_defaults.assets_dir, app_dir, @@ -680,8 +679,8 @@ static void frontend_android_get_environment_settings(int *argc, app_dir, "video_filters", sizeof(g_defaults.video_filter_dir)); strlcpy(g_defaults.content_history_dir, app_dir, sizeof(g_defaults.content_history_dir)); - fill_pathname_join(g_defaults.database_dir, - app_dir, "database/rdb", sizeof(g_defaults.database_dir)); + fill_pathname_join(g_defaults.datasdcard_dir, + app_dir, "database/rdb", sizeof(g_defaults.datasdcard_dir)); fill_pathname_join(g_defaults.cursor_dir, app_dir, "database/cursors", sizeof(g_defaults.cursor_dir)); fill_pathname_join(g_defaults.cheats_dir, @@ -871,9 +870,9 @@ static int frontend_android_parse_drive_list(void *data) file_list_t *list = (file_list_t*)data; menu_list_push(list, - "/data/data/com.retroarch/", "Application Dir", MENU_FILE_DIRECTORY, 0, 0); + app_dir, "Application Dir", MENU_FILE_DIRECTORY, 0, 0); menu_list_push(list, - "base_dir", "Internal Memory", MENU_FILE_DIRECTORY, 0, 0); + sdcard_dir, "Internal Memory", MENU_FILE_DIRECTORY, 0, 0); menu_list_push(list, "/", "", MENU_FILE_DIRECTORY, 0, 0); From cccc221e8c584fec0a45db83edb9b077fb5c43f7 Mon Sep 17 00:00:00 2001 From: radius Date: Tue, 7 Jul 2015 14:56:01 -0500 Subject: [PATCH 7/8] fix search & replace error --- frontend/drivers/platform_android.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/drivers/platform_android.c b/frontend/drivers/platform_android.c index ed4a2ef0f6..6d79d19767 100644 --- a/frontend/drivers/platform_android.c +++ b/frontend/drivers/platform_android.c @@ -679,8 +679,8 @@ static void frontend_android_get_environment_settings(int *argc, app_dir, "video_filters", sizeof(g_defaults.video_filter_dir)); strlcpy(g_defaults.content_history_dir, app_dir, sizeof(g_defaults.content_history_dir)); - fill_pathname_join(g_defaults.datasdcard_dir, - app_dir, "database/rdb", sizeof(g_defaults.datasdcard_dir)); + fill_pathname_join(g_defaults.database_dir, + app_dir, "database/rdb", sizeof(g_defaults.database_dir)); fill_pathname_join(g_defaults.cursor_dir, app_dir, "database/cursors", sizeof(g_defaults.cursor_dir)); fill_pathname_join(g_defaults.cheats_dir, From 610d3168527f1be5684e185ad6ca530f26aabbe2 Mon Sep 17 00:00:00 2001 From: radius Date: Tue, 7 Jul 2015 15:38:00 -0500 Subject: [PATCH 8/8] path had been changed to app_dir --- frontend/drivers/platform_android.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/drivers/platform_android.c b/frontend/drivers/platform_android.c index c03c7b492c..2752ec9d94 100644 --- a/frontend/drivers/platform_android.c +++ b/frontend/drivers/platform_android.c @@ -709,7 +709,7 @@ static void frontend_android_get_environment_settings(int *argc, else { fill_pathname_join(g_defaults.screenshot_dir, - path, "screenshots", sizeof(g_defaults.screenshot_dir)); + app_dir, "screenshots", sizeof(g_defaults.screenshot_dir)); } } }