mirror of
https://github.com/libretro/RetroArch
synced 2025-01-30 12:32:52 +00:00
further cleanup
This commit is contained in:
parent
5071a33cd3
commit
d8c4c4e276
@ -1446,50 +1446,6 @@ static void frontend_unix_get_env(int *argc,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Screenshots */
|
|
||||||
CALL_OBJ_METHOD_PARAM(env, jstr, obj, android_app->getStringExtra,
|
|
||||||
(*env)->NewStringUTF(env, "SCREENSHOTS"));
|
|
||||||
|
|
||||||
if (android_app->getStringExtra && jstr)
|
|
||||||
{
|
|
||||||
const char *argv = (*env)->GetStringUTFChars(env, jstr, 0);
|
|
||||||
|
|
||||||
*screenshot_dir = '\0';
|
|
||||||
|
|
||||||
if (argv && *argv)
|
|
||||||
strlcpy(screenshot_dir, argv, sizeof(screenshot_dir));
|
|
||||||
(*env)->ReleaseStringUTFChars(env, jstr, argv);
|
|
||||||
|
|
||||||
if (!string_is_empty(screenshot_dir))
|
|
||||||
{
|
|
||||||
__android_log_print(ANDROID_LOG_INFO,
|
|
||||||
"RetroArch", "[ENV]: android picture folder location [%s]\n",
|
|
||||||
screenshot_dir);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Downloads */
|
|
||||||
CALL_OBJ_METHOD_PARAM(env, jstr, obj, android_app->getStringExtra,
|
|
||||||
(*env)->NewStringUTF(env, "DOWNLOADS"));
|
|
||||||
|
|
||||||
if (android_app->getStringExtra && jstr)
|
|
||||||
{
|
|
||||||
const char *argv = (*env)->GetStringUTFChars(env, jstr, 0);
|
|
||||||
|
|
||||||
*downloads_dir = '\0';
|
|
||||||
|
|
||||||
if (argv && *argv)
|
|
||||||
strlcpy(downloads_dir, argv, sizeof(downloads_dir));
|
|
||||||
(*env)->ReleaseStringUTFChars(env, jstr, argv);
|
|
||||||
|
|
||||||
if (!string_is_empty(downloads_dir))
|
|
||||||
{
|
|
||||||
__android_log_print(ANDROID_LOG_INFO,
|
|
||||||
"RetroArch", "[ENV]: android download folder location [%s]\n",
|
|
||||||
downloads_dir);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
CALL_OBJ_METHOD_PARAM(env, jstr, obj, android_app->getStringExtra,
|
CALL_OBJ_METHOD_PARAM(env, jstr, obj, android_app->getStringExtra,
|
||||||
(*env)->NewStringUTF(env, "APK"));
|
(*env)->NewStringUTF(env, "APK"));
|
||||||
|
|
||||||
@ -1611,10 +1567,6 @@ static void frontend_unix_get_env(int *argc,
|
|||||||
app_dir, "assets/wallpapers",
|
app_dir, "assets/wallpapers",
|
||||||
sizeof(g_defaults.dirs[DEFAULT_DIR_WALLPAPERS]));
|
sizeof(g_defaults.dirs[DEFAULT_DIR_WALLPAPERS]));
|
||||||
|
|
||||||
__android_log_print(ANDROID_LOG_INFO,
|
|
||||||
"RetroArch", "[ENV]: default download folder: [%s]",
|
|
||||||
g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS]);
|
|
||||||
|
|
||||||
/* This switch tries to handle the different locations for devices with
|
/* This switch tries to handle the different locations for devices with
|
||||||
weird write permissions. Should be largelly unnecesary nowadays. Most
|
weird write permissions. Should be largelly unnecesary nowadays. Most
|
||||||
devices I have tested are INTERNAL_STORAGE_WRITABLE but better safe than sorry */
|
devices I have tested are INTERNAL_STORAGE_WRITABLE but better safe than sorry */
|
||||||
@ -2019,11 +1971,6 @@ static int frontend_unix_parse_drive_list(void *data, bool load_content)
|
|||||||
msg_hash_to_str(MSG_REMOVABLE_STORAGE),
|
msg_hash_to_str(MSG_REMOVABLE_STORAGE),
|
||||||
enum_idx,
|
enum_idx,
|
||||||
FILE_TYPE_DIRECTORY, 0, 0);
|
FILE_TYPE_DIRECTORY, 0, 0);
|
||||||
menu_entries_append_enum(list,
|
|
||||||
"/mnt",
|
|
||||||
msg_hash_to_str(MSG_REMOVABLE_STORAGE),
|
|
||||||
enum_idx,
|
|
||||||
FILE_TYPE_DIRECTORY, 0, 0);
|
|
||||||
if (!string_is_empty(internal_storage_app_path))
|
if (!string_is_empty(internal_storage_app_path))
|
||||||
{
|
{
|
||||||
menu_entries_append_enum(list,
|
menu_entries_append_enum(list,
|
||||||
|
@ -180,8 +180,6 @@ public final class MainMenuActivity extends PreferenceActivity
|
|||||||
retro.putExtra("DATADIR", dataDirPath);
|
retro.putExtra("DATADIR", dataDirPath);
|
||||||
retro.putExtra("APK", dataSourcePath);
|
retro.putExtra("APK", dataSourcePath);
|
||||||
retro.putExtra("SDCARD", Environment.getExternalStorageDirectory().getAbsolutePath());
|
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/" + PACKAGE_NAME + "/files";
|
String external = Environment.getExternalStorageDirectory().getAbsolutePath() + "/Android/data/" + PACKAGE_NAME + "/files";
|
||||||
retro.putExtra("EXTERNAL", external);
|
retro.putExtra("EXTERNAL", external);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user