mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-01 03:10:06 +00:00
Code Activity

AndroidDocument: Support file access to shared storage locations on Android 30+

Browse source
This commit is contained in:
reuk 2022-05-11 20:07:57 +01:00
parent f7def289c5
commit 6e7a2c3225
No known key found for this signature in database
GPG key ID: 9ADCD339CFC98A11
13 changed files with 1914 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

64
modules/juce_gui_basics/native/juce_android_FileChooser.cpp
View file

@ -26,6 +26,19 @@
namespace juce
{
#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
METHOD (getItemCount, "getItemCount", "()I") \
METHOD (getItemAt, "getItemAt", "(I)Landroid/content/ClipData$Item;")
DECLARE_JNI_CLASS (ClipData, "android/content/ClipData")
#undef JNI_CLASS_MEMBERS
#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
METHOD (getUri, "getUri", "()Landroid/net/Uri;")
DECLARE_JNI_CLASS (ClipDataItem, "android/content/ClipData$Item")
#undef JNI_CLASS_MEMBERS
class FileChooser::Native : public FileChooser::Pimpl
{
public:
@ -40,6 +53,7 @@ public:
auto sdkVersion = getAndroidSDKVersion();
auto saveMode = ((flags & FileBrowserComponent::saveMode) != 0);
auto selectsDirectories = ((flags & FileBrowserComponent::canSelectDirectories) != 0);
auto canSelectMultiple = ((flags & FileBrowserComponent::canSelectMultipleItems) != 0);
// You cannot save a directory
jassert (! (saveMode && selectsDirectories));
@ -85,6 +99,13 @@ public:
uri.get());
}
if (canSelectMultiple && sdkVersion >= 18)
{
env->CallObjectMethod (intent.get(),
AndroidIntent.putExtraBool,
javaString ("android.intent.extra.ALLOW_MULTIPLE").get(),
true);
}
if (! selectsDirectories)
{
@ -169,22 +190,41 @@ public:
currentFileChooser = nullptr;
auto* env = getEnv();
Array<URL> chosenURLs;
if (resultCode == /*Activity.RESULT_OK*/ -1 && intentData != nullptr)
const auto getUrls = [&]() -> Array<URL>
{
LocalRef<jobject> uri (env->CallObjectMethod (intentData.get(), AndroidIntent.getData));
if (resultCode != /*Activity.RESULT_OK*/ -1 || intentData == nullptr)
return {};
if (uri != nullptr)
Array<URL> chosenURLs;
const auto addUrl = [env, &chosenURLs] (jobject uri)
{
auto jStr = (jstring) env->CallObjectMethod (uri, JavaObject.toString);
if (jStr != nullptr)
if (auto jStr = (jstring) env->CallObjectMethod (uri, JavaObject.toString))
chosenURLs.add (URL (juceString (env, jStr)));
}
}
};
owner.finished (chosenURLs);
if (LocalRef<jobject> clipData { env->CallObjectMethod (intentData.get(), AndroidIntent.getClipData) })
{
const auto count = env->CallIntMethod (clipData.get(), ClipData.getItemCount);
for (auto i = 0; i < count; ++i)
{
if (LocalRef<jobject> item { env->CallObjectMethod (clipData.get(), ClipData.getItemAt, i) })
{
if (LocalRef<jobject> itemUri { env->CallObjectMethod (item.get(), ClipDataItem.getUri) })
addUrl (itemUri.get());
}
}
}
else if (LocalRef<jobject> uri { env->CallObjectMethod (intentData.get(), AndroidIntent.getData )})
{
addUrl (uri.get());
}
return chosenURLs;
};
owner.finished (getUrls());
}
static Native* currentFileChooser;
@ -200,7 +240,7 @@ public:
{
auto extension = wildcard.fromLastOccurrenceOf (".", false, false);
result.addArray (getMimeTypesForFileExtension (extension));
result.addArray (MimeTypeTable::getMimeTypesForFileExtension (extension));
}
}