From 1d06b07a16c0c15bfdf6a16d5cc68705fbafeffd Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 24 Nov 2013 17:58:23 +0100 Subject: [PATCH] (Android) Add "USED" intent extra to RetroActivity --- .../retroarch/browser/HistorySelection.java | 13 ++++++------ .../browser/mainmenu/MainMenuFragment.java | 12 ++++++----- frontend/platform/platform_android.c | 20 ++++++++++++------- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/android/phoenix/src/com/retroarch/browser/HistorySelection.java b/android/phoenix/src/com/retroarch/browser/HistorySelection.java index 16b94dca0c..ae38e89631 100644 --- a/android/phoenix/src/com/retroarch/browser/HistorySelection.java +++ b/android/phoenix/src/com/retroarch/browser/HistorySelection.java @@ -101,12 +101,13 @@ public final class HistorySelection extends DialogFragment String current_ime = Settings.Secure.getString(ctx.getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD); Toast.makeText(ctx, String.format(getString(R.string.loading_gamepath), gamePath), Toast.LENGTH_SHORT).show(); - Intent myIntent = new Intent(ctx, RetroActivity.class); - myIntent.putExtra("ROM", gamePath); - myIntent.putExtra("LIBRETRO", corePath); - myIntent.putExtra("CONFIGFILE", UserPreferences.getDefaultConfigPath(ctx)); - myIntent.putExtra("IME", current_ime); - startActivity(myIntent); + Intent retro = new Intent(ctx, RetroActivity.class); + retro.putExtra("ROM", gamePath); + retro.putExtra("LIBRETRO", corePath); + retro.putExtra("CONFIGFILE", UserPreferences.getDefaultConfigPath(ctx)); + retro.putExtra("IME", current_ime); + retro.putExtra("USED", "false"); + startActivity(retro); dismiss(); } }; diff --git a/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuFragment.java b/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuFragment.java index 9e2fd79c36..de66806a8b 100644 --- a/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuFragment.java +++ b/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuFragment.java @@ -336,12 +336,13 @@ public final class MainMenuFragment extends PreferenceListFragment implements On final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx); final String libretro_path = prefs.getString("libretro_path", ctx.getApplicationInfo().dataDir + "/cores"); - final Intent rgui = new Intent(ctx, RetroActivity.class); + final Intent retro = new Intent(ctx, RetroActivity.class); final String current_ime = Settings.Secure.getString(ctx.getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD); - rgui.putExtra("LIBRETRO", libretro_path); - rgui.putExtra("CONFIGFILE", UserPreferences.getDefaultConfigPath(ctx)); - rgui.putExtra("IME", current_ime); - startActivity(rgui); + retro.putExtra("LIBRETRO", libretro_path); + retro.putExtra("CONFIGFILE", UserPreferences.getDefaultConfigPath(ctx)); + retro.putExtra("IME", current_ime); + retro.putExtra("USED", "false"); + startActivity(retro); } // Load Core Preference else if (prefKey.equals("loadCorePref")) @@ -396,6 +397,7 @@ public final class MainMenuFragment extends PreferenceListFragment implements On retro.putExtra("LIBRETRO", libretro_path); retro.putExtra("CONFIGFILE", UserPreferences.getDefaultConfigPath(ctx)); retro.putExtra("IME", current_ime); + retro.putExtra("USED", "false"); startActivity(retro); } } diff --git a/frontend/platform/platform_android.c b/frontend/platform/platform_android.c index 0f371473b1..e2a1a5e194 100644 --- a/frontend/platform/platform_android.c +++ b/frontend/platform/platform_android.c @@ -391,10 +391,10 @@ static void get_environment_settings(int argc, char *argv[], void *data) return; CALL_OBJ_METHOD(env, obj, android_app->activity->clazz, android_app->getIntent); + RARCH_LOG("Checking arguments passed from intent...\n"); // ROM CALL_OBJ_METHOD_PARAM(env, jstr, obj, android_app->getStringExtra, (*env)->NewStringUTF(env, "ROM")); - if (android_app->getStringExtra && jstr) { const char *argv = (*env)->GetStringUTFChars(env, jstr, 0); @@ -402,11 +402,11 @@ static void get_environment_settings(int argc, char *argv[], void *data) (*env)->ReleaseStringUTFChars(env, jstr, argv); valschanged = true; + RARCH_LOG("ROM Filename: [%s].\n", g_extern.fullpath); } // Config file CALL_OBJ_METHOD_PARAM(env, jstr, obj, android_app->getStringExtra, (*env)->NewStringUTF(env, "CONFIGFILE")); - if (android_app->getStringExtra && jstr) { const char *argv = (*env)->GetStringUTFChars(env, jstr, 0); @@ -414,11 +414,11 @@ static void get_environment_settings(int argc, char *argv[], void *data) (*env)->ReleaseStringUTFChars(env, jstr, argv); valschanged = true; + RARCH_LOG("Config file: [%s].\n", g_extern.config_path); } // Current IME CALL_OBJ_METHOD_PARAM(env, jstr, obj, android_app->getStringExtra, (*env)->NewStringUTF(env, "IME")); - if (android_app->getStringExtra && jstr) { const char *argv = (*env)->GetStringUTFChars(env, jstr, 0); @@ -426,12 +426,18 @@ static void get_environment_settings(int argc, char *argv[], void *data) (*env)->ReleaseStringUTFChars(env, jstr, argv); valschanged = true; + RARCH_LOG("Current IME: [%s].\n", android_app->current_ime); + } + + CALL_OBJ_METHOD_PARAM(env, jstr, obj, android_app->getStringExtra, (*env)->NewStringUTF(env, "USED")); + if (android_app->getStringExtra && jstr) + { + const char *argv = (*env)->GetStringUTFChars(env, jstr, 0); + bool used = (strcmp(argv, "false") == 0) ? false : true; + RARCH_LOG("USED: [%s].\n", used ? "true" : "false"); + (*env)->ReleaseStringUTFChars(env, jstr, argv); } - RARCH_LOG("Checking arguments passed from intent...\n"); - RARCH_LOG("ROM Filename: [%s].\n", g_extern.fullpath); - RARCH_LOG("Config file: [%s].\n", g_extern.config_path); - RARCH_LOG("Current IME: [%s].\n", android_app->current_ime); if (valschanged) {