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

Android: Fixed some issues in the native content sharing code

Browse source
This commit is contained in:
ed 2020-03-03 15:51:55 +00:00
parent 9c83b28e4a
commit 618f3645b2
7 changed files with 117 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

15
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h
View file

@ -887,7 +887,7 @@ private:
if (m->getID() == moduleID)
{
auto javaFolder = m->getFolder().getChildFile ("native").getChildFile ("javaopt");
addModuleJavaFolderToSourceSet (javaSourceSets, javaFolder.getChildFile("app"));
addModuleJavaFolderToSourceSet (javaSourceSets, javaFolder.getChildFile ("app"));
return;
}
}
@ -902,13 +902,14 @@ private:
{
auto javaFolder = module->getFolder().getChildFile ("native").getChildFile ("javacore");
addModuleJavaFolderToSourceSet (javaSourceSets, javaFolder.getChildFile("init"));
addModuleJavaFolderToSourceSet (javaSourceSets, javaFolder.getChildFile ("init"));
if (! isLibrary())
addModuleJavaFolderToSourceSet (javaSourceSets, javaFolder.getChildFile("app"));
addModuleJavaFolderToSourceSet (javaSourceSets, javaFolder.getChildFile ("app"));
}
if (project.getEnabledModules().isModuleEnabled ("juce_gui_basics") && getActivityClassString() == getDefaultActivityClass())
if (project.getEnabledModules().isModuleEnabled ("juce_gui_basics")
&& (getActivityClassString() == getDefaultActivityClass() || isContentSharingEnabled()))
addOptJavaFolderToSourceSetsForModule (javaSourceSets, modules, "juce_gui_basics");
if (areRemoteNotificationsEnabled())
@ -1225,6 +1226,8 @@ private:
bool isInAppBillingEnabled() const { return androidInAppBillingPermission.get(); }
bool isContentSharingEnabled() const { return androidEnableContentSharing.get(); }
String getJNIActivityClassName() const
{
return getActivityClassString().replaceCharacter ('.', '/');
@ -1777,14 +1780,14 @@ private:
void createProviderElement (XmlElement& application) const
{
if (androidEnableContentSharing.get())
if (isContentSharingEnabled())
{
auto* provider = application.createNewChildElement ("provider");
provider->setAttribute ("android:name", "com.roli.juce.JuceSharingContentProvider");
provider->setAttribute ("android:authorities", project.getBundleIdentifierString().toLowerCase() + ".sharingcontentprovider");
provider->setAttribute ("android:grantUriPermissions", "true");
provider->setAttribute ("android:exported", "false");
provider->setAttribute ("android:exported", "true");
}
}