piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Android: Show a message when adding a folder with no games

Browse Source 
To catch people who try to use unsupported formats.
This commit is contained in:
JosJuice
2020-11-08 23:01:59 +01:00
parent 399ede37a6
commit 73855168f3
7 changed files with 69 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Android/jni/AndroidCommon/AndroidCommon.cpp
View File

@ -124,9 +124,9 @@ std::string GetAndroidContentDisplayName(const std::string& uri)
std::vector<std::string> GetAndroidContentChildNames(const std::string& uri)
{
JNIEnv* env = IDCache::GetEnvForThread();
jobject children =
env->CallStaticObjectMethod(IDCache::GetContentHandlerClass(),
IDCache::GetContentHandlerGetChildNames(), ToJString(env, uri));
jobject children = env->CallStaticObjectMethod(IDCache::GetContentHandlerClass(),
IDCache::GetContentHandlerGetChildNames(),
ToJString(env, uri), false);
return JStringArrayToVector(env, reinterpret_cast<jobjectArray>(children));
}

2
Source/Android/jni/AndroidCommon/AndroidCommon.h
View File

@ -35,7 +35,7 @@ jlong GetAndroidContentSizeAndIsDirectory(const std::string& uri);
// An empty string will be returned for files which do not exist.
std::string GetAndroidContentDisplayName(const std::string& uri);
// Returns the display names of all children of a directory.
// Returns the display names of all children of a directory, non-recursively.
std::vector<std::string> GetAndroidContentChildNames(const std::string& uri);
int GetNetworkIpAddress();

2
Source/Android/jni/AndroidCommon/IDCache.cpp
View File

@ -330,7 +330,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved)
s_content_handler_get_display_name = env->GetStaticMethodID(
s_content_handler_class, "getDisplayName", "(Ljava/lang/String;)Ljava/lang/String;");
s_content_handler_get_child_names = env->GetStaticMethodID(
s_content_handler_class, "getChildNames", "(Ljava/lang/String;)[Ljava/lang/String;");
s_content_handler_class, "getChildNames", "(Ljava/lang/String;Z)[Ljava/lang/String;");
const jclass network_helper_class =
env->FindClass("org/dolphinemu/dolphinemu/utils/NetworkHelper");