Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-27 08:05:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Android: Don't call toast methods off UI thread

Browse source
This commit is contained in:
Connor McLaughlin 2021-01-21 13:56:10 +10:00
parent 4433197665
commit 3c3bfdea93
2 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
android/app/src/cpp/android_host_interface.cpp
View file

@ -34,8 +34,6 @@ static jclass s_String_class;
static jclass s_AndroidHostInterface_class; static jclass s_AndroidHostInterface_class;
static jmethodID s_AndroidHostInterface_constructor; static jmethodID s_AndroidHostInterface_constructor;
static jfieldID s_AndroidHostInterface_field_mNativePointer; static jfieldID s_AndroidHostInterface_field_mNativePointer;
static jmethodID s_AndroidHostInterface_method_reportError;
static jmethodID s_AndroidHostInterface_method_reportMessage;
static jmethodID s_AndroidHostInterface_method_openAssetStream; static jmethodID s_AndroidHostInterface_method_openAssetStream;
static jclass s_EmulationActivity_class; static jclass s_EmulationActivity_class;
static jmethodID s_EmulationActivity_method_reportError; static jmethodID s_EmulationActivity_method_reportError;
@ -163,13 +161,13 @@ void AndroidHostInterface::ReportError(const char* message)
{ {
CommonHostInterface::ReportError(message); CommonHostInterface::ReportError(message);
JNIEnv* env = AndroidHelpers::GetJNIEnv();
jstring message_jstr = env->NewStringUTF(message);
if (m_emulation_activity_object) if (m_emulation_activity_object)
{
JNIEnv* env = AndroidHelpers::GetJNIEnv();
jstring message_jstr = env->NewStringUTF(message);
env->CallVoidMethod(m_emulation_activity_object, s_EmulationActivity_method_reportError, message_jstr); env->CallVoidMethod(m_emulation_activity_object, s_EmulationActivity_method_reportError, message_jstr);
else env->DeleteLocalRef(message_jstr);
env->CallVoidMethod(m_java_object, s_AndroidHostInterface_method_reportError, message_jstr); }
env->DeleteLocalRef(message_jstr);
} }
void AndroidHostInterface::ReportMessage(const char* message) void AndroidHostInterface::ReportMessage(const char* message)
@ -177,12 +175,12 @@ void AndroidHostInterface::ReportMessage(const char* message)
CommonHostInterface::ReportMessage(message); CommonHostInterface::ReportMessage(message);
JNIEnv* env = AndroidHelpers::GetJNIEnv(); JNIEnv* env = AndroidHelpers::GetJNIEnv();
jstring message_jstr = env->NewStringUTF(message);
if (m_emulation_activity_object) if (m_emulation_activity_object)
{
jstring message_jstr = env->NewStringUTF(message);
env->CallVoidMethod(m_emulation_activity_object, s_EmulationActivity_method_reportMessage, message_jstr); env->CallVoidMethod(m_emulation_activity_object, s_EmulationActivity_method_reportMessage, message_jstr);
else env->DeleteLocalRef(message_jstr);
env->CallVoidMethod(m_java_object, s_AndroidHostInterface_method_reportMessage, message_jstr); }
env->DeleteLocalRef(message_jstr);
} }
std::string AndroidHostInterface::GetStringSettingValue(const char* section, const char* key, const char* default_value) std::string AndroidHostInterface::GetStringSettingValue(const char* section, const char* key, const char* default_value)
@ -889,10 +887,6 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved)
env->GetMethodID(s_AndroidHostInterface_class, "<init>", "(Landroid/content/Context;)V")) == nullptr || env->GetMethodID(s_AndroidHostInterface_class, "<init>", "(Landroid/content/Context;)V")) == nullptr ||
(s_AndroidHostInterface_field_mNativePointer = (s_AndroidHostInterface_field_mNativePointer =
env->GetFieldID(s_AndroidHostInterface_class, "mNativePointer", "J")) == nullptr || env->GetFieldID(s_AndroidHostInterface_class, "mNativePointer", "J")) == nullptr ||
(s_AndroidHostInterface_method_reportError =
env->GetMethodID(s_AndroidHostInterface_class, "reportError", "(Ljava/lang/String;)V")) == nullptr ||
(s_AndroidHostInterface_method_reportMessage =
env->GetMethodID(s_AndroidHostInterface_class, "reportMessage", "(Ljava/lang/String;)V")) == nullptr ||
(s_AndroidHostInterface_method_openAssetStream = env->GetMethodID( (s_AndroidHostInterface_method_openAssetStream = env->GetMethodID(
s_AndroidHostInterface_class, "openAssetStream", "(Ljava/lang/String;)Ljava/io/InputStream;")) == nullptr || s_AndroidHostInterface_class, "openAssetStream", "(Ljava/lang/String;)Ljava/io/InputStream;")) == nullptr ||
(emulation_activity_class = env->FindClass("com/github/stenzek/duckstation/EmulationActivity")) == nullptr || (emulation_activity_class = env->FindClass("com/github/stenzek/duckstation/EmulationActivity")) == nullptr ||

8
android/app/src/main/java/com/github/stenzek/duckstation/AndroidHostInterface.java
View file

@ -25,14 +25,6 @@ public class AndroidHostInterface {
this.mContext = context; this.mContext = context;
} }
public void reportError(String message) {
Toast.makeText(mContext, message, Toast.LENGTH_LONG).show();
}
public void reportMessage(String message) {
Toast.makeText(mContext, message, Toast.LENGTH_SHORT).show();
}
public InputStream openAssetStream(String path) { public InputStream openAssetStream(String path) {
try { try {
return mContext.getAssets().open(path, AssetManager.ACCESS_STREAMING); return mContext.getAssets().open(path, AssetManager.ACCESS_STREAMING);