ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Base] Remove Android jfieldIDs used only once from the file scope

This commit is contained in:
Triang3l 2022-01-31 13:00:28 +03:00
parent d998c13ee8
commit 009f709ad4
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/xenia/base/system_android.cc
View File

@ -18,9 +18,9 @@
namespace xe { namespace xe {
// To store jmethodIDs persistently, global references to the classes are // To store method and field IDs persistently, global references to the classes
// required to prevent the classes from being unloaded and reloaded, potentially // are required to prevent the classes from being unloaded and reloaded,
// changing the method IDs. // potentially changing the IDs.
static jclass android_system_application_context_class_ = nullptr; static jclass android_system_application_context_class_ = nullptr;
static jmethodID android_system_application_context_start_activity_ = nullptr; static jmethodID android_system_application_context_start_activity_ = nullptr;
@ -29,9 +29,6 @@ static jclass android_system_uri_class_ = nullptr;
static jmethodID android_system_uri_parse_ = nullptr; static jmethodID android_system_uri_parse_ = nullptr;
static jclass android_system_intent_class_ = nullptr; static jclass android_system_intent_class_ = nullptr;
static jfieldID android_system_intent_action_view_field_id_ = nullptr;
static jfieldID android_system_intent_flag_activity_new_task_field_id_ =
nullptr;
static jmethodID android_system_intent_init_action_uri_ = nullptr; static jmethodID android_system_intent_init_action_uri_ = nullptr;
static jmethodID android_system_intent_add_flags_ = nullptr; static jmethodID android_system_intent_add_flags_ = nullptr;
static jobject android_system_intent_action_view_ = nullptr; static jobject android_system_intent_action_view_ = nullptr;
@ -152,14 +149,14 @@ bool InitializeAndroidSystemForApplicationContext() {
return false; return false;
} }
bool intent_ids_obtained = true; bool intent_ids_obtained = true;
intent_ids_obtained &= (android_system_intent_action_view_field_id_ = jfieldID intent_action_view_id;
jni_env->GetStaticFieldID( intent_ids_obtained &= (intent_action_view_id = jni_env->GetStaticFieldID(
android_system_intent_class_, "ACTION_VIEW", android_system_intent_class_, "ACTION_VIEW",
"Ljava/lang/String;")) != nullptr; "Ljava/lang/String;")) != nullptr;
jfieldID intent_flag_activity_new_task_id;
intent_ids_obtained &= intent_ids_obtained &=
(android_system_intent_flag_activity_new_task_field_id_ = (intent_flag_activity_new_task_id = jni_env->GetStaticFieldID(
jni_env->GetStaticFieldID(android_system_intent_class_, android_system_intent_class_, "FLAG_ACTIVITY_NEW_TASK", "I")) !=
"FLAG_ACTIVITY_NEW_TASK", "I")) !=
nullptr; nullptr;
intent_ids_obtained &= intent_ids_obtained &=
(android_system_intent_init_action_uri_ = jni_env->GetMethodID( (android_system_intent_init_action_uri_ = jni_env->GetMethodID(
@ -178,8 +175,7 @@ bool InitializeAndroidSystemForApplicationContext() {
} }
{ {
jobject intent_action_view_local_ref = jni_env->GetStaticObjectField( jobject intent_action_view_local_ref = jni_env->GetStaticObjectField(
android_system_intent_class_, android_system_intent_class_, intent_action_view_id);
android_system_intent_action_view_field_id_);
if (!intent_action_view_local_ref) { if (!intent_action_view_local_ref) {
XELOGE( XELOGE(
"InitializeAndroidSystemForApplicationContext: Failed to get the " "InitializeAndroidSystemForApplicationContext: Failed to get the "
@ -199,8 +195,7 @@ bool InitializeAndroidSystemForApplicationContext() {
} }
} }
android_system_intent_flag_activity_new_task_ = jni_env->GetStaticIntField( android_system_intent_flag_activity_new_task_ = jni_env->GetStaticIntField(
android_system_intent_class_, android_system_intent_class_, intent_flag_activity_new_task_id);
android_system_intent_flag_activity_new_task_field_id_);
} }
android_system_initialized_ = true; android_system_initialized_ = true;
@ -212,8 +207,6 @@ void ShutdownAndroidSystem() {
android_system_initialized_ = false; android_system_initialized_ = false;
android_system_intent_add_flags_ = nullptr; android_system_intent_add_flags_ = nullptr;
android_system_intent_init_action_uri_ = nullptr; android_system_intent_init_action_uri_ = nullptr;
android_system_intent_flag_activity_new_task_field_id_ = nullptr;
android_system_intent_action_view_field_id_ = nullptr;
android_system_uri_parse_ = nullptr; android_system_uri_parse_ = nullptr;
android_system_application_context_start_activity_ = nullptr; android_system_application_context_start_activity_ = nullptr;
JNIEnv* jni_env = GetAndroidThreadJNIEnv(); JNIEnv* jni_env = GetAndroidThreadJNIEnv();