diff --git a/BREAKING-CHANGES.txt b/BREAKING-CHANGES.txt
index 94086eefb0..1176d51206 100644
--- a/BREAKING-CHANGES.txt
+++ b/BREAKING-CHANGES.txt
@@ -4,6 +4,41 @@ JUCE breaking changes
Develop
=======
+Change
+-----
+Multiple changes to low-level, non-public JNI and Android APIs.
+
+Possible Issues
+---------------
+If you were using any non-public, low-level JNI macros, calling java code or recieving JNI callbacks, then your code will probably no longer work. See the forum for further details.
+
+Workaround
+----------
+See the forum for further details.
+
+Rationale
+---------
+See the forum for further details.
+
+
+Change
+-----
+The minimum Android version for a JUCE app is now Android 4.1
+
+Possible Issues
+---------------
+Your app may not run on very old versions of Android (less than 5% of the devices).
+
+Workaround
+----------
+There is no workaround.
+
+Rationale
+---------
+Less than 5% of all devices in the world run versions of Android older than Android
+4.1. In the interest of keeping JUCE code clean and lean, we must depricate support
+for very old Android versions from time to time.
+
Version 5.4.0
=============
@@ -94,7 +129,6 @@ The new createAndAddParameter method is much more flexible and enables any
parameter types derived from RangedAudioParameter to be managed by the
AudioProcessorValueTreeState.
-
Change
------
The Projucer's per-exporter Android SDK/NDK path options have been removed.
@@ -114,7 +148,6 @@ Rationale
Having multiple places where the paths could be set was confusing and could
cause unexpected mismatches.
-
Change
------
SystemStats::getDeviceDescription() will now return the device code on iOS e.g.
diff --git a/examples/DemoRunner/Builds/Android/app/build.gradle b/examples/DemoRunner/Builds/Android/app/build.gradle
index c384afbb24..aef27b2f8d 100644
--- a/examples/DemoRunner/Builds/Android/app/build.gradle
+++ b/examples/DemoRunner/Builds/Android/app/build.gradle
@@ -83,11 +83,21 @@ android {
}
}
-repositories {
-}
+ sourceSets {
+ main.java.srcDirs +=
+ ["../../../../../modules/juce_audio_devices/native/java",
+ "../../../../../modules/juce_core/native/java",
+ "../../../../../modules/juce_gui_basics/native/java",
+ "../../../../../modules/juce_gui_extra/native/java",
+ "../../../../../modules/juce_opengl/native/java",
+ "../../../../../modules/juce_video/native/java"]
+ }
-dependencies {
-}
+ repositories {
+ }
+
+ dependencies {
+ }
}
diff --git a/examples/DemoRunner/Builds/Android/app/src/main/AndroidManifest.xml b/examples/DemoRunner/Builds/Android/app/src/main/AndroidManifest.xml
index f302ae11ae..d193df8f09 100644
--- a/examples/DemoRunner/Builds/Android/app/src/main/AndroidManifest.xml
+++ b/examples/DemoRunner/Builds/Android/app/src/main/AndroidManifest.xml
@@ -12,15 +12,15 @@
-
-
+
-
diff --git a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt
index e7c72285be..28489c0538 100644
--- a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt
+++ b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt
@@ -8,7 +8,7 @@ SET(BINARY_NAME "juce_jni")
add_library("cpufeatures" STATIC "${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c")
set_source_files_properties("${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c" PROPERTIES COMPILE_FLAGS "-Wno-sign-conversion -Wno-gnu-statement-expression")
-add_definitions("-DJUCE_ANDROID=1" "-DJUCE_ANDROID_API_VERSION=23" "-DJUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_audioperformancetest_AudioPerformanceTest" "-DJUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/audioperformancetest/AudioPerformanceTest\"" "-DJUCE_ANDROID_SHARING_CONTENT_PROVIDER_CLASSNAME=com_juce_audioperformancetest_SharingContentProvider" "-DJUCE_ANDROID_SHARING_CONTENT_PROVIDER_CLASSPATH=\"com/juce/audioperformancetest/SharingContentProvider\"" "-DJUCE_PUSH_NOTIFICATIONS=1" "-DJUCE_ANDROID_GL_ES_VERSION_3_0=1" "-DJUCER_ANDROIDSTUDIO_7F0E4A25=1" "-DJUCE_APP_VERSION=1.0.0" "-DJUCE_APP_VERSION_HEX=0x10000")
+add_definitions("-DJUCE_ANDROID=1" "-DJUCE_ANDROID_API_VERSION=23" "-DJUCE_PUSH_NOTIFICATIONS=1" "-DJUCE_ANDROID_GL_ES_VERSION_3_0=1" "-DJUCER_ANDROIDSTUDIO_7F0E4A25=1" "-DJUCE_APP_VERSION=1.0.0" "-DJUCE_APP_VERSION_HEX=0x10000")
include_directories( AFTER
"../../../JuceLibraryCode"
@@ -558,6 +558,7 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_core/misc/juce_Uuid.h"
"../../../../../modules/juce_core/misc/juce_WindowsRegistry.h"
"../../../../../modules/juce_core/native/juce_android_Files.cpp"
+ "../../../../../modules/juce_core/native/juce_android_JNIHelpers.cpp"
"../../../../../modules/juce_core/native/juce_android_JNIHelpers.h"
"../../../../../modules/juce_core/native/juce_android_Misc.cpp"
"../../../../../modules/juce_core/native/juce_android_Network.cpp"
@@ -1828,6 +1829,7 @@ set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.cpp
set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/misc/juce_WindowsRegistry.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_Files.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
+set_source_files_properties("../../../../../modules/juce_core/native/juce_android_JNIHelpers.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_JNIHelpers.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_Misc.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_Network.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
diff --git a/extras/AudioPerformanceTest/Builds/Android/app/build.gradle b/extras/AudioPerformanceTest/Builds/Android/app/build.gradle
index a9566718b6..75b3a35d08 100644
--- a/extras/AudioPerformanceTest/Builds/Android/app/build.gradle
+++ b/extras/AudioPerformanceTest/Builds/Android/app/build.gradle
@@ -86,11 +86,19 @@ android {
}
}
-repositories {
-}
+ sourceSets {
+ main.java.srcDirs +=
+ ["../../../../../modules/juce_audio_devices/native/java",
+ "../../../../../modules/juce_core/native/java",
+ "../../../../../modules/juce_gui_basics/native/java",
+ "../../../../../modules/juce_gui_extra/native/java"]
+ }
-dependencies {
-}
+ repositories {
+ }
+
+ dependencies {
+ }
}
diff --git a/extras/AudioPerformanceTest/Builds/Android/app/src/main/AndroidManifest.xml b/extras/AudioPerformanceTest/Builds/Android/app/src/main/AndroidManifest.xml
index 447fd462cd..78eb252166 100644
--- a/extras/AudioPerformanceTest/Builds/Android/app/src/main/AndroidManifest.xml
+++ b/extras/AudioPerformanceTest/Builds/Android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
+ package="com.juce.AudioPerformanceTest">
@@ -9,8 +9,8 @@
-
-
+
diff --git a/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt b/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt
index 937852bf08..fa631ed1f0 100644
--- a/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt
+++ b/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt
@@ -8,7 +8,7 @@ SET(BINARY_NAME "juce_jni")
add_library("cpufeatures" STATIC "${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c")
set_source_files_properties("${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c" PROPERTIES COMPILE_FLAGS "-Wno-sign-conversion -Wno-gnu-statement-expression")
-add_definitions("-DJUCE_ANDROID=1" "-DJUCE_ANDROID_API_VERSION=23" "-DJUCE_ANDROID_ACTIVITY_CLASSNAME=com_roli_juce_pluginhost_AudioPluginHost" "-DJUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/roli/juce/pluginhost/AudioPluginHost\"" "-DJUCE_ANDROID_SHARING_CONTENT_PROVIDER_CLASSNAME=com_roli_juce_pluginhost_SharingContentProvider" "-DJUCE_ANDROID_SHARING_CONTENT_PROVIDER_CLASSPATH=\"com/roli/juce/pluginhost/SharingContentProvider\"" "-DJUCE_PUSH_NOTIFICATIONS=1" "-DJUCE_ANDROID_GL_ES_VERSION_3_0=1" "-DJUCER_ANDROIDSTUDIO_7F0E4A25=1" "-DJUCE_APP_VERSION=1.0.0" "-DJUCE_APP_VERSION_HEX=0x10000")
+add_definitions("-DJUCE_ANDROID=1" "-DJUCE_ANDROID_API_VERSION=23" "-DJUCE_PUSH_NOTIFICATIONS=1" "-DJUCE_ANDROID_GL_ES_VERSION_3_0=1" "-DJUCER_ANDROIDSTUDIO_7F0E4A25=1" "-DJUCE_APP_VERSION=1.0.0" "-DJUCE_APP_VERSION_HEX=0x10000")
include_directories( AFTER
"../../../../../modules/juce_audio_processors/format_types/VST3_SDK"
@@ -575,6 +575,7 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_core/misc/juce_Uuid.h"
"../../../../../modules/juce_core/misc/juce_WindowsRegistry.h"
"../../../../../modules/juce_core/native/juce_android_Files.cpp"
+ "../../../../../modules/juce_core/native/juce_android_JNIHelpers.cpp"
"../../../../../modules/juce_core/native/juce_android_JNIHelpers.h"
"../../../../../modules/juce_core/native/juce_android_Misc.cpp"
"../../../../../modules/juce_core/native/juce_android_Network.cpp"
@@ -1918,6 +1919,7 @@ set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.cpp
set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/misc/juce_WindowsRegistry.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_Files.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
+set_source_files_properties("../../../../../modules/juce_core/native/juce_android_JNIHelpers.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_JNIHelpers.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_Misc.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_Network.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
diff --git a/extras/AudioPluginHost/Builds/Android/app/build.gradle b/extras/AudioPluginHost/Builds/Android/app/build.gradle
index 31fc97b388..a6601bfbd1 100644
--- a/extras/AudioPluginHost/Builds/Android/app/build.gradle
+++ b/extras/AudioPluginHost/Builds/Android/app/build.gradle
@@ -83,11 +83,21 @@ android {
}
}
-repositories {
-}
+ sourceSets {
+ main.java.srcDirs +=
+ ["../../../../../modules/juce_audio_devices/native/java",
+ "../../../../../modules/juce_core/native/java",
+ "../../../../../modules/juce_gui_basics/native/java",
+ "../../../../../modules/juce_gui_extra/native/java",
+ "../../../../../modules/juce_opengl/native/java",
+ "../../../../../modules/juce_video/native/java"]
+ }
-dependencies {
-}
+ repositories {
+ }
+
+ dependencies {
+ }
}
diff --git a/extras/AudioPluginHost/Builds/Android/app/src/main/AndroidManifest.xml b/extras/AudioPluginHost/Builds/Android/app/src/main/AndroidManifest.xml
index 7a68c4f7d9..100f76348b 100644
--- a/extras/AudioPluginHost/Builds/Android/app/src/main/AndroidManifest.xml
+++ b/extras/AudioPluginHost/Builds/Android/app/src/main/AndroidManifest.xml
@@ -11,8 +11,8 @@
-
-
+
diff --git a/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt b/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt
index 5a8da270fe..49765aedcd 100644
--- a/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt
+++ b/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt
@@ -8,7 +8,7 @@ SET(BINARY_NAME "juce_jni")
add_library("cpufeatures" STATIC "${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c")
set_source_files_properties("${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c" PROPERTIES COMPILE_FLAGS "-Wno-sign-conversion -Wno-gnu-statement-expression")
-add_definitions("-DJUCE_ANDROID=1" "-DJUCE_ANDROID_API_VERSION=10" "-DJUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_networkgraphicsdemo_JUCENetworkGraphicsDemo" "-DJUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/networkgraphicsdemo/JUCENetworkGraphicsDemo\"" "-DJUCE_ANDROID_SHARING_CONTENT_PROVIDER_CLASSNAME=com_juce_networkgraphicsdemo_SharingContentProvider" "-DJUCE_ANDROID_SHARING_CONTENT_PROVIDER_CLASSPATH=\"com/juce/networkgraphicsdemo/SharingContentProvider\"" "-DJUCE_PUSH_NOTIFICATIONS=1" "-DJUCER_ANDROIDSTUDIO_7F0E4A25=1" "-DJUCE_APP_VERSION=1.0.0" "-DJUCE_APP_VERSION_HEX=0x10000")
+add_definitions("-DJUCE_ANDROID=1" "-DJUCE_ANDROID_API_VERSION=10" "-DJUCE_PUSH_NOTIFICATIONS=1" "-DJUCER_ANDROIDSTUDIO_7F0E4A25=1" "-DJUCE_APP_VERSION=1.0.0" "-DJUCE_APP_VERSION_HEX=0x10000")
include_directories( AFTER
"../../../JuceLibraryCode"
@@ -562,6 +562,7 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_core/misc/juce_Uuid.h"
"../../../../../modules/juce_core/misc/juce_WindowsRegistry.h"
"../../../../../modules/juce_core/native/juce_android_Files.cpp"
+ "../../../../../modules/juce_core/native/juce_android_JNIHelpers.cpp"
"../../../../../modules/juce_core/native/juce_android_JNIHelpers.h"
"../../../../../modules/juce_core/native/juce_android_Misc.cpp"
"../../../../../modules/juce_core/native/juce_android_Network.cpp"
@@ -1907,6 +1908,7 @@ set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.cpp
set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/misc/juce_WindowsRegistry.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_Files.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
+set_source_files_properties("../../../../../modules/juce_core/native/juce_android_JNIHelpers.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_JNIHelpers.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_Misc.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_Network.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
diff --git a/extras/NetworkGraphicsDemo/Builds/Android/app/build.gradle b/extras/NetworkGraphicsDemo/Builds/Android/app/build.gradle
index 98a8bc1afc..ea7b9aa70e 100644
--- a/extras/NetworkGraphicsDemo/Builds/Android/app/build.gradle
+++ b/extras/NetworkGraphicsDemo/Builds/Android/app/build.gradle
@@ -83,11 +83,20 @@ android {
}
}
-repositories {
-}
+ sourceSets {
+ main.java.srcDirs +=
+ ["../../../../../modules/juce_audio_devices/native/java",
+ "../../../../../modules/juce_core/native/java",
+ "../../../../../modules/juce_gui_basics/native/java",
+ "../../../../../modules/juce_gui_extra/native/java",
+ "../../../../../modules/juce_opengl/native/java"]
+ }
-dependencies {
-}
+ repositories {
+ }
+
+ dependencies {
+ }
}
diff --git a/extras/NetworkGraphicsDemo/Builds/Android/app/src/main/AndroidManifest.xml b/extras/NetworkGraphicsDemo/Builds/Android/app/src/main/AndroidManifest.xml
index 4c8c56ab3d..00841a34bc 100644
--- a/extras/NetworkGraphicsDemo/Builds/Android/app/src/main/AndroidManifest.xml
+++ b/extras/NetworkGraphicsDemo/Builds/Android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
+ package="com.juce.NetworkGraphicsDemo">
@@ -10,8 +10,8 @@
-
-
+
diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h
index b81bd63b8d..924a5e4fd5 100644
--- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h
+++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h
@@ -55,6 +55,7 @@ public:
{
case ProjectType::Target::GUIApp:
case ProjectType::Target::StaticLibrary:
+ case ProjectType::Target::DynamicLibrary:
case ProjectType::Target::StandalonePlugIn:
return true;
default:
@@ -93,8 +94,8 @@ public:
}
//==============================================================================
- ValueWithDefault androidJavaLibs, androidRepositories, androidDependencies, androidScreenOrientation, androidActivityClass,
- androidActivitySubClassName, androidActivityBaseClassName, androidManifestCustomXmlElements, androidVersionCode,
+ ValueWithDefault androidJavaLibs, androidAdditionalJavaFolders, androidAdditionalResourceFolders, androidRepositories, androidDependencies, androidScreenOrientation,
+ androidCustomActivityClass, androidCustomApplicationClass, androidManifestCustomXmlElements, androidVersionCode,
androidMinimumSDK, androidTheme, androidSharedLibraries, androidStaticLibraries, androidExtraAssetsFolder,
androidOboeRepositoryPath, androidInternetNeeded, androidMicNeeded, androidCameraNeeded, androidBluetoothNeeded, androidExternalReadPermission,
androidExternalWritePermission, androidInAppBillingPermission, androidVibratePermission,androidOtherPermissions,
@@ -105,15 +106,16 @@ public:
AndroidProjectExporter (Project& p, const ValueTree& t)
: ProjectExporter (p, t),
androidJavaLibs (settings, Ids::androidJavaLibs, getUndoManager()),
+ androidAdditionalJavaFolders (settings, Ids::androidAdditionalJavaFolders, getUndoManager()),
+ androidAdditionalResourceFolders (settings, Ids::androidAdditionalResourceFolders, getUndoManager()),
androidRepositories (settings, Ids::androidRepositories, getUndoManager()),
androidDependencies (settings, Ids::androidDependencies, getUndoManager()),
androidScreenOrientation (settings, Ids::androidScreenOrientation, getUndoManager(), "unspecified"),
- androidActivityClass (settings, Ids::androidActivityClass, getUndoManager(), createDefaultClassName()),
- androidActivitySubClassName (settings, Ids::androidActivitySubClassName, getUndoManager()),
- androidActivityBaseClassName (settings, Ids::androidActivityBaseClassName, getUndoManager(), "Activity"),
+ androidCustomActivityClass (settings, Ids::androidCustomActivityClass, getUndoManager()),
+ androidCustomApplicationClass (settings, Ids::androidCustomApplicationClass, getUndoManager(), "com.roli.juce.JuceApp"),
androidManifestCustomXmlElements (settings, Ids::androidManifestCustomXmlElements, getUndoManager()),
androidVersionCode (settings, Ids::androidVersionCode, getUndoManager(), "1"),
- androidMinimumSDK (settings, Ids::androidMinimumSDK, getUndoManager(), "10"),
+ androidMinimumSDK (settings, Ids::androidMinimumSDK, getUndoManager(), "16"),
androidTheme (settings, Ids::androidTheme, getUndoManager()),
androidSharedLibraries (settings, Ids::androidSharedLibraries, getUndoManager()),
androidStaticLibraries (settings, Ids::androidStaticLibraries, getUndoManager()),
@@ -201,15 +203,11 @@ public:
auto appFolder = targetFolder.getChildFile (isLibrary() ? "lib" : "app");
removeOldFiles (targetFolder);
-
- if (! isLibrary())
- copyJavaFiles (modules);
-
copyExtraResourceFiles();
writeFile (targetFolder, "settings.gradle", isLibrary() ? "include ':lib'" : "include ':app'");
writeFile (targetFolder, "build.gradle", getProjectBuildGradleFileContent());
- writeFile (appFolder, "build.gradle", getAppBuildGradleFileContent());
+ writeFile (appFolder, "build.gradle", getAppBuildGradleFileContent (modules));
writeFile (targetFolder, "local.properties", getLocalPropertiesFileContent());
writeFile (targetFolder, "gradle/wrapper/gradle-wrapper.properties", getGradleWrapperPropertiesFileContent());
@@ -583,7 +581,7 @@ private:
}
//==============================================================================
- String getAppBuildGradleFileContent() const
+ String getAppBuildGradleFileContent (const OwnedArray& modules) const
{
MemoryOutputStream mo;
mo << "apply plugin: 'com.android." << (isLibrary() ? "library" : "application") << "'" << newLine << newLine;
@@ -603,6 +601,7 @@ private:
mo << getAndroidProductFlavours() << newLine;
mo << getAndroidVariantFilter() << newLine;
+ mo << getAndroidJavaSourceSets (modules) << newLine;
mo << getAndroidRepositories() << newLine;
mo << getAndroidDependencies() << newLine;
mo << getApplyPlugins() << newLine;
@@ -769,12 +768,12 @@ private:
auto repositories = StringArray::fromLines (androidRepositories.get().toString());
- mo << "repositories {" << newLine;
+ mo << " repositories {" << newLine;
for (auto& r : repositories)
- mo << " " << r << newLine;
+ mo << " " << r << newLine;
- mo << "}" << newLine;
+ mo << " }" << newLine;
return mo.toString();
}
@@ -782,21 +781,21 @@ private:
String getAndroidDependencies() const
{
MemoryOutputStream mo;
- mo << "dependencies {" << newLine;
+ mo << " dependencies {" << newLine;
for (auto& d : StringArray::fromLines (androidDependencies.get().toString()))
- mo << " " << d << newLine;
+ mo << " " << d << newLine;
for (auto& d : StringArray::fromLines (androidJavaLibs.get().toString()))
- mo << " implementation files('libs/" << File (d).getFileName() << "')" << newLine;
+ mo << " implementation files('libs/" << File (d).getFileName() << "')" << newLine;
if (androidEnableRemoteNotifications.get())
{
- mo << " 'com.google.firebase:firebase-core:11.4.0'" << newLine;
- mo << " compile 'com.google.firebase:firebase-messaging:11.4.0'" << newLine;
+ mo << " 'com.google.firebase:firebase-core:11.4.0'" << newLine;
+ mo << " compile 'com.google.firebase:firebase-messaging:11.4.0'" << newLine;
}
- mo << "}" << newLine;
+ mo << " }" << newLine;
return mo.toString();
}
@@ -811,6 +810,90 @@ private:
return mo.toString();
}
+ void addModuleJavaFolderToSourceSet(StringArray& javaSourceSets, const File& javacore) const
+ {
+ if (javacore.isDirectory())
+ {
+ auto appFolder = getTargetFolder().getChildFile ("app");
+
+ RelativePath relativePath (javacore, appFolder, RelativePath::buildTargetFolder);
+ javaSourceSets.add (relativePath.toUnixStyle());
+ }
+ }
+
+ String getAndroidJavaSourceSets (const OwnedArray& modules) const
+ {
+ auto javaSourceSets = getSourceSetArrayFor (androidAdditionalJavaFolders.get().toString());
+ auto resourceSets = getSourceSetArrayFor (androidAdditionalResourceFolders.get().toString());
+
+ for (auto* module : modules)
+ {
+ auto javaFolder = module->getFolder().getChildFile ("native").getChildFile ("javacore");
+
+ addModuleJavaFolderToSourceSet (javaSourceSets, javaFolder.getChildFile("init"));
+
+ if (! isLibrary())
+ addModuleJavaFolderToSourceSet (javaSourceSets, javaFolder.getChildFile("app"));
+ }
+
+ MemoryOutputStream mo;
+ mo << " sourceSets {" << newLine;
+ mo << getSourceSetStringFor ("main.java.srcDirs", javaSourceSets);
+ mo << newLine;
+ mo << getSourceSetStringFor ("main.res.srcDirs", resourceSets);
+ mo << " }" << newLine;
+
+ return mo.toString();
+ }
+
+ StringArray getSourceSetArrayFor (const String& srcDirs) const
+ {
+ StringArray sourceSets;
+
+ for (auto folder : StringArray::fromLines (srcDirs))
+ {
+ if (File::isAbsolutePath (folder))
+ {
+ sourceSets.add (folder);
+ }
+ else
+ {
+ auto appFolder = getTargetFolder().getChildFile ("app");
+
+ auto relativePath = RelativePath (folder, RelativePath::projectFolder)
+ .rebased (getProject().getProjectFolder(), appFolder,
+ RelativePath::buildTargetFolder);
+
+ sourceSets.add (relativePath.toUnixStyle());
+ }
+ }
+
+ return sourceSets;
+ }
+
+ static String getSourceSetStringFor (const String& type, const StringArray& srcDirs)
+ {
+ String s;
+
+ s << " " << type << " +=" << newLine;
+ s << " [";
+
+ bool isFirst = true;
+
+ for (auto sourceSet : srcDirs)
+ {
+ if (! isFirst)
+ s << "," << newLine << " ";
+
+ isFirst = false;
+ s << "\"" << sourceSet << "\"";
+ }
+
+ s << "]" << newLine;
+
+ return s;
+ }
+
//==============================================================================
String getLocalPropertiesFileContent() const
{
@@ -835,7 +918,17 @@ private:
//==============================================================================
void createBaseExporterProperties (PropertyListBuilder& props)
{
- props.add (new TextPropertyComponent (androidJavaLibs, "Java Libraries to Include", 32768, true),
+ props.add (new TextPropertyComponent (androidAdditionalJavaFolders, "Java Source code folders", 32768, true),
+ "Folders inside which additional java source files can be found (one per line). For example, if you "
+ "are using your own Activity you should place the java files for this into a folder and add the folder "
+ "path to this field.");
+
+ props.add (new TextPropertyComponent (androidAdditionalResourceFolders, "Resource folders", 32768, true),
+ "Folders inside which additional resource files can be found (one per line). For example, if you "
+ "want to add your own layout xml files then you should place a layout xml file inside a folder and add "
+ "the folder path to this field.");
+
+ props.add (new TextPropertyComponent (androidJavaLibs, "Java libraries to include", 32768, true),
"Java libs (JAR files) (one per line). These will be copied to app/libs folder and \"implementation files\" "
"dependency will be automatically added to module \"dependencies\" section for each library, so do "
"not add the dependency yourself.");
@@ -853,24 +946,20 @@ private:
{ "unspecified", "portrait", "landscape" }),
"The screen orientations that this app should support");
- props.add (new TextPropertyComponent (androidActivityClass, "Android Activity Class Name", 256, false),
- "The full java class name to use for the app's Activity class.");
+ props.add (new TextPropertyComponent (androidCustomActivityClass, "Custom Android Activity", 256, false),
+ "If not empty, specifies the Android Activity class name stored in the app's manifest which "
+ "should be used instead of Android's default Activity.");
- props.add (new TextPropertyComponent (androidActivitySubClassName, "Android Activity Sub-Class Name", 256, false),
- "If not empty, specifies the Android Activity class name stored in the app's manifest. "
- "Use this if you would like to use your own Android Activity sub-class.");
-
- props.add (new TextPropertyComponent (androidActivityBaseClassName, "Android Activity Base Class", 256, false),
- "If not empty, specifies the base class to use for your activity. If custom base class is "
- "specified, that base class should be a sub-class of android.app.Activity. When empty, Activity "
- "(android.app.Activity) will be used as the base class. "
- "Use this if you would like to use your own Android Activity base class.");
+ props.add (new TextPropertyComponent (androidCustomApplicationClass, "Custom Android Application", 256, false),
+ "If not empty, specifies the Android Application class name stored in the app's manifest which "
+ "should be used instead of JUCE's default JuceApp class. If you specify a custom App then you must "
+ "call com.roli.juce.Java.initialiseJUCE somewhere in your code before calling any JUCE functions.");
props.add (new TextPropertyComponent (androidVersionCode, "Android Version Code", 32, false),
"An integer value that represents the version of the application code, relative to other versions.");
props.add (new TextPropertyComponent (androidMinimumSDK, "Minimum SDK Version", 32, false),
- "The number of the minimum version of the Android SDK that the app requires");
+ "The number of the minimum version of the Android SDK that the app requires (must be 16 or higher).");
props.add (new TextPropertyComponent (androidExtraAssetsFolder, "Extra Android Assets", 256, false),
"A path to a folder (relative to the project folder) which contains extra android assets.");
@@ -950,286 +1039,6 @@ private:
}
//==============================================================================
- String createDefaultClassName() const
- {
- auto s = project.getBundleIdentifierString().toLowerCase();
-
- if (s.length() > 5
- && s.containsChar ('.')
- && s.containsOnly ("abcdefghijklmnopqrstuvwxyz_.")
- && ! s.startsWithChar ('.'))
- {
- if (! s.endsWithChar ('.'))
- s << ".";
- }
- else
- {
- s = "com.yourcompany.";
- }
-
- return s + CodeHelpers::makeValidIdentifier (project.getProjectFilenameRootString(), false, true, false);
- }
-
- //==============================================================================
- void copyJavaFiles (const OwnedArray& modules) const
- {
- if (auto* coreModule = getCoreModule (modules))
- {
- auto package = getActivityClassPackage();
- auto targetFolder = getTargetFolder();
-
- auto inAppBillingPath = String ("com.android.vending.billing").replaceCharacter ('.', File::getSeparatorChar());
- auto javaSourceFolder = coreModule->getFolder().getChildFile ("native").getChildFile ("java");
- auto javaInAppBillingTarget = targetFolder.getChildFile ("app/src/main/java").getChildFile (inAppBillingPath);
- auto javaTarget = targetFolder.getChildFile ("app/src/main/java")
- .getChildFile (package.replaceCharacter ('.', File::getSeparatorChar()));
- auto libTarget = targetFolder.getChildFile ("app/libs");
- libTarget.createDirectory();
-
- copyActivityJavaFiles (javaSourceFolder, javaTarget, package);
- copyServicesJavaFiles (javaSourceFolder, javaTarget, package);
- copyProviderJavaFile (javaSourceFolder, javaTarget, package);
- copyAdditionalJavaFiles (javaSourceFolder, javaInAppBillingTarget);
- copyAdditionalJavaLibs (libTarget);
- }
- }
-
- void copyActivityJavaFiles (const File& javaSourceFolder, const File& targetFolder, const String& package) const
- {
- if (androidActivityClass.get().toString().contains ("_"))
- throw SaveError ("Your Android activity class name or path may not contain any underscores! Try a project name without underscores.");
-
- auto className = getActivityName();
-
- if (className.isEmpty())
- throw SaveError ("Invalid Android Activity class name: " + androidActivityClass.get().toString());
-
- createDirectoryOrThrow (targetFolder);
-
- auto activityCode = getActivityCode (javaSourceFolder, className, package);
-
- auto javaDestFile = targetFolder.getChildFile (className + ".java");
- overwriteFileIfDifferentOrThrow (javaDestFile, activityCode);
- }
-
- String getActivityCode (const File& javaSourceFolder, const String& className, const String& package) const
- {
- auto runtimePermissionsCode = getRuntimePermissionsCode (javaSourceFolder, className);
- auto midiCode = getMidiCode (javaSourceFolder, className);
- auto webViewCode = getWebViewCode (javaSourceFolder);
- auto cameraCode = getCameraCode (javaSourceFolder);
- auto videoCode = getVideoCode (javaSourceFolder);
-
- auto javaSourceFile = javaSourceFolder.getChildFile ("JuceAppActivity.java");
- auto javaSourceLines = StringArray::fromLines (javaSourceFile.loadFileAsString());
-
- {
- MemoryOutputStream newFile;
-
- for (auto& line : javaSourceLines)
- {
- if (line.contains ("$$JuceAndroidMidiImports$$"))
- newFile << midiCode.imports;
- else if (line.contains ("$$JuceAndroidMidiCode$$"))
- newFile << midiCode.main;
- else if (line.contains ("$$JuceAndroidRuntimePermissionsCode$$"))
- newFile << runtimePermissionsCode;
- else if (line.contains ("$$JuceAndroidWebViewImports$$"))
- newFile << webViewCode.imports;
- else if (line.contains ("$$JuceAndroidWebViewNativeCode$$"))
- newFile << webViewCode.native;
- else if (line.contains ("$$JuceAndroidWebViewCode$$"))
- newFile << webViewCode.main;
- else if (line.contains ("$$JuceAndroidCameraImports$$"))
- newFile << cameraCode.imports;
- else if (line.contains ("$$JuceAndroidCameraCode$$"))
- newFile << cameraCode.main;
- else if (line.contains ("$$JuceAndroidVideoImports$$"))
- newFile << videoCode.imports;
- else if (line.contains ("$$JuceAndroidVideoCode$$"))
- newFile << videoCode.main;
- else
- newFile << line.replace ("$$JuceAppActivityBaseClass$$", androidActivityBaseClassName.get().toString())
- .replace ("JuceAppActivity", className)
- .replace ("package com.juce;", "package " + package + ";") << newLine;
- }
-
- javaSourceLines = StringArray::fromLines (newFile.toString());
- }
-
- while (javaSourceLines.size() > 2
- && javaSourceLines[javaSourceLines.size() - 1].trim().isEmpty()
- && javaSourceLines[javaSourceLines.size() - 2].trim().isEmpty())
- javaSourceLines.remove (javaSourceLines.size() - 1);
-
- return javaSourceLines.joinIntoString (newLine);
- }
-
- String getRuntimePermissionsCode (const File& javaSourceFolder, const String& className) const
- {
- if (static_cast (androidMinimumSDK.get()) >= 23)
- {
- auto javaRuntimePermissions = javaSourceFolder.getChildFile ("AndroidRuntimePermissions.java");
- return javaRuntimePermissions.loadFileAsString().replace ("JuceAppActivity", className);
- }
-
- return {};
- }
-
- struct MidiCode
- {
- String imports;
- String main;
- };
-
- MidiCode getMidiCode (const File& javaSourceFolder, const String& className) const
- {
- String juceMidiCode, juceMidiImports;
-
- juceMidiImports << newLine;
-
- if (static_cast (androidMinimumSDK.get()) >= 23)
- {
- auto javaAndroidMidi = javaSourceFolder.getChildFile ("AndroidMidi.java");
-
- juceMidiImports << "import android.media.midi.*;" << newLine
- << "import android.bluetooth.*;" << newLine
- << "import android.bluetooth.le.*;" << newLine;
-
- juceMidiCode = javaAndroidMidi.loadFileAsString().replace ("JuceAppActivity", className);
- }
- else
- {
- juceMidiCode = javaSourceFolder.getChildFile ("AndroidMidiFallback.java")
- .loadFileAsString()
- .replace ("JuceAppActivity", className);
- }
-
- return { juceMidiImports, juceMidiCode };
- }
-
- struct WebViewCode
- {
- String imports;
- String native;
- String main;
- };
-
- WebViewCode getWebViewCode (const File& javaSourceFolder) const
- {
- String juceWebViewImports, juceWebViewCodeNative, juceWebViewCode;
-
- if (static_cast (androidMinimumSDK.get()) >= 23)
- juceWebViewImports << "import android.webkit.WebResourceError;" << newLine;
-
- if (static_cast (androidMinimumSDK.get()) >= 21)
- juceWebViewImports << "import android.webkit.WebResourceRequest;" << newLine;
-
- if (static_cast (androidMinimumSDK.get()) >= 11)
- juceWebViewImports << "import android.webkit.WebResourceResponse;" << newLine;
-
- auto javaWebViewFile = javaSourceFolder.getChildFile ("AndroidWebView.java");
- auto juceWebViewCodeAll = javaWebViewFile.loadFileAsString();
-
- if (static_cast (androidMinimumSDK.get()) <= 10)
- {
- juceWebViewCode << juceWebViewCodeAll.fromFirstOccurrenceOf ("$$WebViewApi1_10", false, false)
- .upToFirstOccurrenceOf ("WebViewApi1_10$$", false, false);
- }
- else
- {
- if (static_cast (androidMinimumSDK.get()) >= 23)
- {
- juceWebViewCodeNative << juceWebViewCodeAll.fromFirstOccurrenceOf ("$$WebViewNativeApi23", false, false)
- .upToFirstOccurrenceOf ("WebViewNativeApi23$$", false, false);
-
- juceWebViewCode << juceWebViewCodeAll.fromFirstOccurrenceOf ("$$WebViewApi23", false, false)
- .upToFirstOccurrenceOf ("WebViewApi23$$", false, false);
- }
-
- if (static_cast (androidMinimumSDK.get()) >= 21)
- {
- juceWebViewCodeNative << juceWebViewCodeAll.fromFirstOccurrenceOf ("$$WebViewNativeApi21", false, false)
- .upToFirstOccurrenceOf ("WebViewNativeApi21$$", false, false);
-
- juceWebViewCode << juceWebViewCodeAll.fromFirstOccurrenceOf ("$$WebViewApi21", false, false)
- .upToFirstOccurrenceOf ("WebViewApi21$$", false, false);
- }
- else
- {
- juceWebViewCode << juceWebViewCodeAll.fromFirstOccurrenceOf ("$$WebViewApi11_20", false, false)
- .upToFirstOccurrenceOf ("WebViewApi11_20$$", false, false);
- }
- }
-
- return { juceWebViewImports, juceWebViewCodeNative, juceWebViewCode };
- }
-
- struct CameraCode
- {
- String imports;
- String main;
- };
-
- CameraCode getCameraCode (const File& javaSourceFolder) const
- {
- String juceCameraImports, juceCameraCode;
-
- if (static_cast (androidMinimumSDK.get()) >= 21)
- {
- juceCameraImports << "import android.hardware.camera2.*;" << newLine;
-
- auto javaCameraFile = javaSourceFolder.getChildFile ("AndroidCamera.java");
- auto juceCameraCodeAll = javaCameraFile.loadFileAsString();
-
- juceCameraCode << juceCameraCodeAll.fromFirstOccurrenceOf ("$$CameraApi21", false, false)
- .upToFirstOccurrenceOf ("CameraApi21$$", false, false);
- }
-
- return { juceCameraImports, juceCameraCode };
- }
-
- struct VideoCode
- {
- String imports;
- String main;
- };
-
- VideoCode getVideoCode (const File& javaSourceFolder) const
- {
- String juceVideoImports, juceVideoCode;
-
- if (static_cast (androidMinimumSDK.get()) >= 21)
- {
- juceVideoImports << "import android.database.ContentObserver;" << newLine;
- juceVideoImports << "import android.media.session.*;" << newLine;
- juceVideoImports << "import android.media.MediaMetadata;" << newLine;
-
- auto javaVideoFile = javaSourceFolder.getChildFile ("AndroidVideo.java");
- auto juceVideoCodeAll = javaVideoFile.loadFileAsString();
-
- juceVideoCode << juceVideoCodeAll.fromFirstOccurrenceOf ("$$VideoApi21", false, false)
- .upToFirstOccurrenceOf ("VideoApi21$$", false, false);
- }
-
- return { juceVideoImports, juceVideoCode };
- }
-
- void copyAdditionalJavaFiles (const File& sourceFolder, const File& targetFolder) const
- {
- auto inAppBillingJavaFileName = String ("IInAppBillingService.java");
-
- auto inAppBillingJavaSrcFile = sourceFolder.getChildFile (inAppBillingJavaFileName);
- auto inAppBillingJavaDestFile = targetFolder.getChildFile (inAppBillingJavaFileName);
-
- createDirectoryOrThrow (targetFolder);
-
- jassert (inAppBillingJavaSrcFile.existsAsFile());
-
- if (inAppBillingJavaSrcFile.existsAsFile())
- inAppBillingJavaSrcFile.copyFileTo (inAppBillingJavaDestFile);
- }
-
void copyAdditionalJavaLibs (const File& targetFolder) const
{
auto libPaths = StringArray::fromLines (androidJavaLibs.get().toString());
@@ -1245,58 +1054,6 @@ private:
}
}
- void copyServicesJavaFiles (const File& javaSourceFolder, const File& targetFolder, const String& package) const
- {
- if (androidEnableRemoteNotifications.get())
- {
- String instanceIdFileName ("JuceFirebaseInstanceIdService.java");
- String messagingFileName ("JuceFirebaseMessagingService.java");
-
- File instanceIdFile (javaSourceFolder.getChildFile (instanceIdFileName));
- File messagingFile (javaSourceFolder.getChildFile (messagingFileName));
-
- jassert (instanceIdFile.existsAsFile());
- jassert (messagingFile .existsAsFile());
-
- Array files;
- files.add (instanceIdFile);
- files.add (messagingFile);
-
- for (auto& file : files)
- {
- auto newContent = file.loadFileAsString()
- .replace ("package com.juce;", "package " + package + ";");
- auto targetFile = targetFolder.getChildFile (file.getFileName());
- overwriteFileIfDifferentOrThrow (targetFile, newContent);
- }
- }
- }
-
- void copyProviderJavaFile (const File& javaSourceFolder, const File& targetFolder, const String& package) const
- {
- auto providerFile = javaSourceFolder.getChildFile ("AndroidSharingContentProvider.java");
-
- jassert (providerFile.existsAsFile());
-
- auto targetFile = targetFolder.getChildFile ("SharingContentProvider.java");
-
- auto fileContent = providerFile.loadFileAsString()
- .replace ("package com.juce;", "package " + package + ";");
-
- auto commonStart = fileContent.upToFirstOccurrenceOf ("$$ContentProviderApi11", false, false);
- auto commonEnd = fileContent.fromFirstOccurrenceOf ("ContentProviderApi11$$", false, false);
-
- auto middleContent = static_cast (androidMinimumSDK.get()) >= 11
- ? fileContent.fromFirstOccurrenceOf ("$$ContentProviderApi11", false, false)
- .upToFirstOccurrenceOf ("ContentProviderApi11$$", false, false)
- : String();
-
- auto newContent = commonStart;
- newContent << middleContent << commonEnd;
-
- overwriteFileIfDifferentOrThrow (targetFile, newContent);
- }
-
void copyExtraResourceFiles() const
{
for (ConstConfigIterator config (*this); config.next();)
@@ -1346,26 +1103,23 @@ private:
}
}
- String getActivityName() const
+ String getActivityClass() const
{
- return androidActivityClass.get().toString().fromLastOccurrenceOf (".", false, false);
- }
-
- String getActivitySubClassName() const
- {
- auto activityPath = androidActivitySubClassName.get().toString();
+ auto customActivityClass = androidCustomActivityClass.get().toString();
- return (activityPath.isEmpty()) ? getActivityName() : activityPath.fromLastOccurrenceOf (".", false, false);
+ return (customActivityClass.isEmpty()) ? "android.app.Activity" : customActivityClass;
}
- String getActivityClassPackage() const
+ String getApplicationClass() const
{
- return androidActivityClass.get().toString().upToLastOccurrenceOf (".", false, false);
+ auto customApplicationClass = androidCustomApplicationClass.get().toString();
+
+ return (customApplicationClass.isEmpty()) ? "com.roli.juce.JuceApp" : customApplicationClass;
}
String getJNIActivityClassName() const
{
- return androidActivityClass.get().toString().replaceCharacter ('.', '/');
+ return getActivityClass().replaceCharacter ('.', '/');
}
static LibraryModule* getCoreModule (const OwnedArray& modules)
@@ -1572,34 +1326,17 @@ private:
defines.set ("JUCE_ANDROID", "1");
defines.set ("JUCE_ANDROID_API_VERSION", androidMinimumSDK.get());
- defines.set ("JUCE_ANDROID_ACTIVITY_CLASSNAME", getJNIActivityClassName().replaceCharacter ('/', '_'));
- defines.set ("JUCE_ANDROID_ACTIVITY_CLASSPATH", "\"" + getJNIActivityClassName() + "\"");
- defines.set ("JUCE_ANDROID_SHARING_CONTENT_PROVIDER_CLASSNAME", getSharingContentProviderClassName().replaceCharacter('.', '_'));
- defines.set ("JUCE_ANDROID_SHARING_CONTENT_PROVIDER_CLASSPATH", "\"" + getSharingContentProviderClassName().replaceCharacter('.', '/') + "\"");
defines.set ("JUCE_PUSH_NOTIFICATIONS", "1");
if (androidInAppBillingPermission.get())
defines.set ("JUCE_IN_APP_PURCHASES", "1");
- if (androidEnableRemoteNotifications.get())
- {
- auto instanceIdClassName = getActivityClassPackage() + ".JuceFirebaseInstanceIdService";
- auto messagingClassName = getActivityClassPackage() + ".JuceFirebaseMessagingService";
- defines.set ("JUCE_FIREBASE_INSTANCE_ID_SERVICE_CLASSNAME", instanceIdClassName.replaceCharacter ('.', '_'));
- defines.set ("JUCE_FIREBASE_MESSAGING_SERVICE_CLASSNAME", messagingClassName.replaceCharacter ('.', '_'));
- }
-
if (supportsGLv3())
defines.set ("JUCE_ANDROID_GL_ES_VERSION_3_0", "1");
return defines;
}
- String getSharingContentProviderClassName() const
- {
- return getActivityClassPackage() + ".SharingContentProvider";
- }
-
StringPairArray getProjectPreprocessorDefs() const
{
auto defines = getAndroidPreprocessorDefs();
@@ -1737,7 +1474,7 @@ private:
setAttributeIfNotPresent (*manifest, "xmlns:android", "http://schemas.android.com/apk/res/android");
setAttributeIfNotPresent (*manifest, "android:versionCode", androidVersionCode.get());
setAttributeIfNotPresent (*manifest, "android:versionName", project.getVersionString());
- setAttributeIfNotPresent (*manifest, "package", getActivityClassPackage());
+ setAttributeIfNotPresent (*manifest, "package", project.getBundleIdentifierString());
return manifest;
}
@@ -1797,6 +1534,7 @@ private:
{
auto* app = getOrCreateChildWithName (manifest, "application");
setAttributeIfNotPresent (*app, "android:label", "@string/app_name");
+ setAttributeIfNotPresent (*app, "android:name", getApplicationClass());
if (androidTheme.get().toString().isNotEmpty())
setAttributeIfNotPresent (*app, "android:theme", androidTheme.get());
@@ -1826,7 +1564,7 @@ private:
{
auto* act = getOrCreateChildWithName (application, "activity");
- setAttributeIfNotPresent (*act, "android:name", getActivitySubClassName());
+ setAttributeIfNotPresent (*act, "android:name", getActivityClass());
setAttributeIfNotPresent (*act, "android:label", "@string/app_name");
if (! act->hasAttribute ("android:configChanges"))
@@ -1918,8 +1656,9 @@ private:
if (androidEnableContentSharing.get())
{
auto* provider = application.createNewChildElement ("provider");
- provider->setAttribute ("android:name", getSharingContentProviderClassName());
- provider->setAttribute ("android:authorities", getSharingContentProviderClassName().toLowerCase());
+
+ 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");
}
diff --git a/extras/Projucer/Source/Utility/Helpers/jucer_PresetIDs.h b/extras/Projucer/Source/Utility/Helpers/jucer_PresetIDs.h
index d1a14b1845..deeae76893 100644
--- a/extras/Projucer/Source/Utility/Helpers/jucer_PresetIDs.h
+++ b/extras/Projucer/Source/Utility/Helpers/jucer_PresetIDs.h
@@ -189,15 +189,18 @@ namespace Ids
DECLARE_ID (cameraPermissionNeeded);
DECLARE_ID (cameraPermissionText);
DECLARE_ID (androidJavaLibs);
+ DECLARE_ID (androidAdditionalJavaFolders);
+ DECLARE_ID (androidAdditionalResourceFolders);
DECLARE_ID (androidRepositories);
DECLARE_ID (androidDependencies);
DECLARE_ID (androidBuildConfigRemoteNotifsConfigFile);
DECLARE_ID (androidAdditionalXmlValueResources);
DECLARE_ID (androidAdditionalDrawableResources);
DECLARE_ID (androidAdditionalRawValueResources);
- DECLARE_ID (androidActivityClass);
- DECLARE_ID (androidActivitySubClassName);
- DECLARE_ID (androidActivityBaseClassName);
+// DECLARE_ID (androidActivityClass); // DEPRECATED!
+ const Identifier androidCustomActivityClass ("androidActivitySubClassName"); // old name is very confusing, but we need to remain backward compatible
+// DECLARE_ID (androidActivityBaseClassName); // DEPRECATED!
+ DECLARE_ID (androidCustomApplicationClass);
DECLARE_ID (androidVersionCode);
DECLARE_ID (androidSDKPath);
DECLARE_ID (androidNDKPath);
diff --git a/modules/juce_core/native/java/AndroidMidi.java b/modules/juce_audio_devices/native/java/com/roli/juce/JuceMidiSupport.java
similarity index 65%
rename from modules/juce_core/native/java/AndroidMidi.java
rename to modules/juce_audio_devices/native/java/com/roli/juce/JuceMidiSupport.java
index 9e337be8f8..5aba09c8ca 100644
--- a/modules/juce_core/native/java/AndroidMidi.java
+++ b/modules/juce_audio_devices/native/java/com/roli/juce/JuceMidiSupport.java
@@ -1,999 +1,1075 @@
- //==============================================================================
- public class BluetoothManager extends ScanCallback
- {
- BluetoothManager()
- {
- }
-
- public String[] getMidiBluetoothAddresses()
- {
- return bluetoothMidiDevices.toArray (new String[bluetoothMidiDevices.size()]);
- }
-
- public String getHumanReadableStringForBluetoothAddress (String address)
- {
- BluetoothDevice btDevice = BluetoothAdapter.getDefaultAdapter().getRemoteDevice (address);
- return btDevice.getName();
- }
-
- public int getBluetoothDeviceStatus (String address)
- {
- return getAndroidMidiDeviceManager().getBluetoothDeviceStatus (address);
- }
-
- public void startStopScan (boolean shouldStart)
- {
- BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
-
- if (bluetoothAdapter == null)
- {
- Log.d ("JUCE", "BluetoothManager error: could not get default Bluetooth adapter");
- return;
- }
-
- BluetoothLeScanner bluetoothLeScanner = bluetoothAdapter.getBluetoothLeScanner();
-
- if (bluetoothLeScanner == null)
- {
- Log.d ("JUCE", "BluetoothManager error: could not get Bluetooth LE scanner");
- return;
- }
-
- if (shouldStart)
- {
- ScanFilter.Builder scanFilterBuilder = new ScanFilter.Builder();
- scanFilterBuilder.setServiceUuid (ParcelUuid.fromString (bluetoothLEMidiServiceUUID));
-
- ScanSettings.Builder scanSettingsBuilder = new ScanSettings.Builder();
- scanSettingsBuilder.setCallbackType (ScanSettings.CALLBACK_TYPE_ALL_MATCHES)
- .setScanMode (ScanSettings.SCAN_MODE_LOW_POWER)
- .setScanMode (ScanSettings.MATCH_MODE_STICKY);
-
- bluetoothLeScanner.startScan (Arrays.asList (scanFilterBuilder.build()),
- scanSettingsBuilder.build(),
- this);
- }
- else
- {
- bluetoothLeScanner.stopScan (this);
- }
- }
-
- public boolean pairBluetoothMidiDevice(String address)
- {
- BluetoothDevice btDevice = BluetoothAdapter.getDefaultAdapter().getRemoteDevice (address);
-
- if (btDevice == null)
- {
- Log.d ("JUCE", "failed to create buletooth device from address");
- return false;
- }
-
- return getAndroidMidiDeviceManager().pairBluetoothDevice (btDevice);
- }
-
- public void unpairBluetoothMidiDevice (String address)
- {
- getAndroidMidiDeviceManager().unpairBluetoothDevice (address);
- }
-
- public void onScanFailed (int errorCode)
- {
- }
-
- public void onScanResult (int callbackType, ScanResult result)
- {
- if (callbackType == ScanSettings.CALLBACK_TYPE_ALL_MATCHES
- || callbackType == ScanSettings.CALLBACK_TYPE_FIRST_MATCH)
- {
- BluetoothDevice device = result.getDevice();
-
- if (device != null)
- bluetoothMidiDevices.add (device.getAddress());
- }
-
- if (callbackType == ScanSettings.CALLBACK_TYPE_MATCH_LOST)
- {
- Log.d ("JUCE", "ScanSettings.CALLBACK_TYPE_MATCH_LOST");
- BluetoothDevice device = result.getDevice();
-
- if (device != null)
- {
- bluetoothMidiDevices.remove (device.getAddress());
- unpairBluetoothMidiDevice (device.getAddress());
- }
- }
- }
-
- public void onBatchScanResults (List results)
- {
- for (ScanResult result : results)
- onScanResult (ScanSettings.CALLBACK_TYPE_ALL_MATCHES, result);
- }
-
- private BluetoothLeScanner scanner;
- private static final String bluetoothLEMidiServiceUUID = "03B80E5A-EDE8-4B33-A751-6CE34EC4C700";
-
- private HashSet bluetoothMidiDevices = new HashSet();
- }
-
- public static class JuceMidiInputPort extends MidiReceiver implements JuceMidiPort
- {
- private native void handleReceive (long host, byte[] msg, int offset, int count, long timestamp);
-
- public JuceMidiInputPort (MidiDeviceManager mm, MidiOutputPort actualPort, MidiPortPath portPathToUse, long hostToUse)
- {
- owner = mm;
- androidPort = actualPort;
- portPath = portPathToUse;
- juceHost = hostToUse;
- isConnected = false;
- }
-
- @Override
- protected void finalize() throws Throwable
- {
- close();
- super.finalize();
- }
-
- @Override
- public boolean isInputPort()
- {
- return true;
- }
-
- @Override
- public void start()
- {
- if (owner != null && androidPort != null && ! isConnected) {
- androidPort.connect(this);
- isConnected = true;
- }
- }
-
- @Override
- public void stop()
- {
- if (owner != null && androidPort != null && isConnected) {
- androidPort.disconnect(this);
- isConnected = false;
- }
- }
-
- @Override
- public void close()
- {
- if (androidPort != null) {
- try {
- androidPort.close();
- } catch (IOException exception) {
- Log.d("JUCE", "IO Exception while closing port");
- }
- }
-
- if (owner != null)
- owner.removePort (portPath);
-
- owner = null;
- androidPort = null;
- }
-
- @Override
- public void onSend (byte[] msg, int offset, int count, long timestamp)
- {
- if (count > 0)
- handleReceive (juceHost, msg, offset, count, timestamp);
- }
-
- @Override
- public void onFlush()
- {}
-
- @Override
- public void sendMidi (byte[] msg, int offset, int count)
- {
- }
-
- MidiDeviceManager owner;
- MidiOutputPort androidPort;
- MidiPortPath portPath;
- long juceHost;
- boolean isConnected;
- }
-
- public static class JuceMidiOutputPort implements JuceMidiPort
- {
- public JuceMidiOutputPort (MidiDeviceManager mm, MidiInputPort actualPort, MidiPortPath portPathToUse)
- {
- owner = mm;
- androidPort = actualPort;
- portPath = portPathToUse;
- }
-
- @Override
- protected void finalize() throws Throwable
- {
- close();
- super.finalize();
- }
-
- @Override
- public boolean isInputPort()
- {
- return false;
- }
-
- @Override
- public void start()
- {
- }
-
- @Override
- public void stop()
- {
- }
-
- @Override
- public void sendMidi (byte[] msg, int offset, int count)
- {
- if (androidPort != null)
- {
- try {
- androidPort.send(msg, offset, count);
- } catch (IOException exception)
- {
- Log.d ("JUCE", "send midi had IO exception");
- }
- }
- }
-
- @Override
- public void close()
- {
- if (androidPort != null) {
- try {
- androidPort.close();
- } catch (IOException exception) {
- Log.d("JUCE", "IO Exception while closing port");
- }
- }
-
- if (owner != null)
- owner.removePort (portPath);
-
- owner = null;
- androidPort = null;
- }
-
- MidiDeviceManager owner;
- MidiInputPort androidPort;
- MidiPortPath portPath;
- }
-
- private static class MidiPortPath extends Object
- {
- public MidiPortPath (int deviceIdToUse, boolean direction, int androidIndex)
- {
- deviceId = deviceIdToUse;
- isInput = direction;
- portIndex = androidIndex;
-
- }
-
- public int deviceId;
- public int portIndex;
- public boolean isInput;
-
- @Override
- public int hashCode()
- {
- Integer i = new Integer ((deviceId * 128) + (portIndex < 128 ? portIndex : 127));
- return i.hashCode() * (isInput ? -1 : 1);
- }
-
- @Override
- public boolean equals (Object obj)
- {
- if (obj == null)
- return false;
-
- if (getClass() != obj.getClass())
- return false;
-
- MidiPortPath other = (MidiPortPath) obj;
- return (portIndex == other.portIndex && isInput == other.isInput && deviceId == other.deviceId);
- }
- }
-
- //==============================================================================
- public class MidiDeviceManager extends MidiManager.DeviceCallback implements MidiManager.OnDeviceOpenedListener
- {
- //==============================================================================
- private class DummyBluetoothGattCallback extends BluetoothGattCallback
- {
- public DummyBluetoothGattCallback (MidiDeviceManager mm)
- {
- super();
- owner = mm;
- }
-
- public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState)
- {
- if (newState == BluetoothProfile.STATE_CONNECTED)
- {
- gatt.requestConnectionPriority(BluetoothGatt.CONNECTION_PRIORITY_HIGH);
- owner.pairBluetoothDeviceStepTwo (gatt.getDevice());
- }
- }
- public void onServicesDiscovered(BluetoothGatt gatt, int status) {}
- public void onCharacteristicRead(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {}
- public void onCharacteristicWrite(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {}
- public void onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic) {}
- public void onDescriptorRead(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {}
- public void onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {}
- public void onReliableWriteCompleted(BluetoothGatt gatt, int status) {}
- public void onReadRemoteRssi(BluetoothGatt gatt, int rssi, int status) {}
- public void onMtuChanged(BluetoothGatt gatt, int mtu, int status) {}
-
- private MidiDeviceManager owner;
- }
-
- //==============================================================================
- private class MidiDeviceOpenTask extends java.util.TimerTask
- {
- public MidiDeviceOpenTask (MidiDeviceManager deviceManager, MidiDevice device, BluetoothGatt gattToUse)
- {
- owner = deviceManager;
- midiDevice = device;
- btGatt = gattToUse;
- }
-
- @Override
- public boolean cancel()
- {
- synchronized (MidiDeviceOpenTask.class)
- {
- owner = null;
- boolean retval = super.cancel();
-
- if (btGatt != null)
- {
- btGatt.disconnect();
- btGatt.close();
-
- btGatt = null;
- }
-
- if (midiDevice != null)
- {
- try
- {
- midiDevice.close();
- }
- catch (IOException e)
- {}
-
- midiDevice = null;
- }
-
- return retval;
- }
- }
-
- public String getBluetoothAddress()
- {
- synchronized (MidiDeviceOpenTask.class)
- {
- if (midiDevice != null)
- {
- MidiDeviceInfo info = midiDevice.getInfo();
- if (info.getType() == MidiDeviceInfo.TYPE_BLUETOOTH)
- {
- BluetoothDevice btDevice = (BluetoothDevice) info.getProperties().get (info.PROPERTY_BLUETOOTH_DEVICE);
- if (btDevice != null)
- return btDevice.getAddress();
- }
- }
- }
-
- return "";
- }
-
- public BluetoothGatt getGatt() { return btGatt; }
-
- public int getID()
- {
- return midiDevice.getInfo().getId();
- }
-
- @Override
- public void run()
- {
- synchronized (MidiDeviceOpenTask.class)
- {
- if (owner != null && midiDevice != null)
- owner.onDeviceOpenedDelayed (midiDevice);
- }
- }
-
- private MidiDeviceManager owner;
- private MidiDevice midiDevice;
- private BluetoothGatt btGatt;
- }
-
- //==============================================================================
- public MidiDeviceManager()
- {
- manager = (MidiManager) getSystemService (MIDI_SERVICE);
-
- if (manager == null)
- {
- Log.d ("JUCE", "MidiDeviceManager error: could not get MidiManager system service");
- return;
- }
-
- openPorts = new HashMap> ();
- midiDevices = new ArrayList>();
- openTasks = new HashMap();
- btDevicesPairing = new HashMap();
-
- MidiDeviceInfo[] foundDevices = manager.getDevices();
- for (MidiDeviceInfo info : foundDevices)
- onDeviceAdded (info);
-
- manager.registerDeviceCallback (this, null);
- }
-
- protected void finalize() throws Throwable
- {
- manager.unregisterDeviceCallback (this);
-
- synchronized (MidiDeviceManager.class)
- {
- btDevicesPairing.clear();
-
- for (Integer deviceID : openTasks.keySet())
- openTasks.get (deviceID).cancel();
-
- openTasks = null;
- }
-
- for (MidiPortPath key : openPorts.keySet())
- openPorts.get (key).get().close();
-
- openPorts = null;
-
- for (Pair device : midiDevices)
- {
- if (device.second != null)
- {
- device.second.disconnect();
- device.second.close();
- }
-
- device.first.close();
- }
-
- midiDevices.clear();
-
- super.finalize();
- }
-
- public String[] getJuceAndroidMidiInputDevices()
- {
- return getJuceAndroidMidiDevices (MidiDeviceInfo.PortInfo.TYPE_OUTPUT);
- }
-
- public String[] getJuceAndroidMidiOutputDevices()
- {
- return getJuceAndroidMidiDevices (MidiDeviceInfo.PortInfo.TYPE_INPUT);
- }
-
- private String[] getJuceAndroidMidiDevices (int portType)
- {
- // only update the list when JUCE asks for a new list
- synchronized (MidiDeviceManager.class)
- {
- deviceInfos = getDeviceInfos();
- }
-
- ArrayList portNames = new ArrayList();
-
- int index = 0;
- for (MidiPortPath portInfo = getPortPathForJuceIndex (portType, index); portInfo != null; portInfo = getPortPathForJuceIndex (portType, ++index))
- portNames.add (getPortName (portInfo));
-
- String[] names = new String[portNames.size()];
- return portNames.toArray (names);
- }
-
- private JuceMidiPort openMidiPortWithJuceIndex (int index, long host, boolean isInput)
- {
- synchronized (MidiDeviceManager.class)
- {
- int portTypeToFind = (isInput ? MidiDeviceInfo.PortInfo.TYPE_OUTPUT : MidiDeviceInfo.PortInfo.TYPE_INPUT);
- MidiPortPath portInfo = getPortPathForJuceIndex (portTypeToFind, index);
-
- if (portInfo != null)
- {
- // ports must be opened exclusively!
- if (openPorts.containsKey (portInfo))
- return null;
-
- Pair devicePair = getMidiDevicePairForId (portInfo.deviceId);
-
- if (devicePair != null)
- {
- MidiDevice device = devicePair.first;
- if (device != null)
- {
- JuceMidiPort juceMidiPort = null;
-
- if (isInput)
- {
- MidiOutputPort outputPort = device.openOutputPort(portInfo.portIndex);
-
- if (outputPort != null)
- juceMidiPort = new JuceMidiInputPort(this, outputPort, portInfo, host);
- }
- else
- {
- MidiInputPort inputPort = device.openInputPort(portInfo.portIndex);
-
- if (inputPort != null)
- juceMidiPort = new JuceMidiOutputPort(this, inputPort, portInfo);
- }
-
- if (juceMidiPort != null)
- {
- openPorts.put(portInfo, new WeakReference(juceMidiPort));
-
- return juceMidiPort;
- }
- }
- }
- }
- }
-
- return null;
- }
-
- public JuceMidiPort openMidiInputPortWithJuceIndex (int index, long host)
- {
- return openMidiPortWithJuceIndex (index, host, true);
- }
-
- public JuceMidiPort openMidiOutputPortWithJuceIndex (int index)
- {
- return openMidiPortWithJuceIndex (index, 0, false);
- }
-
- /* 0: unpaired, 1: paired, 2: pairing */
- public int getBluetoothDeviceStatus (String address)
- {
- synchronized (MidiDeviceManager.class)
- {
- if (! address.isEmpty())
- {
- if (findMidiDeviceForBluetoothAddress (address) != null)
- return 1;
-
- if (btDevicesPairing.containsKey (address))
- return 2;
-
- if (findOpenTaskForBluetoothAddress (address) != null)
- return 2;
- }
- }
-
- return 0;
- }
-
- public boolean pairBluetoothDevice (BluetoothDevice btDevice)
- {
- String btAddress = btDevice.getAddress();
- if (btAddress.isEmpty())
- return false;
-
- synchronized (MidiDeviceManager.class)
- {
- if (getBluetoothDeviceStatus (btAddress) != 0)
- return false;
-
-
- btDevicesPairing.put (btDevice.getAddress(), null);
- BluetoothGatt gatt = btDevice.connectGatt (getApplicationContext(), true, new DummyBluetoothGattCallback (this));
-
- if (gatt != null)
- {
- btDevicesPairing.put (btDevice.getAddress(), gatt);
- }
- else
- {
- pairBluetoothDeviceStepTwo (btDevice);
- }
- }
-
- return true;
- }
-
- public void pairBluetoothDeviceStepTwo (BluetoothDevice btDevice)
- {
- manager.openBluetoothDevice(btDevice, this, null);
- }
-
- public void unpairBluetoothDevice (String address)
- {
- if (address.isEmpty())
- return;
-
- synchronized (MidiDeviceManager.class)
- {
- if (btDevicesPairing.containsKey (address))
- {
- BluetoothGatt gatt = btDevicesPairing.get (address);
- if (gatt != null)
- {
- gatt.disconnect();
- gatt.close();
- }
-
- btDevicesPairing.remove (address);
- }
-
- MidiDeviceOpenTask openTask = findOpenTaskForBluetoothAddress (address);
- if (openTask != null)
- {
- int deviceID = openTask.getID();
- openTask.cancel();
- openTasks.remove (deviceID);
- }
-
- Pair midiDevicePair = findMidiDeviceForBluetoothAddress (address);
- if (midiDevicePair != null)
- {
- MidiDevice midiDevice = midiDevicePair.first;
- onDeviceRemoved (midiDevice.getInfo());
-
- try {
- midiDevice.close();
- }
- catch (IOException exception)
- {
- Log.d ("JUCE", "IOException while closing midi device");
- }
- }
- }
- }
-
- private Pair findMidiDeviceForBluetoothAddress (String address)
- {
- for (Pair midiDevice : midiDevices)
- {
- MidiDeviceInfo info = midiDevice.first.getInfo();
- if (info.getType() == MidiDeviceInfo.TYPE_BLUETOOTH)
- {
- BluetoothDevice btDevice = (BluetoothDevice) info.getProperties().get (info.PROPERTY_BLUETOOTH_DEVICE);
- if (btDevice != null && btDevice.getAddress().equals (address))
- return midiDevice;
- }
- }
-
- return null;
- }
-
- private MidiDeviceOpenTask findOpenTaskForBluetoothAddress (String address)
- {
- for (Integer deviceID : openTasks.keySet())
- {
- MidiDeviceOpenTask openTask = openTasks.get (deviceID);
- if (openTask.getBluetoothAddress().equals (address))
- return openTask;
- }
-
- return null;
- }
-
- public void removePort (MidiPortPath path)
- {
- openPorts.remove (path);
- }
-
- public String getInputPortNameForJuceIndex (int index)
- {
- MidiPortPath portInfo = getPortPathForJuceIndex (MidiDeviceInfo.PortInfo.TYPE_OUTPUT, index);
- if (portInfo != null)
- return getPortName (portInfo);
-
- return "";
- }
-
- public String getOutputPortNameForJuceIndex (int index)
- {
- MidiPortPath portInfo = getPortPathForJuceIndex (MidiDeviceInfo.PortInfo.TYPE_INPUT, index);
- if (portInfo != null)
- return getPortName (portInfo);
-
- return "";
- }
-
- public void onDeviceAdded (MidiDeviceInfo info)
- {
- // only add standard midi devices
- if (info.getType() == info.TYPE_BLUETOOTH)
- return;
-
- manager.openDevice (info, this, null);
- }
-
- public void onDeviceRemoved (MidiDeviceInfo info)
- {
- synchronized (MidiDeviceManager.class)
- {
- Pair devicePair = getMidiDevicePairForId (info.getId());
-
- if (devicePair != null)
- {
- MidiDevice midiDevice = devicePair.first;
- BluetoothGatt gatt = devicePair.second;
-
- // close all ports that use this device
- boolean removedPort = true;
-
- while (removedPort == true)
- {
- removedPort = false;
- for (MidiPortPath key : openPorts.keySet())
- {
- if (key.deviceId == info.getId())
- {
- openPorts.get(key).get().close();
- removedPort = true;
- break;
- }
- }
- }
-
- if (gatt != null)
- {
- gatt.disconnect();
- gatt.close();
- }
-
- midiDevices.remove (devicePair);
- }
- }
- }
-
- public void onDeviceStatusChanged (MidiDeviceStatus status)
- {
- }
-
- @Override
- public void onDeviceOpened (MidiDevice theDevice)
- {
- synchronized (MidiDeviceManager.class)
- {
- MidiDeviceInfo info = theDevice.getInfo();
- int deviceID = info.getId();
- BluetoothGatt gatt = null;
- boolean isBluetooth = false;
-
- if (! openTasks.containsKey (deviceID))
- {
- if (info.getType() == MidiDeviceInfo.TYPE_BLUETOOTH)
- {
- isBluetooth = true;
- BluetoothDevice btDevice = (BluetoothDevice) info.getProperties().get (info.PROPERTY_BLUETOOTH_DEVICE);
- if (btDevice != null)
- {
- String btAddress = btDevice.getAddress();
- if (btDevicesPairing.containsKey (btAddress))
- {
- gatt = btDevicesPairing.get (btAddress);
- btDevicesPairing.remove (btAddress);
- }
- else
- {
- // unpair was called in the mean time
- try
- {
- Pair midiDevicePair = findMidiDeviceForBluetoothAddress (btDevice.getAddress());
- if (midiDevicePair != null)
- {
- gatt = midiDevicePair.second;
-
- if (gatt != null)
- {
- gatt.disconnect();
- gatt.close();
- }
- }
-
- theDevice.close();
- }
- catch (IOException e)
- {}
-
- return;
- }
- }
- }
-
- MidiDeviceOpenTask openTask = new MidiDeviceOpenTask (this, theDevice, gatt);
- openTasks.put (deviceID, openTask);
-
- new java.util.Timer().schedule (openTask, (isBluetooth ? 2000 : 100));
- }
- }
- }
-
- public void onDeviceOpenedDelayed (MidiDevice theDevice)
- {
- synchronized (MidiDeviceManager.class)
- {
- int deviceID = theDevice.getInfo().getId();
-
- if (openTasks.containsKey (deviceID))
- {
- if (! midiDevices.contains(theDevice))
- {
- BluetoothGatt gatt = openTasks.get (deviceID).getGatt();
- openTasks.remove (deviceID);
- midiDevices.add (new Pair (theDevice, gatt));
- }
- }
- else
- {
- // unpair was called in the mean time
- MidiDeviceInfo info = theDevice.getInfo();
- BluetoothDevice btDevice = (BluetoothDevice) info.getProperties().get (info.PROPERTY_BLUETOOTH_DEVICE);
- if (btDevice != null)
- {
- String btAddress = btDevice.getAddress();
- Pair midiDevicePair = findMidiDeviceForBluetoothAddress (btDevice.getAddress());
- if (midiDevicePair != null)
- {
- BluetoothGatt gatt = midiDevicePair.second;
-
- if (gatt != null)
- {
- gatt.disconnect();
- gatt.close();
- }
- }
- }
-
- try
- {
- theDevice.close();
- }
- catch (IOException e)
- {}
- }
- }
- }
-
- public String getPortName(MidiPortPath path)
- {
- int portTypeToFind = (path.isInput ? MidiDeviceInfo.PortInfo.TYPE_INPUT : MidiDeviceInfo.PortInfo.TYPE_OUTPUT);
-
- synchronized (MidiDeviceManager.class)
- {
- for (MidiDeviceInfo info : deviceInfos)
- {
- int localIndex = 0;
- if (info.getId() == path.deviceId)
- {
- for (MidiDeviceInfo.PortInfo portInfo : info.getPorts())
- {
- int portType = portInfo.getType();
- if (portType == portTypeToFind)
- {
- int portIndex = portInfo.getPortNumber();
- if (portIndex == path.portIndex)
- {
- String portName = portInfo.getName();
- if (portName.isEmpty())
- portName = (String) info.getProperties().get(info.PROPERTY_NAME);
-
- return portName;
- }
- }
- }
- }
- }
- }
-
- return "";
- }
-
- public MidiPortPath getPortPathForJuceIndex (int portType, int juceIndex)
- {
- int portIdx = 0;
- for (MidiDeviceInfo info : deviceInfos)
- {
- for (MidiDeviceInfo.PortInfo portInfo : info.getPorts())
- {
- if (portInfo.getType() == portType)
- {
- if (portIdx == juceIndex)
- return new MidiPortPath (info.getId(),
- (portType == MidiDeviceInfo.PortInfo.TYPE_INPUT),
- portInfo.getPortNumber());
-
- portIdx++;
- }
- }
- }
-
- return null;
- }
-
- private MidiDeviceInfo[] getDeviceInfos()
- {
- synchronized (MidiDeviceManager.class)
- {
- MidiDeviceInfo[] infos = new MidiDeviceInfo[midiDevices.size()];
-
- int idx = 0;
- for (Pair midiDevice : midiDevices)
- infos[idx++] = midiDevice.first.getInfo();
-
- return infos;
- }
- }
-
- private Pair getMidiDevicePairForId (int deviceId)
- {
- synchronized (MidiDeviceManager.class)
- {
- for (Pair midiDevice : midiDevices)
- if (midiDevice.first.getInfo().getId() == deviceId)
- return midiDevice;
- }
-
- return null;
- }
-
- private MidiManager manager;
- private HashMap btDevicesPairing;
- private HashMap openTasks;
- private ArrayList> midiDevices;
- private MidiDeviceInfo[] deviceInfos;
- private HashMap> openPorts;
- }
-
- public MidiDeviceManager getAndroidMidiDeviceManager()
- {
- if (getSystemService (MIDI_SERVICE) == null)
- return null;
-
- synchronized (JuceAppActivity.class)
- {
- if (midiDeviceManager == null)
- midiDeviceManager = new MidiDeviceManager();
- }
-
- return midiDeviceManager;
- }
-
- public BluetoothManager getAndroidBluetoothManager()
- {
- BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
-
- if (adapter == null)
- return null;
-
- if (adapter.getBluetoothLeScanner() == null)
- return null;
-
- synchronized (JuceAppActivity.class)
- {
- if (bluetoothManager == null)
- bluetoothManager = new BluetoothManager();
- }
-
- return bluetoothManager;
- }
+package com.roli.juce;
+
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothGatt;
+import android.bluetooth.BluetoothGattCallback;
+import android.bluetooth.BluetoothGattCharacteristic;
+import android.bluetooth.BluetoothGattDescriptor;
+import android.bluetooth.BluetoothProfile;
+import android.bluetooth.le.BluetoothLeScanner;
+import android.bluetooth.le.ScanFilter;
+import android.bluetooth.le.ScanResult;
+import android.bluetooth.le.ScanSettings;
+import android.content.Context;
+import android.media.midi.MidiDevice;
+import android.media.midi.MidiDeviceInfo;
+import android.media.midi.MidiDeviceStatus;
+import android.media.midi.MidiInputPort;
+import android.media.midi.MidiManager;
+import android.bluetooth.le.ScanCallback;
+import android.bluetooth.BluetoothDevice;
+import android.media.midi.MidiOutputPort;
+import android.media.midi.MidiReceiver;
+import android.os.ParcelUuid;
+import android.util.Log;
+import android.util.Pair;
+
+import java.io.IOException;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+
+import static android.content.Context.MIDI_SERVICE;
+
+public class JuceMidiSupport
+{
+ //==============================================================================
+ public interface JuceMidiPort
+ {
+ boolean isInputPort ();
+
+ // start, stop does nothing on an output port
+ void start ();
+
+ void stop ();
+
+ void close ();
+
+ // send will do nothing on an input port
+ void sendMidi (byte[] msg, int offset, int count);
+ }
+
+ //==============================================================================
+ public static class BluetoothManager extends ScanCallback
+ {
+ BluetoothManager (Context contextToUse)
+ {
+ appContext = contextToUse;
+ }
+
+ public String[] getMidiBluetoothAddresses ()
+ {
+ return bluetoothMidiDevices.toArray (new String[bluetoothMidiDevices.size ()]);
+ }
+
+ public String getHumanReadableStringForBluetoothAddress (String address)
+ {
+ BluetoothDevice btDevice = BluetoothAdapter.getDefaultAdapter ().getRemoteDevice (address);
+ return btDevice.getName ();
+ }
+
+ public int getBluetoothDeviceStatus (String address)
+ {
+ return getAndroidMidiDeviceManager (appContext).getBluetoothDeviceStatus (address);
+ }
+
+ public void startStopScan (boolean shouldStart)
+ {
+ BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter ();
+
+ if (bluetoothAdapter == null)
+ {
+ Log.d ("JUCE", "BluetoothManager error: could not get default Bluetooth adapter");
+ return;
+ }
+
+ BluetoothLeScanner bluetoothLeScanner = bluetoothAdapter.getBluetoothLeScanner ();
+
+ if (bluetoothLeScanner == null)
+ {
+ Log.d ("JUCE", "BluetoothManager error: could not get Bluetooth LE scanner");
+ return;
+ }
+
+ if (shouldStart)
+ {
+ ScanFilter.Builder scanFilterBuilder = new ScanFilter.Builder ();
+ scanFilterBuilder.setServiceUuid (ParcelUuid.fromString (bluetoothLEMidiServiceUUID));
+
+ ScanSettings.Builder scanSettingsBuilder = new ScanSettings.Builder ();
+ scanSettingsBuilder.setCallbackType (ScanSettings.CALLBACK_TYPE_ALL_MATCHES)
+ .setScanMode (ScanSettings.SCAN_MODE_LOW_POWER)
+ .setScanMode (ScanSettings.MATCH_MODE_STICKY);
+
+ bluetoothLeScanner.startScan (Arrays.asList (scanFilterBuilder.build ()),
+ scanSettingsBuilder.build (),
+ this);
+ } else
+ {
+ bluetoothLeScanner.stopScan (this);
+ }
+ }
+
+ public boolean pairBluetoothMidiDevice (String address)
+ {
+ BluetoothDevice btDevice = BluetoothAdapter.getDefaultAdapter ().getRemoteDevice (address);
+
+ if (btDevice == null)
+ {
+ Log.d ("JUCE", "failed to create buletooth device from address");
+ return false;
+ }
+
+ return getAndroidMidiDeviceManager (appContext).pairBluetoothDevice (btDevice);
+ }
+
+ public void unpairBluetoothMidiDevice (String address)
+ {
+ getAndroidMidiDeviceManager (appContext).unpairBluetoothDevice (address);
+ }
+
+ public void onScanFailed (int errorCode)
+ {
+ }
+
+ public void onScanResult (int callbackType, ScanResult result)
+ {
+ if (callbackType == ScanSettings.CALLBACK_TYPE_ALL_MATCHES
+ || callbackType == ScanSettings.CALLBACK_TYPE_FIRST_MATCH)
+ {
+ BluetoothDevice device = result.getDevice ();
+
+ if (device != null)
+ bluetoothMidiDevices.add (device.getAddress ());
+ }
+
+ if (callbackType == ScanSettings.CALLBACK_TYPE_MATCH_LOST)
+ {
+ Log.d ("JUCE", "ScanSettings.CALLBACK_TYPE_MATCH_LOST");
+ BluetoothDevice device = result.getDevice ();
+
+ if (device != null)
+ {
+ bluetoothMidiDevices.remove (device.getAddress ());
+ unpairBluetoothMidiDevice (device.getAddress ());
+ }
+ }
+ }
+
+ public void onBatchScanResults (List results)
+ {
+ for (ScanResult result : results)
+ onScanResult (ScanSettings.CALLBACK_TYPE_ALL_MATCHES, result);
+ }
+
+ private BluetoothLeScanner scanner;
+ private static final String bluetoothLEMidiServiceUUID = "03B80E5A-EDE8-4B33-A751-6CE34EC4C700";
+
+ private HashSet bluetoothMidiDevices = new HashSet ();
+ private Context appContext = null;
+ }
+
+ public static class JuceMidiInputPort extends MidiReceiver implements JuceMidiPort
+ {
+ private native void handleReceive (long host, byte[] msg, int offset, int count, long timestamp);
+
+ public JuceMidiInputPort (MidiDeviceManager mm, MidiOutputPort actualPort, MidiPortPath portPathToUse, long hostToUse)
+ {
+ owner = mm;
+ androidPort = actualPort;
+ portPath = portPathToUse;
+ juceHost = hostToUse;
+ isConnected = false;
+ }
+
+ @Override
+ protected void finalize () throws Throwable
+ {
+ close ();
+ super.finalize ();
+ }
+
+ @Override
+ public boolean isInputPort ()
+ {
+ return true;
+ }
+
+ @Override
+ public void start ()
+ {
+ if (owner != null && androidPort != null && !isConnected)
+ {
+ androidPort.connect (this);
+ isConnected = true;
+ }
+ }
+
+ @Override
+ public void stop ()
+ {
+ if (owner != null && androidPort != null && isConnected)
+ {
+ androidPort.disconnect (this);
+ isConnected = false;
+ }
+ }
+
+ @Override
+ public void close ()
+ {
+ if (androidPort != null)
+ {
+ try
+ {
+ androidPort.close ();
+ } catch (IOException exception)
+ {
+ Log.d ("JUCE", "IO Exception while closing port");
+ }
+ }
+
+ if (owner != null)
+ owner.removePort (portPath);
+
+ owner = null;
+ androidPort = null;
+ }
+
+ @Override
+ public void onSend (byte[] msg, int offset, int count, long timestamp)
+ {
+ if (count > 0)
+ handleReceive (juceHost, msg, offset, count, timestamp);
+ }
+
+ @Override
+ public void onFlush ()
+ {}
+
+ @Override
+ public void sendMidi (byte[] msg, int offset, int count)
+ {
+ }
+
+ MidiDeviceManager owner;
+ MidiOutputPort androidPort;
+ MidiPortPath portPath;
+ long juceHost;
+ boolean isConnected;
+ }
+
+ public static class JuceMidiOutputPort implements JuceMidiPort
+ {
+ public JuceMidiOutputPort (MidiDeviceManager mm, MidiInputPort actualPort, MidiPortPath portPathToUse)
+ {
+ owner = mm;
+ androidPort = actualPort;
+ portPath = portPathToUse;
+ }
+
+ @Override
+ protected void finalize () throws Throwable
+ {
+ close ();
+ super.finalize ();
+ }
+
+ @Override
+ public boolean isInputPort ()
+ {
+ return false;
+ }
+
+ @Override
+ public void start ()
+ {
+ }
+
+ @Override
+ public void stop ()
+ {
+ }
+
+ @Override
+ public void sendMidi (byte[] msg, int offset, int count)
+ {
+ if (androidPort != null)
+ {
+ try
+ {
+ androidPort.send (msg, offset, count);
+ } catch (IOException exception)
+ {
+ Log.d ("JUCE", "send midi had IO exception");
+ }
+ }
+ }
+
+ @Override
+ public void close ()
+ {
+ if (androidPort != null)
+ {
+ try
+ {
+ androidPort.close ();
+ } catch (IOException exception)
+ {
+ Log.d ("JUCE", "IO Exception while closing port");
+ }
+ }
+
+ if (owner != null)
+ owner.removePort (portPath);
+
+ owner = null;
+ androidPort = null;
+ }
+
+ MidiDeviceManager owner;
+ MidiInputPort androidPort;
+ MidiPortPath portPath;
+ }
+
+ private static class MidiPortPath extends Object
+ {
+ public MidiPortPath (int deviceIdToUse, boolean direction, int androidIndex)
+ {
+ deviceId = deviceIdToUse;
+ isInput = direction;
+ portIndex = androidIndex;
+
+ }
+
+ public int deviceId;
+ public int portIndex;
+ public boolean isInput;
+
+ @Override
+ public int hashCode ()
+ {
+ Integer i = new Integer ((deviceId * 128) + (portIndex < 128 ? portIndex : 127));
+ return i.hashCode () * (isInput ? -1 : 1);
+ }
+
+ @Override
+ public boolean equals (Object obj)
+ {
+ if (obj == null)
+ return false;
+
+ if (getClass () != obj.getClass ())
+ return false;
+
+ MidiPortPath other = (MidiPortPath) obj;
+ return (portIndex == other.portIndex && isInput == other.isInput && deviceId == other.deviceId);
+ }
+ }
+
+ //==============================================================================
+ public static class MidiDeviceManager extends MidiManager.DeviceCallback implements MidiManager.OnDeviceOpenedListener
+ {
+ //==============================================================================
+ private class DummyBluetoothGattCallback extends BluetoothGattCallback
+ {
+ public DummyBluetoothGattCallback (MidiDeviceManager mm)
+ {
+ super ();
+ owner = mm;
+ }
+
+ public void onConnectionStateChange (BluetoothGatt gatt, int status, int newState)
+ {
+ if (newState == BluetoothProfile.STATE_CONNECTED)
+ {
+ gatt.requestConnectionPriority (BluetoothGatt.CONNECTION_PRIORITY_HIGH);
+ owner.pairBluetoothDeviceStepTwo (gatt.getDevice ());
+ }
+ }
+
+ public void onServicesDiscovered (BluetoothGatt gatt, int status) {}
+
+ public void onCharacteristicRead (BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {}
+
+ public void onCharacteristicWrite (BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {}
+
+ public void onCharacteristicChanged (BluetoothGatt gatt, BluetoothGattCharacteristic characteristic) {}
+
+ public void onDescriptorRead (BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {}
+
+ public void onDescriptorWrite (BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {}
+
+ public void onReliableWriteCompleted (BluetoothGatt gatt, int status) {}
+
+ public void onReadRemoteRssi (BluetoothGatt gatt, int rssi, int status) {}
+
+ public void onMtuChanged (BluetoothGatt gatt, int mtu, int status) {}
+
+ private MidiDeviceManager owner;
+ }
+
+ //==============================================================================
+ private class MidiDeviceOpenTask extends java.util.TimerTask
+ {
+ public MidiDeviceOpenTask (MidiDeviceManager deviceManager, MidiDevice device, BluetoothGatt gattToUse)
+ {
+ owner = deviceManager;
+ midiDevice = device;
+ btGatt = gattToUse;
+ }
+
+ @Override
+ public boolean cancel ()
+ {
+ synchronized (MidiDeviceOpenTask.class)
+ {
+ owner = null;
+ boolean retval = super.cancel ();
+
+ if (btGatt != null)
+ {
+ btGatt.disconnect ();
+ btGatt.close ();
+
+ btGatt = null;
+ }
+
+ if (midiDevice != null)
+ {
+ try
+ {
+ midiDevice.close ();
+ } catch (IOException e)
+ {
+ }
+
+ midiDevice = null;
+ }
+
+ return retval;
+ }
+ }
+
+ public String getBluetoothAddress ()
+ {
+ synchronized (MidiDeviceOpenTask.class)
+ {
+ if (midiDevice != null)
+ {
+ MidiDeviceInfo info = midiDevice.getInfo ();
+ if (info.getType () == MidiDeviceInfo.TYPE_BLUETOOTH)
+ {
+ BluetoothDevice btDevice = (BluetoothDevice) info.getProperties ().get (info.PROPERTY_BLUETOOTH_DEVICE);
+ if (btDevice != null)
+ return btDevice.getAddress ();
+ }
+ }
+ }
+
+ return "";
+ }
+
+ public BluetoothGatt getGatt () { return btGatt; }
+
+ public int getID ()
+ {
+ return midiDevice.getInfo ().getId ();
+ }
+
+ @Override
+ public void run ()
+ {
+ synchronized (MidiDeviceOpenTask.class)
+ {
+ if (owner != null && midiDevice != null)
+ owner.onDeviceOpenedDelayed (midiDevice);
+ }
+ }
+
+ private MidiDeviceManager owner;
+ private MidiDevice midiDevice;
+ private BluetoothGatt btGatt;
+ }
+
+ //==============================================================================
+ public MidiDeviceManager (Context contextToUse)
+ {
+ appContext = contextToUse;
+ manager = (MidiManager) appContext.getSystemService (MIDI_SERVICE);
+
+ if (manager == null)
+ {
+ Log.d ("JUCE", "MidiDeviceManager error: could not get MidiManager system service");
+ return;
+ }
+
+ openPorts = new HashMap> ();
+ midiDevices = new ArrayList> ();
+ openTasks = new HashMap ();
+ btDevicesPairing = new HashMap ();
+
+ MidiDeviceInfo[] foundDevices = manager.getDevices ();
+ for (MidiDeviceInfo info : foundDevices)
+ onDeviceAdded (info);
+
+ manager.registerDeviceCallback (this, null);
+ }
+
+ protected void finalize () throws Throwable
+ {
+ manager.unregisterDeviceCallback (this);
+
+ synchronized (MidiDeviceManager.class)
+ {
+ btDevicesPairing.clear ();
+
+ for (Integer deviceID : openTasks.keySet ())
+ openTasks.get (deviceID).cancel ();
+
+ openTasks = null;
+ }
+
+ for (MidiPortPath key : openPorts.keySet ())
+ openPorts.get (key).get ().close ();
+
+ openPorts = null;
+
+ for (Pair device : midiDevices)
+ {
+ if (device.second != null)
+ {
+ device.second.disconnect ();
+ device.second.close ();
+ }
+
+ device.first.close ();
+ }
+
+ midiDevices.clear ();
+
+ super.finalize ();
+ }
+
+ public String[] getJuceAndroidMidiInputDevices ()
+ {
+ return getJuceAndroidMidiDevices (MidiDeviceInfo.PortInfo.TYPE_OUTPUT);
+ }
+
+ public String[] getJuceAndroidMidiOutputDevices ()
+ {
+ return getJuceAndroidMidiDevices (MidiDeviceInfo.PortInfo.TYPE_INPUT);
+ }
+
+ private String[] getJuceAndroidMidiDevices (int portType)
+ {
+ // only update the list when JUCE asks for a new list
+ synchronized (MidiDeviceManager.class)
+ {
+ deviceInfos = getDeviceInfos ();
+ }
+
+ ArrayList portNames = new ArrayList ();
+
+ int index = 0;
+ for (MidiPortPath portInfo = getPortPathForJuceIndex (portType, index); portInfo != null; portInfo = getPortPathForJuceIndex (portType, ++index))
+ portNames.add (getPortName (portInfo));
+
+ String[] names = new String[portNames.size ()];
+ return portNames.toArray (names);
+ }
+
+ private JuceMidiPort openMidiPortWithJuceIndex (int index, long host, boolean isInput)
+ {
+ synchronized (MidiDeviceManager.class)
+ {
+ int portTypeToFind = (isInput ? MidiDeviceInfo.PortInfo.TYPE_OUTPUT : MidiDeviceInfo.PortInfo.TYPE_INPUT);
+ MidiPortPath portInfo = getPortPathForJuceIndex (portTypeToFind, index);
+
+ if (portInfo != null)
+ {
+ // ports must be opened exclusively!
+ if (openPorts.containsKey (portInfo))
+ return null;
+
+ Pair devicePair = getMidiDevicePairForId (portInfo.deviceId);
+
+ if (devicePair != null)
+ {
+ MidiDevice device = devicePair.first;
+ if (device != null)
+ {
+ JuceMidiPort juceMidiPort = null;
+
+ if (isInput)
+ {
+ MidiOutputPort outputPort = device.openOutputPort (portInfo.portIndex);
+
+ if (outputPort != null)
+ juceMidiPort = new JuceMidiInputPort (this, outputPort, portInfo, host);
+ } else
+ {
+ MidiInputPort inputPort = device.openInputPort (portInfo.portIndex);
+
+ if (inputPort != null)
+ juceMidiPort = new JuceMidiOutputPort (this, inputPort, portInfo);
+ }
+
+ if (juceMidiPort != null)
+ {
+ openPorts.put (portInfo, new WeakReference (juceMidiPort));
+
+ return juceMidiPort;
+ }
+ }
+ }
+ }
+ }
+
+ return null;
+ }
+
+ public JuceMidiPort openMidiInputPortWithJuceIndex (int index, long host)
+ {
+ return openMidiPortWithJuceIndex (index, host, true);
+ }
+
+ public JuceMidiPort openMidiOutputPortWithJuceIndex (int index)
+ {
+ return openMidiPortWithJuceIndex (index, 0, false);
+ }
+
+ /* 0: unpaired, 1: paired, 2: pairing */
+ public int getBluetoothDeviceStatus (String address)
+ {
+ synchronized (MidiDeviceManager.class)
+ {
+ if (!address.isEmpty ())
+ {
+ if (findMidiDeviceForBluetoothAddress (address) != null)
+ return 1;
+
+ if (btDevicesPairing.containsKey (address))
+ return 2;
+
+ if (findOpenTaskForBluetoothAddress (address) != null)
+ return 2;
+ }
+ }
+
+ return 0;
+ }
+
+ public boolean pairBluetoothDevice (BluetoothDevice btDevice)
+ {
+ String btAddress = btDevice.getAddress ();
+ if (btAddress.isEmpty ())
+ return false;
+
+ synchronized (MidiDeviceManager.class)
+ {
+ if (getBluetoothDeviceStatus (btAddress) != 0)
+ return false;
+
+
+ btDevicesPairing.put (btDevice.getAddress (), null);
+ BluetoothGatt gatt = btDevice.connectGatt (appContext.getApplicationContext (), true, new DummyBluetoothGattCallback (this));
+
+ if (gatt != null)
+ {
+ btDevicesPairing.put (btDevice.getAddress (), gatt);
+ } else
+ {
+ pairBluetoothDeviceStepTwo (btDevice);
+ }
+ }
+
+ return true;
+ }
+
+ public void pairBluetoothDeviceStepTwo (BluetoothDevice btDevice)
+ {
+ manager.openBluetoothDevice (btDevice, this, null);
+ }
+
+ public void unpairBluetoothDevice (String address)
+ {
+ if (address.isEmpty ())
+ return;
+
+ synchronized (MidiDeviceManager.class)
+ {
+ if (btDevicesPairing.containsKey (address))
+ {
+ BluetoothGatt gatt = btDevicesPairing.get (address);
+ if (gatt != null)
+ {
+ gatt.disconnect ();
+ gatt.close ();
+ }
+
+ btDevicesPairing.remove (address);
+ }
+
+ MidiDeviceOpenTask openTask = findOpenTaskForBluetoothAddress (address);
+ if (openTask != null)
+ {
+ int deviceID = openTask.getID ();
+ openTask.cancel ();
+ openTasks.remove (deviceID);
+ }
+
+ Pair midiDevicePair = findMidiDeviceForBluetoothAddress (address);
+ if (midiDevicePair != null)
+ {
+ MidiDevice midiDevice = midiDevicePair.first;
+ onDeviceRemoved (midiDevice.getInfo ());
+
+ try
+ {
+ midiDevice.close ();
+ } catch (IOException exception)
+ {
+ Log.d ("JUCE", "IOException while closing midi device");
+ }
+ }
+ }
+ }
+
+ private Pair findMidiDeviceForBluetoothAddress (String address)
+ {
+ for (Pair midiDevice : midiDevices)
+ {
+ MidiDeviceInfo info = midiDevice.first.getInfo ();
+ if (info.getType () == MidiDeviceInfo.TYPE_BLUETOOTH)
+ {
+ BluetoothDevice btDevice = (BluetoothDevice) info.getProperties ().get (info.PROPERTY_BLUETOOTH_DEVICE);
+ if (btDevice != null && btDevice.getAddress ().equals (address))
+ return midiDevice;
+ }
+ }
+
+ return null;
+ }
+
+ private MidiDeviceOpenTask findOpenTaskForBluetoothAddress (String address)
+ {
+ for (Integer deviceID : openTasks.keySet ())
+ {
+ MidiDeviceOpenTask openTask = openTasks.get (deviceID);
+ if (openTask.getBluetoothAddress ().equals (address))
+ return openTask;
+ }
+
+ return null;
+ }
+
+ public void removePort (MidiPortPath path)
+ {
+ openPorts.remove (path);
+ }
+
+ public String getInputPortNameForJuceIndex (int index)
+ {
+ MidiPortPath portInfo = getPortPathForJuceIndex (MidiDeviceInfo.PortInfo.TYPE_OUTPUT, index);
+ if (portInfo != null)
+ return getPortName (portInfo);
+
+ return "";
+ }
+
+ public String getOutputPortNameForJuceIndex (int index)
+ {
+ MidiPortPath portInfo = getPortPathForJuceIndex (MidiDeviceInfo.PortInfo.TYPE_INPUT, index);
+ if (portInfo != null)
+ return getPortName (portInfo);
+
+ return "";
+ }
+
+ public void onDeviceAdded (MidiDeviceInfo info)
+ {
+ // only add standard midi devices
+ if (info.getType () == info.TYPE_BLUETOOTH)
+ return;
+
+ manager.openDevice (info, this, null);
+ }
+
+ public void onDeviceRemoved (MidiDeviceInfo info)
+ {
+ synchronized (MidiDeviceManager.class)
+ {
+ Pair devicePair = getMidiDevicePairForId (info.getId ());
+
+ if (devicePair != null)
+ {
+ MidiDevice midiDevice = devicePair.first;
+ BluetoothGatt gatt = devicePair.second;
+
+ // close all ports that use this device
+ boolean removedPort = true;
+
+ while (removedPort == true)
+ {
+ removedPort = false;
+ for (MidiPortPath key : openPorts.keySet ())
+ {
+ if (key.deviceId == info.getId ())
+ {
+ openPorts.get (key).get ().close ();
+ removedPort = true;
+ break;
+ }
+ }
+ }
+
+ if (gatt != null)
+ {
+ gatt.disconnect ();
+ gatt.close ();
+ }
+
+ midiDevices.remove (devicePair);
+ }
+ }
+ }
+
+ public void onDeviceStatusChanged (MidiDeviceStatus status)
+ {
+ }
+
+ @Override
+ public void onDeviceOpened (MidiDevice theDevice)
+ {
+ synchronized (MidiDeviceManager.class)
+ {
+ MidiDeviceInfo info = theDevice.getInfo ();
+ int deviceID = info.getId ();
+ BluetoothGatt gatt = null;
+ boolean isBluetooth = false;
+
+ if (!openTasks.containsKey (deviceID))
+ {
+ if (info.getType () == MidiDeviceInfo.TYPE_BLUETOOTH)
+ {
+ isBluetooth = true;
+ BluetoothDevice btDevice = (BluetoothDevice) info.getProperties ().get (info.PROPERTY_BLUETOOTH_DEVICE);
+ if (btDevice != null)
+ {
+ String btAddress = btDevice.getAddress ();
+ if (btDevicesPairing.containsKey (btAddress))
+ {
+ gatt = btDevicesPairing.get (btAddress);
+ btDevicesPairing.remove (btAddress);
+ } else
+ {
+ // unpair was called in the mean time
+ try
+ {
+ Pair midiDevicePair = findMidiDeviceForBluetoothAddress (btDevice.getAddress ());
+ if (midiDevicePair != null)
+ {
+ gatt = midiDevicePair.second;
+
+ if (gatt != null)
+ {
+ gatt.disconnect ();
+ gatt.close ();
+ }
+ }
+
+ theDevice.close ();
+ } catch (IOException e)
+ {
+ }
+
+ return;
+ }
+ }
+ }
+
+ MidiDeviceOpenTask openTask = new MidiDeviceOpenTask (this, theDevice, gatt);
+ openTasks.put (deviceID, openTask);
+
+ new java.util.Timer ().schedule (openTask, (isBluetooth ? 2000 : 100));
+ }
+ }
+ }
+
+ public void onDeviceOpenedDelayed (MidiDevice theDevice)
+ {
+ synchronized (MidiDeviceManager.class)
+ {
+ int deviceID = theDevice.getInfo ().getId ();
+
+ if (openTasks.containsKey (deviceID))
+ {
+ if (!midiDevices.contains (theDevice))
+ {
+ BluetoothGatt gatt = openTasks.get (deviceID).getGatt ();
+ openTasks.remove (deviceID);
+ midiDevices.add (new Pair (theDevice, gatt));
+ }
+ } else
+ {
+ // unpair was called in the mean time
+ MidiDeviceInfo info = theDevice.getInfo ();
+ BluetoothDevice btDevice = (BluetoothDevice) info.getProperties ().get (info.PROPERTY_BLUETOOTH_DEVICE);
+ if (btDevice != null)
+ {
+ String btAddress = btDevice.getAddress ();
+ Pair midiDevicePair = findMidiDeviceForBluetoothAddress (btDevice.getAddress ());
+ if (midiDevicePair != null)
+ {
+ BluetoothGatt gatt = midiDevicePair.second;
+
+ if (gatt != null)
+ {
+ gatt.disconnect ();
+ gatt.close ();
+ }
+ }
+ }
+
+ try
+ {
+ theDevice.close ();
+ } catch (IOException e)
+ {
+ }
+ }
+ }
+ }
+
+ public String getPortName (MidiPortPath path)
+ {
+ int portTypeToFind = (path.isInput ? MidiDeviceInfo.PortInfo.TYPE_INPUT : MidiDeviceInfo.PortInfo.TYPE_OUTPUT);
+
+ synchronized (MidiDeviceManager.class)
+ {
+ for (MidiDeviceInfo info : deviceInfos)
+ {
+ int localIndex = 0;
+ if (info.getId () == path.deviceId)
+ {
+ for (MidiDeviceInfo.PortInfo portInfo : info.getPorts ())
+ {
+ int portType = portInfo.getType ();
+ if (portType == portTypeToFind)
+ {
+ int portIndex = portInfo.getPortNumber ();
+ if (portIndex == path.portIndex)
+ {
+ String portName = portInfo.getName ();
+ if (portName.isEmpty ())
+ portName = (String) info.getProperties ().get (info.PROPERTY_NAME);
+
+ return portName;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ return "";
+ }
+
+ public MidiPortPath getPortPathForJuceIndex (int portType, int juceIndex)
+ {
+ int portIdx = 0;
+ for (MidiDeviceInfo info : deviceInfos)
+ {
+ for (MidiDeviceInfo.PortInfo portInfo : info.getPorts ())
+ {
+ if (portInfo.getType () == portType)
+ {
+ if (portIdx == juceIndex)
+ return new MidiPortPath (info.getId (),
+ (portType == MidiDeviceInfo.PortInfo.TYPE_INPUT),
+ portInfo.getPortNumber ());
+
+ portIdx++;
+ }
+ }
+ }
+
+ return null;
+ }
+
+ private MidiDeviceInfo[] getDeviceInfos ()
+ {
+ synchronized (MidiDeviceManager.class)
+ {
+ MidiDeviceInfo[] infos = new MidiDeviceInfo[midiDevices.size ()];
+
+ int idx = 0;
+ for (Pair midiDevice : midiDevices)
+ infos[idx++] = midiDevice.first.getInfo ();
+
+ return infos;
+ }
+ }
+
+ private Pair getMidiDevicePairForId (int deviceId)
+ {
+ synchronized (MidiDeviceManager.class)
+ {
+ for (Pair midiDevice : midiDevices)
+ if (midiDevice.first.getInfo ().getId () == deviceId)
+ return midiDevice;
+ }
+
+ return null;
+ }
+
+ private MidiManager manager;
+ private HashMap btDevicesPairing;
+ private HashMap openTasks;
+ private ArrayList> midiDevices;
+ private MidiDeviceInfo[] deviceInfos;
+ private HashMap> openPorts;
+ private Context appContext = null;
+ }
+
+ public static MidiDeviceManager getAndroidMidiDeviceManager (Context context)
+ {
+ if (context.getSystemService (MIDI_SERVICE) == null)
+ return null;
+
+ synchronized (JuceMidiSupport.class)
+ {
+ if (midiDeviceManager == null)
+ midiDeviceManager = new MidiDeviceManager (context);
+ }
+
+ return midiDeviceManager;
+ }
+
+ public static BluetoothManager getAndroidBluetoothManager (Context context)
+ {
+ BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter ();
+
+ if (adapter == null)
+ return null;
+
+ if (adapter.getBluetoothLeScanner () == null)
+ return null;
+
+ synchronized (JuceMidiSupport.class)
+ {
+ if (bluetoothManager == null)
+ bluetoothManager = new BluetoothManager (context);
+ }
+
+ return bluetoothManager;
+ }
+
+ private static MidiDeviceManager midiDeviceManager = null;
+ private static BluetoothManager bluetoothManager = null;
+}
\ No newline at end of file
diff --git a/modules/juce_audio_devices/native/juce_android_Audio.cpp b/modules/juce_audio_devices/native/juce_android_Audio.cpp
index fe995ae433..3fa7399259 100644
--- a/modules/juce_audio_devices/native/juce_android_Audio.cpp
+++ b/modules/juce_audio_devices/native/juce_android_Audio.cpp
@@ -23,7 +23,7 @@
namespace juce
{
-#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD) \
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
STATICMETHOD (getMinBufferSize, "getMinBufferSize", "(III)I") \
STATICMETHOD (getNativeOutputSampleRate, "getNativeOutputSampleRate", "(I)I") \
METHOD (constructor, "", "(IIIIII)V") \
@@ -38,7 +38,7 @@ DECLARE_JNI_CLASS (AudioTrack, "android/media/AudioTrack")
#undef JNI_CLASS_MEMBERS
//==============================================================================
-#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD) \
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
STATICMETHOD (getMinBufferSize, "getMinBufferSize", "(III)I") \
METHOD (constructor, "", "(IIIII)V") \
METHOD (getState, "getState", "()I") \
@@ -50,13 +50,6 @@ DECLARE_JNI_CLASS (AudioTrack, "android/media/AudioTrack")
DECLARE_JNI_CLASS (AudioRecord, "android/media/AudioRecord")
#undef JNI_CLASS_MEMBERS
-//==============================================================================
-#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD) \
- STATICFIELD (SDK_INT, "SDK_INT", "I") \
-
- DECLARE_JNI_CLASS (AndroidBuildVersion, "android/os/Build$VERSION")
-#undef JNI_CLASS_MEMBERS
-
//==============================================================================
enum
{
@@ -198,11 +191,11 @@ public:
if (numClientOutputChannels > 0)
{
numDeviceOutputChannels = 2;
- outputDevice = GlobalRef (env->NewObject (AudioTrack, AudioTrack.constructor,
- STREAM_MUSIC, sampleRate, CHANNEL_OUT_STEREO, ENCODING_PCM_16BIT,
- (jint) (minBufferSizeOut * numDeviceOutputChannels * static_cast (sizeof (int16))), MODE_STREAM));
+ outputDevice = GlobalRef (LocalRef(env->NewObject (AudioTrack, AudioTrack.constructor,
+ STREAM_MUSIC, sampleRate, CHANNEL_OUT_STEREO, ENCODING_PCM_16BIT,
+ (jint) (minBufferSizeOut * numDeviceOutputChannels * static_cast (sizeof (int16))), MODE_STREAM)));
- const bool supportsUnderrunCount = (getEnv()->GetStaticIntField (AndroidBuildVersion, AndroidBuildVersion.SDK_INT) >= 24);
+ const bool supportsUnderrunCount = (getAndroidSDKVersion() >= 24);
getUnderrunCount = supportsUnderrunCount ? env->GetMethodID (AudioTrack, "getUnderrunCount", "()I") : 0;
int outputDeviceState = env->CallIntMethod (outputDevice, AudioTrack.getState);
@@ -232,11 +225,11 @@ public:
else
{
numDeviceInputChannels = jmin (numClientInputChannels, numDeviceInputChannelsAvailable);
- inputDevice = GlobalRef (env->NewObject (AudioRecord, AudioRecord.constructor,
- 0 /* (default audio source) */, sampleRate,
- numDeviceInputChannelsAvailable > 1 ? CHANNEL_IN_STEREO : CHANNEL_IN_MONO,
- ENCODING_PCM_16BIT,
- (jint) (minBufferSizeIn * numDeviceInputChannels * static_cast (sizeof (int16)))));
+ inputDevice = GlobalRef (LocalRef(env->NewObject (AudioRecord, AudioRecord.constructor,
+ 0 /* (default audio source) */, sampleRate,
+ numDeviceInputChannelsAvailable > 1 ? CHANNEL_IN_STEREO : CHANNEL_IN_MONO,
+ ENCODING_PCM_16BIT,
+ (jint) (minBufferSizeIn * numDeviceInputChannels * static_cast (sizeof (int16))))));
int inputDeviceState = env->CallIntMethod (inputDevice, AudioRecord.getState);
if (inputDeviceState > 0)
diff --git a/modules/juce_audio_devices/native/juce_android_Midi.cpp b/modules/juce_audio_devices/native/juce_android_Midi.cpp
index a178abf01f..449ff1c31f 100644
--- a/modules/juce_audio_devices/native/juce_android_Midi.cpp
+++ b/modules/juce_audio_devices/native/juce_android_Midi.cpp
@@ -23,24 +23,346 @@
namespace juce
{
-#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD) \
+//==============================================================================
+// This byte-code is generated from native/java/com/roli/juce/JuceMidiSupport.java with min sdk version 23
+// See juce_core/native/java/README.txt on how to generate this byte-code.
+static const uint8 javaMidiByteCode[] =
+{31,139,8,8,173,175,226,91,0,3,106,117,99,101,95,97,117,100,105,111,95,100,101,118,105,99,101,115,46,100,101,120,0,149,
+124,11,124,220,69,181,255,153,223,99,119,179,217,164,155,77,218,164,105,178,217,164,73,179,133,60,155,182,164,77,26,154,
+164,105,155,118,251,160,217,22,105,144,186,77,182,237,150,100,55,236,110,250,0,175,148,135,180,32,42,42,143,42,92,254,40,
+175,130,168,232,5,46,34,42,8,87,20,69,184,92,212,122,125,1,194,223,130,200,67,65,68,196,222,239,153,153,125,164,45,84,
+203,231,187,103,126,103,206,156,153,57,115,230,204,153,223,46,25,141,238,113,183,117,44,160,7,183,254,71,91,73,96,244,
+225,231,218,251,238,107,108,49,191,55,239,138,244,25,191,14,80,247,85,235,137,38,136,104,207,166,249,62,210,255,30,90,71,
+116,150,80,252,1,224,25,155,104,19,232,17,7,81,0,244,117,55,209,93,76,11,137,10,64,215,151,128,223,3,121,104,216,209,76,
+180,19,24,7,146,192,36,112,61,112,35,112,8,184,27,184,7,120,0,120,8,120,26,40,110,33,90,7,156,11,196,129,36,176,27,56,8,
+124,23,248,30,240,3,224,151,192,107,192,123,64,105,43,209,12,160,18,168,1,234,129,83,128,22,160,3,88,4,108,1,46,5,110,7,
+158,6,204,54,162,54,96,24,216,7,124,25,248,9,240,6,224,111,39,234,7,206,1,46,4,190,2,60,13,188,3,84,207,35,90,11,236,7,
+238,0,126,2,188,1,56,58,136,170,128,5,192,32,240,97,32,9,252,16,120,23,104,153,79,180,21,184,10,248,13,80,191,128,232,76,
+224,227,192,109,192,227,192,203,64,209,66,162,38,96,37,176,5,72,2,251,129,235,129,175,1,223,7,94,0,204,211,136,102,2,109,
+192,48,144,0,46,1,14,2,119,1,15,3,63,7,142,0,127,3,90,59,137,150,2,67,192,78,224,223,128,135,128,103,128,231,129,130,69,
+68,30,192,11,76,7,102,1,179,129,70,160,9,152,7,44,2,122,128,126,96,16,88,7,108,2,62,12,68,128,81,96,7,48,6,76,0,87,3,143,
+0,47,1,255,0,74,23,195,55,128,38,96,1,176,24,232,7,206,0,206,1,118,2,73,224,82,224,38,224,30,224,251,192,175,128,87,129,
+119,0,179,11,227,3,170,129,122,96,30,176,24,88,5,156,1,124,8,136,0,113,96,15,240,113,224,83,192,13,192,205,192,109,192,
+55,128,7,128,71,129,159,0,191,6,94,6,222,1,236,110,216,0,168,2,234,129,86,96,49,176,19,72,3,215,1,247,3,223,5,158,0,126,
+1,252,22,120,25,120,13,120,23,40,95,66,52,31,88,13,124,4,56,31,248,12,112,61,240,85,224,155,192,15,129,159,2,191,1,10,
+176,95,188,64,121,143,218,59,61,192,89,192,94,224,11,192,189,192,19,192,207,128,183,0,227,116,162,18,224,20,96,62,208,15,
+132,129,109,64,2,248,24,176,31,248,12,112,29,240,37,224,86,224,78,224,235,192,127,2,223,1,126,8,252,12,248,29,240,10,240,
+22,96,44,133,31,0,51,128,90,160,21,152,15,116,3,43,129,51,128,51,129,17,96,23,112,25,240,57,224,58,224,6,224,139,192,237,
+192,87,129,251,129,239,0,143,0,63,2,126,11,252,21,40,238,37,106,0,122,128,245,192,8,144,4,46,6,62,15,220,9,60,12,60,14,
+28,6,94,6,172,62,34,31,16,0,130,64,15,48,4,108,1,226,192,167,128,175,1,143,3,255,11,188,8,188,6,252,13,16,253,216,87,64,
+25,48,23,24,0,206,1,70,129,113,96,15,112,49,112,37,112,29,240,69,224,110,224,1,224,113,224,73,224,247,192,107,192,187,
+128,107,25,246,6,112,42,48,31,232,6,250,128,21,192,102,32,1,236,1,46,6,174,0,174,2,238,2,238,3,30,3,158,1,94,0,222,0,222,
+6,254,1,20,32,184,86,0,1,96,14,208,6,116,1,189,192,32,16,6,62,12,164,129,79,3,119,0,119,3,211,16,115,203,128,58,96,54,80,
+15,52,0,115,128,70,32,8,204,5,78,1,78,5,154,0,132,89,66,216,36,132,65,66,184,35,132,53,66,8,35,132,41,66,104,34,132,33,
+66,136,33,132,13,66,104,32,108,93,194,214,35,108,15,130,123,19,92,150,224,42,132,101,33,152,151,96,18,90,166,207,135,229,
+192,10,96,37,48,8,172,2,86,3,33,96,13,176,22,88,199,231,4,112,6,176,1,24,2,194,164,206,149,15,1,155,129,179,129,115,128,
+45,64,4,24,1,70,129,40,112,46,112,1,240,49,224,66,96,31,112,17,112,49,112,9,41,155,100,254,121,53,125,22,147,47,209,229,
+35,40,87,130,26,250,153,203,166,46,215,232,242,179,90,198,210,252,90,93,126,93,243,93,121,242,56,2,233,239,154,95,168,
+249,179,128,34,110,211,164,248,197,121,125,77,203,43,251,242,228,203,180,60,151,43,242,218,86,230,245,85,165,199,198,50,
+126,45,83,163,203,204,175,209,114,30,173,167,78,203,84,235,114,89,147,146,229,114,149,110,91,159,215,182,65,183,229,126,
+216,135,130,122,12,45,121,227,108,205,27,91,91,222,216,184,220,214,164,242,2,46,119,54,229,248,25,123,182,231,233,105,
+207,27,63,151,151,230,149,51,242,157,121,250,217,15,87,234,126,23,107,62,251,194,18,93,30,211,101,214,57,174,203,235,81,
+142,235,242,135,80,78,232,242,104,147,202,105,184,156,70,121,183,46,127,20,229,243,116,249,0,202,73,93,190,10,229,73,93,
+190,1,229,93,186,124,75,94,249,238,60,157,15,230,149,61,121,229,71,243,202,63,206,235,247,153,60,254,179,121,229,35,121,
+253,190,158,199,255,107,94,91,222,208,123,50,125,53,231,228,43,80,222,171,203,129,230,92,219,165,121,122,218,242,244,119,
+230,143,225,212,92,185,169,57,215,215,124,148,211,25,61,40,159,175,203,43,155,115,182,90,143,114,74,151,207,110,86,123,
+181,71,175,209,71,117,153,215,232,223,116,57,157,87,110,203,43,103,124,160,87,183,229,114,95,158,63,244,231,249,195,50,
+205,159,165,203,150,244,243,54,186,143,20,93,42,184,205,52,250,132,108,219,78,159,146,244,52,250,140,164,46,234,17,236,
+183,21,116,5,219,10,189,191,36,169,160,87,37,109,160,217,178,126,14,53,11,142,5,101,82,174,86,243,107,53,127,182,126,102,
+122,134,224,125,101,209,181,196,212,75,127,145,84,213,215,235,250,6,61,158,6,68,219,107,36,237,163,59,37,45,167,55,37,
+157,79,239,232,122,191,80,52,32,212,190,60,68,76,123,232,15,164,158,231,10,142,247,53,116,21,49,109,160,183,137,227,155,
+139,190,39,169,73,143,74,106,211,255,18,199,55,39,221,40,105,29,61,168,233,255,176,205,112,82,220,160,233,87,37,181,232,
+191,36,93,67,11,161,223,6,223,73,28,251,86,208,42,193,116,1,173,21,156,247,43,190,59,75,221,116,157,164,5,180,28,245,30,
+173,167,72,215,23,129,115,157,164,133,180,76,40,58,32,56,46,22,209,119,137,105,45,253,146,56,118,171,241,120,17,61,127,
+44,233,52,154,41,152,122,169,90,112,60,87,227,230,184,254,51,77,127,69,42,166,254,72,210,51,232,176,164,37,244,11,205,
+231,250,50,173,183,12,167,83,47,244,76,215,227,42,199,105,244,152,164,173,84,46,152,46,162,10,73,187,105,158,164,93,180,
+73,112,108,86,237,43,224,225,255,174,41,219,107,166,214,83,137,241,127,139,56,134,250,232,126,226,216,107,208,45,210,15,
+151,201,250,26,172,163,162,130,30,150,180,129,126,40,105,152,254,91,210,229,100,74,127,61,133,74,37,61,149,202,36,93,79,
+115,36,29,164,213,146,14,208,70,233,151,167,75,125,1,61,46,166,255,33,105,51,253,90,210,16,189,162,249,211,164,252,106,
+154,46,233,42,234,23,138,63,168,233,26,233,207,61,82,95,173,214,87,171,245,213,106,61,181,186,93,173,110,87,171,219,213,
+105,249,58,45,87,167,229,234,180,92,157,150,155,77,75,165,254,217,200,58,44,249,220,65,182,166,14,73,219,201,41,233,124,
+114,105,90,160,249,94,77,75,36,109,35,159,166,51,228,190,234,149,122,235,209,255,231,37,173,163,135,36,117,208,15,72,157,
+115,143,75,58,151,186,244,126,114,202,253,165,230,215,0,143,184,71,210,153,116,175,164,106,125,26,224,23,223,151,116,54,
+61,33,233,70,250,137,164,97,122,82,211,167,36,45,165,167,181,220,51,146,214,211,79,37,157,69,63,151,180,147,220,178,223,
+211,168,80,83,143,80,252,34,73,23,83,177,80,251,191,82,210,25,52,75,210,10,170,146,116,45,213,75,218,66,13,66,197,139,
+249,146,14,80,88,198,133,38,57,159,57,200,176,190,166,227,194,111,101,60,152,11,11,40,234,148,116,58,125,91,210,74,250,
+14,241,121,126,138,228,183,106,249,86,120,236,135,4,159,219,74,190,77,219,167,13,30,253,8,241,249,172,244,183,195,206,47,
+19,231,141,253,82,174,3,30,206,126,63,95,183,155,15,185,253,250,249,122,253,252,255,36,157,67,127,212,207,29,66,229,156,
+43,37,29,162,33,193,249,103,35,93,73,156,131,42,61,11,117,251,133,144,191,73,210,26,217,207,66,100,183,127,146,52,64,237,
+66,241,89,223,105,186,221,105,186,255,211,116,63,167,233,126,78,211,253,116,98,252,191,33,166,200,136,4,231,23,106,92,
+139,53,237,210,122,186,144,205,158,46,56,247,85,207,221,218,191,248,12,2,91,190,247,32,185,255,113,94,115,162,141,36,247,
+189,53,42,199,18,142,92,142,196,245,46,156,105,11,215,170,231,128,110,207,252,167,78,85,180,2,116,173,174,175,213,245,
+109,121,245,109,160,151,233,250,217,90,175,157,167,127,37,234,191,170,235,235,53,191,59,175,254,67,168,127,81,215,55,104,
+253,211,129,195,90,255,14,80,207,58,85,63,71,183,203,31,255,221,168,63,160,235,27,243,198,151,169,127,8,245,55,233,122,
+206,175,127,129,196,255,217,144,146,251,131,166,127,11,229,234,10,215,228,202,229,107,84,125,93,30,239,84,93,94,8,186,36,
+175,188,114,141,202,211,89,102,8,229,115,116,219,152,166,231,107,250,9,77,111,210,244,94,77,127,156,215,199,111,53,239,
+101,169,211,144,229,111,14,168,187,195,132,183,8,207,117,240,153,9,47,251,238,176,215,66,84,31,246,26,52,236,51,112,46,
+177,60,235,121,124,64,229,254,97,212,156,231,189,148,248,212,139,7,118,96,141,221,50,223,183,180,220,127,15,168,123,193,
+121,178,23,143,136,7,12,236,35,200,122,109,249,204,113,205,68,29,203,254,102,64,157,105,225,128,69,225,90,11,50,95,66,
+141,91,204,46,89,6,221,55,99,124,30,248,224,50,41,99,203,83,30,119,121,180,153,1,154,244,222,134,62,61,34,233,189,133,
+219,24,157,70,17,120,183,162,204,109,60,228,243,197,219,22,193,131,130,175,23,235,145,17,189,51,160,236,192,119,21,135,
+156,25,158,151,171,187,160,175,100,94,153,77,190,218,142,178,18,140,163,4,253,121,176,111,10,41,220,206,227,226,155,145,
+199,136,7,110,130,207,250,122,59,202,106,16,191,166,83,165,177,147,206,11,180,131,151,107,225,59,166,197,23,101,173,165,
+109,209,141,8,90,44,231,194,125,7,150,171,187,74,190,173,122,161,101,17,250,85,250,191,161,245,251,196,52,17,110,87,150,
+23,82,242,124,105,169,224,91,110,104,98,237,109,208,117,38,207,163,220,231,208,250,160,199,77,149,22,244,216,69,82,79,24,
+125,199,229,133,209,35,22,137,76,157,71,215,5,255,212,89,176,128,234,12,55,60,129,109,86,105,89,232,175,141,173,108,197,
+3,94,196,226,58,179,8,117,62,88,46,30,40,67,6,204,252,233,184,181,122,44,95,3,151,194,52,59,189,20,61,76,67,107,143,189,
+198,182,28,231,121,175,83,237,189,165,104,229,177,227,75,11,169,247,227,193,111,199,3,30,220,104,131,223,164,172,127,141,
+46,87,247,204,169,254,245,111,240,175,98,228,97,14,57,163,241,229,234,110,57,225,109,65,155,225,217,5,52,92,239,160,225,
+6,55,109,158,227,130,229,207,14,56,229,218,218,210,191,4,93,180,92,197,16,159,25,238,117,80,167,112,18,211,184,247,84,
+212,133,123,11,192,41,144,52,220,231,70,95,31,133,157,135,251,161,179,223,1,45,69,122,5,124,122,5,130,71,84,28,98,221,66,
+52,227,248,18,114,76,215,162,15,142,153,113,126,193,69,9,239,229,218,191,212,46,35,186,113,185,218,135,62,88,69,104,222,
+45,203,115,126,88,140,185,241,93,251,206,229,106,223,44,41,244,208,208,69,46,114,238,115,126,78,220,34,238,181,190,191,
+203,181,84,203,90,250,182,254,64,94,123,67,239,165,239,47,87,113,46,236,45,80,94,232,197,140,33,177,209,235,148,126,192,
+207,241,64,19,246,148,207,123,182,215,57,165,237,147,31,208,182,51,219,182,153,219,82,166,45,143,133,199,112,88,175,219,
+132,247,0,71,15,225,161,97,163,144,134,225,41,197,217,117,56,146,183,14,133,122,29,10,97,177,217,114,29,60,122,29,60,88,
+135,162,236,58,64,79,127,225,191,176,14,239,101,215,97,229,9,215,193,94,161,215,1,30,228,212,163,47,4,175,148,231,221,
+174,71,5,26,95,138,44,43,154,235,183,79,232,126,223,86,239,71,116,191,238,204,90,214,173,200,173,69,134,23,204,227,153,
+50,218,17,181,172,80,239,84,134,197,52,216,138,45,54,108,20,203,248,170,222,204,44,206,107,147,89,231,101,39,224,173,95,
+145,31,195,44,57,167,179,87,168,56,234,11,116,216,211,176,190,241,64,1,180,134,3,188,219,93,188,239,16,47,46,144,183,140,
+156,158,115,79,160,123,247,9,120,151,156,128,247,233,99,230,199,255,174,63,1,239,214,60,158,45,45,71,244,181,21,188,179,
+217,14,165,176,195,157,210,14,56,111,204,18,26,182,120,132,150,180,162,73,15,173,80,239,100,170,140,122,170,54,124,98,
+184,221,135,85,253,50,106,224,143,237,94,172,215,52,73,227,240,71,161,75,28,37,88,210,139,231,18,72,184,37,141,123,43,52,
+191,132,252,6,238,96,194,111,52,138,34,17,124,155,103,51,19,117,53,114,124,166,204,23,28,210,103,231,94,216,220,52,87,
+151,13,250,245,10,149,59,86,153,24,139,25,222,0,221,198,108,98,26,247,206,228,88,39,226,222,58,121,10,249,230,119,244,
+205,0,183,150,163,180,81,105,125,22,254,220,138,200,201,103,146,137,189,228,202,158,12,126,179,4,168,196,242,5,255,94,
+132,82,163,161,206,251,57,104,217,172,125,73,32,223,205,248,239,187,43,84,125,216,235,149,107,109,104,111,19,43,51,231,
+178,26,141,140,155,94,245,214,78,157,203,106,15,58,87,242,253,14,115,16,152,131,8,183,249,56,39,167,112,27,230,130,252,
+142,159,195,243,160,33,144,70,196,245,11,246,127,191,104,36,213,103,169,236,171,12,251,70,157,193,190,149,234,125,166,
+207,154,240,54,192,114,195,225,50,26,222,84,6,139,148,81,165,249,22,180,148,227,230,227,49,106,140,114,26,222,80,14,62,
+110,154,56,87,42,13,236,40,115,187,220,201,243,176,214,117,198,66,248,192,65,142,229,27,102,226,105,62,158,62,45,159,42,
+166,212,85,78,121,154,46,245,197,189,115,216,242,84,107,250,140,5,243,220,124,15,199,105,155,68,28,59,108,24,88,91,41,
+211,54,151,54,88,193,31,187,244,25,115,250,74,149,43,134,71,42,208,254,115,188,51,44,206,31,44,114,155,157,102,155,204,
+31,44,57,110,63,133,17,176,106,76,175,180,169,153,91,97,211,183,160,99,232,247,71,245,10,155,149,182,90,225,161,236,10,
+255,226,168,94,97,51,30,248,4,206,72,214,252,228,209,18,195,103,4,255,225,200,156,117,43,213,187,234,112,95,37,244,223,
+192,243,48,146,222,219,53,189,5,148,91,205,146,227,49,164,230,86,10,247,67,54,112,189,28,75,13,214,48,238,253,136,28,1,
+247,50,36,229,95,56,90,34,124,34,248,15,142,51,202,123,46,92,169,222,123,87,217,13,84,109,135,211,60,235,107,120,182,214,
+236,190,62,142,243,105,101,7,204,217,33,100,38,229,64,93,167,53,67,246,236,128,246,26,211,79,135,17,239,194,184,194,212,
+88,202,26,124,158,175,177,12,33,68,240,247,126,187,196,40,178,252,118,163,197,126,209,34,123,109,37,151,244,19,131,238,
+91,169,238,62,170,255,9,111,140,117,90,195,163,51,200,111,215,153,106,181,77,140,35,222,118,30,237,194,220,59,141,82,204,
+113,2,123,128,51,139,171,112,235,58,12,7,207,212,6,223,80,61,241,28,76,158,67,47,103,137,215,194,59,61,86,141,133,44,81,
+142,129,163,65,67,118,255,240,205,88,237,148,63,106,155,87,25,24,139,17,238,85,51,103,11,242,188,161,79,116,138,10,57,
+111,83,90,220,47,111,156,53,66,205,89,230,92,222,26,153,115,117,156,113,228,168,223,224,88,226,163,224,123,42,154,168,
+125,210,40,123,10,18,231,130,220,175,99,16,209,141,251,116,163,79,119,167,183,140,124,115,121,54,55,20,121,176,94,107,41,
+252,240,76,204,224,11,200,143,185,119,39,44,225,119,151,144,111,102,240,213,13,237,179,104,34,16,199,125,212,227,236,116,
+46,162,240,46,140,197,129,168,231,232,128,84,39,124,113,67,123,53,218,206,66,46,204,118,43,64,6,31,32,231,195,214,11,187,
+28,242,77,39,191,107,129,246,58,171,3,122,62,137,53,139,183,253,59,181,91,126,119,240,41,140,216,221,40,84,251,74,110,
+239,234,116,189,116,180,14,103,220,196,210,21,244,80,103,240,121,191,27,51,123,144,228,157,186,31,51,226,239,56,84,246,
+178,66,250,22,123,241,126,204,141,223,253,249,28,225,20,118,90,224,20,248,122,149,133,121,90,225,212,116,216,236,243,124,
+2,165,148,127,155,210,202,183,203,12,144,173,109,75,127,45,151,214,182,165,63,183,42,89,248,119,169,244,58,246,239,45,
+144,15,190,84,100,250,173,70,211,103,14,163,222,15,221,51,143,213,152,183,131,43,243,118,240,28,146,178,208,56,91,106,
+236,64,187,79,201,118,53,102,29,228,214,178,246,223,13,239,154,9,185,19,69,131,186,140,46,229,11,166,160,78,68,3,166,53,
+166,37,79,29,51,239,201,33,159,50,17,163,130,117,255,82,233,253,12,202,156,141,112,214,196,247,232,185,176,223,124,82,
+119,32,129,155,165,186,11,24,244,237,65,229,159,190,64,149,128,21,225,109,87,242,72,140,69,70,0,43,184,13,235,192,235,
+140,27,138,215,207,39,223,188,233,210,115,250,228,205,199,137,88,29,252,139,138,216,19,129,237,90,214,98,238,31,252,194,
+39,115,38,142,73,179,208,99,128,248,62,207,125,87,203,236,129,253,246,233,65,149,87,251,106,217,59,125,38,223,99,156,114,
+39,26,242,198,198,239,106,130,239,229,242,197,231,7,149,111,248,2,19,129,115,229,141,171,36,91,119,36,83,231,205,213,101,
+250,121,53,211,79,201,7,247,227,211,54,249,7,228,183,18,199,179,18,218,232,170,162,78,215,90,220,111,212,110,114,33,159,
+9,23,206,160,218,7,125,46,113,249,130,31,174,194,9,80,88,224,51,244,46,117,113,155,13,69,179,168,227,240,34,172,2,191,
+233,246,20,213,254,198,231,90,112,164,157,150,91,69,174,184,215,207,246,117,116,236,154,131,250,106,185,234,178,205,180,
+106,234,248,115,21,120,85,188,250,54,175,3,252,21,123,164,56,115,174,187,42,11,222,147,81,255,32,234,107,236,118,222,181,
+182,175,49,120,207,97,151,75,4,159,58,236,42,16,226,242,224,127,250,221,149,72,84,131,127,46,114,97,191,185,56,227,219,
+128,214,31,201,198,166,45,176,133,41,215,37,182,74,125,247,232,43,245,89,62,17,126,12,179,218,35,150,47,184,108,30,45,39,
+167,131,71,143,243,164,160,246,11,98,96,193,173,245,180,220,40,176,121,244,56,37,10,59,126,57,147,58,158,155,78,117,246,
+156,204,169,239,232,88,82,40,103,132,122,107,98,233,199,40,218,239,28,42,49,69,127,240,47,135,17,179,15,219,182,8,254,
+250,176,141,128,191,41,248,164,207,12,254,89,221,221,121,28,95,90,165,214,135,207,58,206,179,124,237,29,94,19,126,27,198,
+121,238,19,241,165,65,106,243,5,223,225,247,202,134,204,151,238,130,252,77,28,223,138,176,34,69,105,49,147,119,175,139,
+199,225,194,56,124,78,95,1,223,202,194,158,74,220,232,246,115,236,47,102,159,125,133,220,158,69,158,115,100,47,144,243,
+248,122,58,94,105,67,212,99,235,186,200,227,169,44,86,103,234,43,210,186,56,83,109,117,131,70,164,176,148,62,229,251,33,
+180,237,244,116,83,142,119,61,120,30,103,141,211,202,227,221,8,94,93,97,189,228,184,176,23,92,56,99,38,206,60,135,10,107,
+143,27,27,34,228,43,133,117,197,93,56,151,14,97,214,157,5,109,84,234,121,202,121,209,67,182,151,243,67,236,236,165,119,
+208,119,188,254,162,226,204,120,60,172,131,119,231,67,228,113,119,186,225,145,119,33,211,122,168,6,214,116,34,110,187,
+100,156,112,202,248,224,164,52,206,151,82,242,23,5,159,43,242,248,139,26,61,165,158,81,10,62,93,228,9,190,205,123,99,18,
+30,193,223,101,85,235,239,84,84,222,118,80,92,216,124,163,56,40,56,199,51,100,94,221,182,90,125,231,85,229,132,205,157,
+124,54,185,113,122,179,205,113,118,27,225,107,213,124,12,94,7,216,232,50,172,67,167,3,209,245,90,196,162,192,103,233,54,
+60,47,114,52,208,84,185,235,33,231,113,212,56,56,234,70,228,185,63,181,254,70,212,179,134,58,151,159,38,218,230,209,33,
+147,79,231,203,200,239,44,38,61,2,139,87,143,243,136,74,151,90,189,203,100,92,199,234,137,42,105,45,33,243,82,73,29,108,
+177,24,86,183,211,134,111,13,169,24,218,105,186,116,84,85,209,148,163,168,155,130,79,22,57,130,79,20,57,252,206,70,135,
+58,99,199,97,247,9,29,63,119,203,189,132,8,122,97,115,122,23,114,132,66,25,53,4,237,131,141,62,204,54,194,76,171,165,109,
+220,228,182,249,60,61,75,190,163,89,147,141,213,97,129,222,133,69,190,50,223,244,14,36,57,62,43,124,141,58,97,108,121,86,
+221,174,169,60,179,176,162,175,30,213,103,150,60,97,54,52,206,34,173,221,213,177,255,213,163,178,45,172,217,32,61,87,157,
+56,182,44,171,19,7,209,187,44,248,227,78,225,210,183,22,117,99,9,95,195,107,115,53,106,253,14,228,221,182,223,209,104,
+171,185,158,37,227,196,230,236,251,171,71,86,79,189,251,241,61,248,71,171,179,241,118,253,94,154,23,246,200,236,195,144,
+117,63,93,173,238,156,252,190,204,103,76,108,216,75,253,94,174,47,144,251,29,247,154,213,234,183,12,136,59,6,175,141,75,
+174,17,191,153,230,44,208,164,105,134,58,209,249,61,159,19,22,236,180,113,210,88,193,183,112,95,177,26,141,112,114,58,
+233,86,182,207,193,187,103,131,35,156,44,3,111,134,204,100,125,211,235,28,179,225,47,67,180,203,25,95,138,19,49,234,65,
+150,131,21,207,107,39,91,9,191,37,230,5,31,231,59,234,126,10,254,77,189,151,116,99,166,252,93,231,169,210,6,21,217,24,
+229,8,169,123,126,38,38,53,34,38,169,59,167,178,210,180,144,178,71,216,59,83,238,126,126,127,164,252,194,162,138,144,250,
+189,5,207,209,45,119,6,71,55,181,147,194,215,170,168,114,155,228,227,206,114,173,138,40,183,201,181,134,127,26,106,213,
+12,185,106,134,174,191,17,245,124,226,222,33,189,25,153,172,119,43,123,138,204,94,236,236,46,163,236,46,98,207,135,44,
+172,11,223,235,159,114,195,112,196,3,147,216,21,42,123,240,59,131,247,40,175,47,18,149,14,220,154,92,165,242,214,116,25,
+113,188,230,179,100,25,172,178,86,223,181,207,208,241,226,76,157,255,26,52,116,97,243,166,161,236,59,154,177,80,254,59,
+154,179,196,44,58,219,168,162,179,204,106,249,246,73,221,48,63,26,82,239,203,125,98,17,98,238,52,228,31,87,200,76,138,41,
+124,216,236,152,247,246,81,231,250,26,228,230,27,250,170,105,3,218,118,204,123,245,232,198,190,42,218,104,86,161,124,228,
+232,134,190,89,224,227,196,157,247,252,81,95,73,240,183,153,247,112,68,159,12,169,239,10,234,112,55,216,208,59,139,158,
+246,237,3,173,166,82,115,31,45,104,47,149,229,187,107,39,2,31,231,24,235,189,140,87,223,216,216,139,243,30,59,197,247,
+198,55,106,167,137,82,113,33,5,95,131,214,191,169,219,48,209,23,245,58,251,96,179,26,192,143,185,100,222,5,29,10,169,124,
+71,205,183,88,199,82,131,190,18,210,239,161,68,238,13,169,73,37,66,191,19,69,206,244,238,209,42,163,17,247,131,173,194,
+79,139,4,178,106,81,131,53,235,64,134,30,3,199,47,249,193,35,153,156,191,68,234,16,250,123,12,33,179,43,83,247,245,88,72,
+125,127,82,73,234,62,108,200,222,44,249,93,109,21,242,180,106,177,21,245,139,136,51,247,6,244,49,138,182,60,19,191,228,7,
+95,205,220,191,139,116,31,213,217,62,170,228,111,79,229,221,95,219,130,231,250,81,159,250,254,231,82,208,43,179,191,110,
+85,255,14,234,231,140,60,255,182,233,22,240,238,58,134,63,168,249,247,31,211,254,209,99,158,159,242,169,62,51,191,41,226,
+119,135,207,250,212,111,122,94,247,169,239,73,254,234,83,191,91,56,226,83,191,105,98,189,219,88,184,84,253,94,5,14,77,
+222,210,169,122,171,142,121,150,223,149,104,58,67,83,254,237,140,33,105,187,236,127,26,245,200,88,199,117,85,121,115,17,
+164,114,25,67,63,153,154,246,80,238,119,81,153,239,118,12,73,219,228,243,28,205,239,207,202,121,116,91,245,11,15,213,215,
+233,217,246,66,219,65,97,134,140,89,220,46,99,159,204,239,171,20,207,161,121,14,201,83,101,103,86,87,129,166,94,77,125,
+90,198,167,245,10,101,62,202,124,167,101,72,58,139,50,223,177,177,44,127,199,59,71,247,203,223,171,206,209,123,176,1,255,
+89,154,122,117,92,88,164,219,44,210,119,19,150,235,214,123,168,71,215,157,174,199,111,101,203,114,214,65,50,131,131,184,
+203,204,165,250,182,142,190,206,182,129,5,189,205,3,203,6,58,155,231,247,117,116,52,247,158,182,160,189,121,97,255,64,
+199,252,129,254,249,253,167,181,193,180,200,211,186,71,198,98,241,88,186,135,28,221,138,26,61,93,100,245,116,205,221,196,
+159,40,123,251,198,38,163,233,68,34,189,99,77,36,30,217,30,77,210,226,99,57,129,104,50,153,72,46,14,140,36,38,199,70,3,
+241,68,58,176,61,154,14,100,165,2,161,129,64,106,36,18,143,163,237,233,255,92,219,209,232,182,200,228,88,190,142,200,104,
+100,34,13,5,149,203,38,199,199,247,102,249,43,34,233,116,127,100,108,108,107,100,4,23,155,65,50,6,67,100,14,134,66,84,51,
+184,46,48,176,103,36,58,145,142,37,226,129,221,59,98,99,209,192,200,88,34,21,139,111,15,76,36,146,105,106,24,92,247,126,
+245,227,177,209,24,134,176,43,54,18,37,177,138,172,85,27,251,7,168,100,213,228,72,116,13,106,6,227,19,147,233,245,172,
+194,151,97,173,155,76,103,120,158,12,79,62,149,101,158,134,38,39,184,215,150,157,145,93,17,18,33,50,66,131,100,134,6,229,
+7,122,192,7,50,10,12,219,12,225,195,10,133,54,135,168,62,20,137,143,38,19,177,209,214,173,153,217,182,102,231,221,171,
+204,209,69,179,63,72,106,153,156,67,23,213,126,144,16,155,176,139,230,158,76,36,99,229,46,106,61,169,232,142,72,50,50,
+130,225,197,82,233,216,72,23,157,122,178,6,203,162,169,145,100,108,34,157,72,158,120,32,99,209,156,124,40,58,164,124,233,
+196,115,135,40,215,231,70,251,62,250,88,104,121,108,12,131,172,239,155,140,141,141,178,190,19,153,105,138,232,7,138,108,
+136,166,224,178,39,158,173,22,25,138,166,211,112,176,84,174,203,15,152,66,70,184,139,102,102,133,70,18,241,116,52,158,
+110,237,103,186,7,157,213,100,171,198,163,163,177,72,43,187,110,43,59,92,102,233,155,62,88,96,48,190,45,81,207,174,202,
+133,252,225,188,175,116,23,53,124,176,208,80,58,146,158,196,168,235,222,79,44,187,129,242,93,233,24,25,29,29,234,149,202,
+220,106,158,118,178,6,235,226,170,201,186,137,104,60,58,26,130,7,70,165,175,4,78,210,240,3,230,158,219,221,249,235,127,
+140,208,134,232,72,52,182,139,245,148,102,69,18,169,214,190,201,248,232,24,150,161,44,159,185,50,194,76,136,150,231,115,
+215,71,146,35,209,177,141,147,177,209,46,242,101,43,38,211,177,177,214,80,98,251,113,188,245,145,88,50,175,175,44,175,
+139,54,30,207,236,62,137,155,156,52,62,224,32,104,11,141,36,198,91,147,137,177,88,235,78,68,181,214,99,66,91,253,177,145,
+189,139,218,79,210,226,184,136,218,69,243,254,201,38,249,107,210,244,79,182,81,210,161,147,72,231,172,146,245,193,247,61,
+113,186,104,217,191,172,45,199,97,23,13,71,82,231,158,220,80,199,105,57,249,164,51,19,94,31,73,239,224,48,241,129,210,
+188,89,71,35,99,187,98,231,182,34,180,38,176,129,113,40,182,14,196,245,129,216,63,22,73,97,67,251,79,32,51,200,145,88,
+215,215,158,160,126,77,116,124,171,22,136,66,164,250,4,34,67,177,237,113,68,140,36,118,73,229,9,170,195,59,146,137,221,
+104,58,61,196,103,103,107,44,209,154,119,112,119,81,137,98,143,69,226,219,91,245,56,74,243,88,131,136,147,210,94,190,60,
+230,186,173,59,163,35,233,169,188,161,116,18,51,205,118,35,121,178,235,200,86,222,191,85,121,236,100,116,91,235,153,209,
+200,185,27,162,219,162,201,104,28,73,66,245,7,213,242,230,151,213,114,55,246,38,147,145,189,28,150,50,61,77,229,242,121,
+117,2,118,247,241,35,237,201,142,63,39,154,154,202,91,25,73,97,51,78,100,12,146,207,59,94,16,199,205,113,130,224,77,29,
+253,32,14,193,136,60,166,167,229,113,229,116,188,199,48,186,168,227,24,78,247,73,207,206,158,169,122,101,247,37,121,140,
+112,108,156,215,114,250,177,44,181,139,74,142,219,38,212,123,28,235,196,249,102,222,65,16,72,237,197,153,49,30,72,69,147,
+50,1,244,29,191,97,201,147,191,187,168,33,255,180,110,233,239,13,133,250,122,251,87,111,9,159,181,126,96,203,154,222,112,
+255,202,45,161,117,67,97,18,155,200,216,132,132,111,19,82,84,107,211,224,230,65,114,108,90,133,20,112,21,216,72,252,54,
+33,35,180,54,113,74,104,111,146,92,112,228,7,75,135,84,37,202,54,127,174,82,4,105,228,166,205,36,144,57,66,153,129,148,
+209,24,238,163,186,225,147,103,49,205,195,255,82,86,80,255,79,136,99,219,13,159,96,139,77,97,102,246,88,97,100,100,36,
+154,74,45,31,139,108,79,145,27,153,226,100,100,76,166,203,206,76,150,111,70,70,71,249,105,52,9,57,242,232,222,7,227,163,
+209,61,104,173,158,100,11,119,100,98,66,39,67,228,136,164,148,39,110,61,38,75,166,202,44,39,52,32,195,158,90,219,141,27,
+7,151,145,111,235,113,153,101,158,134,140,35,149,229,56,217,105,167,242,228,182,232,235,66,193,214,116,175,30,181,107,
+107,90,201,65,76,151,82,124,22,195,4,228,216,154,230,115,132,236,173,156,8,146,103,68,31,40,225,189,19,81,114,96,20,200,
+4,168,120,100,74,30,77,246,200,88,52,146,100,146,72,69,201,137,92,48,14,27,83,161,46,72,133,46,206,16,35,177,120,74,178,
+101,105,117,116,175,20,150,54,242,232,66,56,177,17,58,108,236,130,120,154,196,40,185,71,179,41,56,57,244,92,92,138,194,
+70,153,210,40,21,101,74,74,65,225,104,214,1,82,153,186,140,201,220,234,81,230,41,5,163,177,36,134,136,136,13,118,44,149,
+25,186,35,122,30,150,62,69,5,114,83,246,39,70,97,192,104,38,182,83,203,182,8,110,101,163,129,116,34,48,146,140,70,210,
+209,192,214,201,49,125,29,84,186,3,219,146,137,241,64,198,77,92,219,98,241,200,88,236,252,40,213,162,52,154,91,168,229,
+137,100,222,197,73,9,215,176,72,102,67,159,72,192,222,22,75,194,153,60,219,96,162,209,204,130,187,185,67,229,198,100,109,
+103,131,23,240,167,50,134,137,72,66,110,124,100,84,84,114,89,57,235,113,151,232,89,185,186,227,195,214,116,174,156,152,
+24,139,141,200,51,48,227,224,165,96,31,55,206,138,124,102,126,6,46,181,28,127,109,34,23,216,242,164,164,18,148,150,169,
+155,118,102,167,20,72,150,92,254,226,108,81,45,175,59,251,156,34,39,202,210,223,230,162,176,114,114,156,35,56,246,46,142,
+74,101,156,19,26,20,162,240,37,73,70,165,6,214,75,85,178,160,147,185,181,145,113,94,45,78,79,212,102,159,137,90,126,58,
+206,84,41,242,31,95,37,245,100,234,107,142,175,87,89,99,70,128,117,51,247,216,145,162,106,134,174,90,150,117,97,140,74,
+143,154,199,72,213,40,228,114,208,227,134,93,136,234,76,5,21,101,30,38,57,23,162,114,253,200,103,199,148,70,46,93,145,82,
+45,146,137,137,104,50,29,195,104,166,225,113,67,116,60,145,142,102,2,10,24,67,242,152,210,145,76,14,76,6,143,162,29,242,
+114,161,175,35,228,220,17,73,173,101,223,113,161,176,67,238,48,107,71,2,126,93,192,159,202,111,69,140,204,216,232,30,178,
+99,114,24,86,140,151,197,142,201,69,47,136,101,223,118,20,198,82,89,75,241,67,191,218,196,81,88,37,150,26,24,159,72,239,
+229,130,92,2,174,206,189,38,113,197,116,214,64,46,78,62,87,202,238,119,102,167,237,217,153,255,198,196,60,23,225,202,129,
+15,206,71,220,99,9,68,70,37,230,28,215,155,195,226,211,135,220,227,217,229,161,146,241,227,118,80,241,248,148,213,163,
+194,241,60,207,49,198,199,201,28,79,109,199,71,122,146,172,56,47,146,205,159,136,33,241,232,110,222,62,48,83,156,205,102,
+38,182,238,36,71,98,219,182,20,134,227,75,196,251,34,233,145,29,185,140,37,69,229,216,158,83,194,52,158,226,219,97,148,
+178,99,43,120,135,208,244,99,185,103,38,97,29,169,69,153,19,219,93,246,175,212,144,55,17,207,189,28,145,26,74,242,57,170,
+117,81,66,95,122,225,192,232,185,56,49,229,14,204,125,230,63,47,139,142,69,246,130,61,45,195,102,215,218,149,47,167,226,
+71,102,34,206,68,124,249,216,100,106,7,121,18,241,53,233,201,12,27,35,227,241,40,191,220,144,74,197,168,130,57,99,49,142,
+2,114,92,253,137,241,9,196,107,200,162,165,76,63,100,60,207,60,41,11,194,184,200,157,226,210,94,218,153,83,203,248,132,
+192,93,26,178,165,216,4,241,99,194,27,185,153,169,203,69,92,206,249,154,159,31,167,220,41,207,140,165,119,228,246,88,77,
+166,62,183,121,167,10,204,204,8,28,95,85,204,85,121,175,250,10,248,89,109,88,87,34,147,26,22,100,74,8,120,24,49,159,131,
+137,92,19,59,177,155,67,112,233,4,124,242,216,89,85,158,128,57,148,142,78,132,119,39,168,124,74,93,46,50,145,53,193,25,
+168,147,47,113,131,216,194,5,178,160,162,201,132,206,223,84,73,70,162,130,76,41,165,152,50,125,45,202,148,84,52,144,21,
+50,148,20,103,74,225,196,114,132,6,50,121,103,207,72,70,183,243,75,149,228,212,55,51,228,72,74,47,34,183,162,42,98,168,
+178,202,212,102,38,113,216,71,83,233,156,159,175,79,198,18,240,147,189,220,86,186,130,51,169,55,21,24,233,93,145,49,178,
+146,236,87,102,114,50,78,37,169,108,254,170,95,158,81,105,42,47,239,206,48,157,153,55,205,174,212,200,142,232,40,18,6,
+114,164,162,72,56,70,201,74,177,159,85,242,167,122,197,187,35,50,26,24,92,23,200,101,28,46,174,99,235,210,52,236,247,254,
+252,164,172,16,12,246,218,53,28,66,139,249,65,231,144,147,177,81,84,238,224,235,4,246,13,38,106,165,56,5,177,83,242,161,
+64,18,110,72,69,170,152,78,76,200,71,71,74,157,210,86,10,28,244,156,225,23,192,105,50,139,155,222,17,131,49,248,179,190,
+13,21,184,234,160,209,248,4,57,211,9,121,223,163,233,147,241,19,185,210,204,99,216,121,14,83,49,25,127,159,21,180,97,241,
+73,156,24,146,172,219,70,93,226,102,225,44,54,222,160,174,61,198,167,47,236,106,166,144,184,28,12,90,46,201,126,147,174,
+17,22,255,191,111,197,116,171,16,100,89,223,52,22,143,56,139,143,154,116,191,81,180,217,38,186,92,136,175,179,252,39,133,
+241,121,113,191,225,44,62,55,100,210,237,194,106,62,104,211,146,61,33,7,181,92,123,62,196,118,75,117,7,164,186,150,61,1,
+58,67,252,192,112,54,65,244,83,194,108,49,252,187,141,109,213,33,83,92,37,10,90,174,104,217,108,26,223,54,10,175,219,108,
+154,223,49,138,87,111,94,242,200,224,122,219,176,77,186,84,72,37,215,210,189,194,122,87,92,38,190,102,60,143,199,238,102,
+252,235,166,223,10,114,86,135,182,172,222,219,220,108,236,170,246,155,244,13,209,66,15,129,89,220,221,77,143,49,165,183,
+229,231,27,194,250,187,184,196,184,69,252,15,6,219,124,43,253,93,152,234,25,117,79,176,196,35,155,151,208,207,50,133,3,
+134,169,186,82,29,209,125,198,9,186,249,140,161,186,57,200,148,14,25,89,133,107,182,24,23,84,215,40,161,27,101,229,205,
+242,243,77,195,160,119,81,223,220,221,76,151,154,198,3,226,122,238,253,98,211,228,210,19,232,139,46,201,43,191,107,160,
+252,132,177,15,229,37,171,175,163,143,115,213,109,170,234,178,188,242,229,92,126,79,149,15,112,249,91,134,44,239,231,14,
+100,233,162,108,233,179,166,69,119,137,219,197,183,208,239,102,158,215,245,38,198,181,164,27,11,242,128,113,122,104,243,
+112,207,218,115,122,154,109,50,246,118,57,136,30,144,149,161,152,41,254,191,40,221,251,136,92,196,230,115,108,178,197,
+172,154,69,244,35,174,165,39,229,231,79,165,228,254,61,254,42,250,157,201,158,85,109,220,96,117,25,47,94,208,212,252,104,
+200,40,222,13,155,237,217,179,103,111,12,238,35,250,149,190,197,61,182,160,95,216,114,105,133,207,107,25,111,139,154,222,
+253,249,93,61,198,61,217,6,189,164,133,102,120,77,58,36,218,32,115,147,209,112,136,43,233,57,39,247,123,192,52,126,47,
+250,177,40,47,8,33,156,54,153,2,133,71,44,147,53,10,195,22,14,18,133,54,57,68,141,109,54,75,141,119,88,226,110,182,106,
+172,102,216,50,191,98,44,216,140,182,47,162,173,101,26,95,54,26,155,119,25,23,236,134,122,248,94,191,131,28,134,195,196,
+136,143,138,1,122,205,41,238,192,64,150,8,223,52,139,88,249,115,1,155,102,213,156,66,15,88,230,139,226,57,241,10,87,118,
+155,5,95,55,68,200,52,161,169,117,191,209,208,100,132,171,109,211,46,88,224,48,29,5,59,45,231,87,208,174,101,181,233,184,
+93,148,180,192,69,222,16,179,91,118,154,198,205,198,204,102,12,149,70,108,3,91,231,182,118,116,111,218,14,219,105,156,
+135,133,64,75,135,195,185,211,116,29,17,211,165,148,48,29,100,120,170,33,4,17,219,85,67,239,194,254,213,195,75,134,197,
+140,105,166,128,141,254,203,22,139,187,107,248,201,248,147,104,132,121,109,163,133,141,140,29,90,211,27,218,115,254,229,
+54,13,119,211,95,45,54,108,245,146,157,177,133,198,158,234,253,237,157,177,150,26,250,155,45,94,100,239,48,137,77,17,162,
+27,45,233,191,242,243,18,199,212,186,59,156,226,16,236,184,215,116,98,202,75,238,149,139,231,55,141,55,133,184,237,54,
+211,250,178,225,195,60,239,54,4,166,107,222,105,136,157,171,77,251,46,99,94,76,184,109,187,197,97,55,240,82,96,150,150,
+109,219,14,99,164,218,118,46,112,8,88,219,226,201,26,23,116,161,194,97,148,175,98,41,246,54,167,113,183,241,186,112,54,
+249,77,113,135,33,16,81,208,215,109,188,94,190,157,205,7,62,201,203,37,4,175,150,177,187,186,214,216,221,180,200,54,12,
+239,42,68,160,79,58,48,42,103,241,5,85,244,176,67,60,37,247,146,233,66,91,12,237,144,16,126,211,249,128,176,107,204,130,
+151,196,233,207,239,245,63,98,218,28,168,86,155,214,213,98,222,109,194,101,59,155,49,150,234,221,60,200,123,204,66,248,
+221,189,162,196,107,23,250,141,209,106,12,212,190,213,114,191,195,235,185,179,165,251,244,165,182,123,161,154,12,175,137,
+93,176,136,231,225,112,57,10,28,133,198,100,151,93,200,242,244,174,30,3,92,22,189,63,122,224,40,111,88,251,90,163,230,22,
+219,244,35,24,162,103,140,237,17,83,168,97,16,134,177,223,178,101,31,33,135,217,210,221,39,29,195,14,181,74,227,89,116,
+141,154,221,146,3,22,105,199,130,215,151,172,49,133,156,149,117,159,113,250,18,63,111,28,118,131,3,162,100,154,191,14,
+158,208,221,51,140,230,176,188,191,10,6,122,208,161,98,195,31,45,131,157,24,165,63,89,114,153,233,74,27,195,112,54,169,
+97,24,51,118,24,227,213,75,98,70,113,19,166,115,171,240,122,101,39,45,215,183,204,164,67,82,176,56,70,111,217,210,33,54,
+211,87,212,158,53,130,59,140,225,234,37,7,100,44,178,209,241,217,182,1,47,128,29,121,114,176,64,55,142,139,213,150,245,
+78,110,236,231,247,217,38,124,28,134,132,15,192,243,97,181,26,83,112,36,125,194,48,239,20,95,21,87,168,224,223,66,207,27,
+226,98,195,89,221,49,243,190,102,147,190,100,52,210,47,57,200,98,115,154,244,59,209,246,13,155,186,17,195,110,118,97,103,
+52,211,28,118,223,207,186,196,151,224,239,8,118,251,133,105,120,154,224,42,231,46,89,189,7,222,117,169,172,41,222,223,96,
+156,95,173,56,70,80,252,220,168,104,52,230,26,151,10,171,224,61,81,94,104,156,10,78,149,85,254,225,114,187,124,168,220,
+165,30,237,114,81,254,17,48,154,202,11,164,104,125,129,3,178,21,185,102,51,140,38,150,19,21,243,114,188,114,165,188,65,
+113,12,112,138,115,197,29,57,185,109,198,41,220,214,168,168,175,152,157,233,110,88,246,94,159,235,159,25,103,148,47,207,
+48,156,229,103,130,209,3,180,65,202,157,97,178,212,202,242,141,248,92,150,97,186,48,244,161,114,51,43,171,21,56,202,141,
+60,150,28,139,27,99,137,169,177,56,42,26,42,230,84,212,86,4,42,106,42,234,68,185,37,76,81,96,86,26,248,39,140,142,125,
+251,172,91,230,204,23,207,204,17,226,239,192,161,70,33,126,5,28,12,10,113,23,112,104,174,16,111,2,247,240,143,174,237,
+181,23,185,72,28,3,108,98,151,67,255,230,70,208,146,139,246,89,135,79,53,47,54,168,71,28,104,18,214,43,77,134,184,178,89,
+136,155,128,123,128,103,129,55,129,187,91,16,241,29,133,234,215,242,104,243,74,203,74,113,85,171,176,222,108,21,226,234,
+54,244,11,188,2,236,107,39,67,184,139,13,113,85,96,8,98,87,183,135,197,61,237,66,252,0,248,21,240,58,112,203,60,33,238,7,
+126,12,60,11,188,9,28,232,32,75,216,94,76,80,112,211,115,208,244,134,142,45,226,209,14,33,158,154,47,196,51,11,160,29,
+184,122,33,57,157,165,101,74,76,255,55,10,217,103,23,26,198,193,78,97,220,180,200,48,14,44,6,186,76,227,234,238,66,227,
+192,146,168,245,66,143,41,238,233,53,196,221,125,134,120,182,15,86,3,61,216,143,33,1,119,15,96,40,203,133,56,2,252,106,
+16,163,15,9,113,120,13,250,2,14,172,53,196,161,181,224,175,67,27,224,224,122,88,192,152,37,248,223,199,208,231,85,27,46,
+20,247,108,16,226,170,33,254,13,158,223,45,220,23,137,3,251,172,23,134,4,42,247,133,69,193,65,224,210,141,148,251,251,69,
+249,191,225,201,252,109,62,254,109,74,230,239,243,241,239,82,50,127,163,143,127,151,18,32,245,119,250,248,183,57,153,191,
+213,231,160,220,223,235,51,189,234,183,52,242,119,83,1,245,183,154,234,75,33,19,80,50,252,255,180,11,175,250,253,61,255,
+127,232,70,64,245,203,127,223,207,212,242,252,255,75,91,1,245,187,27,254,127,170,237,128,26,31,255,127,240,164,245,200,
+31,228,121,21,159,255,174,224,255,1,51,160,178,16,144,80,0,0};
+
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
+ STATICMETHOD (getAndroidMidiDeviceManager, "getAndroidMidiDeviceManager", "(Landroid/content/Context;)Lcom/roli/juce/JuceMidiSupport$MidiDeviceManager;") \
+ STATICMETHOD (getAndroidBluetoothManager, "getAndroidBluetoothManager", "(Landroid/content/Context;)Lcom/roli/juce/JuceMidiSupport$BluetoothManager;")
+
+DECLARE_JNI_CLASS_WITH_BYTECODE (JuceMidiSupport, "com/roli/juce/JuceMidiSupport", 23, javaMidiByteCode, sizeof (javaMidiByteCode))
+#undef JNI_CLASS_MEMBERS
+
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
METHOD (getJuceAndroidMidiInputDevices, "getJuceAndroidMidiInputDevices", "()[Ljava/lang/String;") \
METHOD (getJuceAndroidMidiOutputDevices, "getJuceAndroidMidiOutputDevices", "()[Ljava/lang/String;") \
- METHOD (openMidiInputPortWithJuceIndex, "openMidiInputPortWithJuceIndex", "(IJ)L" JUCE_ANDROID_ACTIVITY_CLASSPATH "$JuceMidiPort;") \
- METHOD (openMidiOutputPortWithJuceIndex, "openMidiOutputPortWithJuceIndex", "(I)L" JUCE_ANDROID_ACTIVITY_CLASSPATH "$JuceMidiPort;") \
+ METHOD (openMidiInputPortWithJuceIndex, "openMidiInputPortWithJuceIndex", "(IJ)Lcom/roli/juce/JuceMidiSupport$JuceMidiPort;") \
+ METHOD (openMidiOutputPortWithJuceIndex, "openMidiOutputPortWithJuceIndex", "(I)Lcom/roli/juce/JuceMidiSupport$JuceMidiPort;") \
METHOD (getInputPortNameForJuceIndex, "getInputPortNameForJuceIndex", "(I)Ljava/lang/String;") \
METHOD (getOutputPortNameForJuceIndex, "getOutputPortNameForJuceIndex", "(I)Ljava/lang/String;")
- DECLARE_JNI_CLASS (MidiDeviceManager, JUCE_ANDROID_ACTIVITY_CLASSPATH "$MidiDeviceManager")
+
+DECLARE_JNI_CLASS_WITH_MIN_SDK (MidiDeviceManager, "com/roli/juce/JuceMidiSupport$MidiDeviceManager", 23)
#undef JNI_CLASS_MEMBERS
-#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD) \
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
METHOD (start, "start", "()V" )\
METHOD (stop, "stop", "()V") \
METHOD (close, "close", "()V") \
METHOD (sendMidi, "sendMidi", "([BII)V")
- DECLARE_JNI_CLASS (JuceMidiPort, JUCE_ANDROID_ACTIVITY_CLASSPATH "$JuceMidiPort")
-#undef JNI_CLASS_MEMBERS
+DECLARE_JNI_CLASS_WITH_MIN_SDK (JuceMidiPort, "com/roli/juce/JuceMidiSupport$JuceMidiPort", 23)
+#undef JNI_CLASS_MEMBERS
//==============================================================================
class AndroidMidiInput
@@ -51,10 +373,10 @@ public:
: juceMidiInput (midiInput),
callback (midiInputCallback),
midiConcatenator (2048),
- javaMidiDevice (getEnv()->CallObjectMethod (deviceManager,
- MidiDeviceManager.openMidiInputPortWithJuceIndex,
- (jint) portIdx,
- (jlong) this))
+ javaMidiDevice (LocalRef(getEnv()->CallObjectMethod (deviceManager,
+ MidiDeviceManager.openMidiInputPortWithJuceIndex,
+ (jint) portIdx,
+ (jlong) this)))
{
}
@@ -86,10 +408,12 @@ public:
callback = nullptr;
}
- void receive (jbyteArray byteArray, jlong offset, jint len, jlong timestamp)
+ void handleMidi (jbyteArray byteArray, jlong offset, jint len, jlong timestamp)
{
+ auto* env = getEnv();
+
jassert (byteArray != nullptr);
- jbyte* data = getEnv()->GetByteArrayElements (byteArray, nullptr);
+ jbyte* data = env->GetByteArrayElements (byteArray, nullptr);
HeapBlock buffer (static_cast (len));
std::memcpy (buffer.get(), data + offset, static_cast (len));
@@ -98,7 +422,15 @@ public:
len, static_cast (timestamp) * 1.0e-9,
juceMidiInput, *callback);
- getEnv()->ReleaseByteArrayElements (byteArray, data, 0);
+ env->ReleaseByteArrayElements (byteArray, data, 0);
+ }
+
+ static void handleReceive (JNIEnv*, jobject, jlong host, jbyteArray byteArray,
+ jint offset, jint len, jlong timestamp)
+ {
+ auto* myself = reinterpret_cast (host);
+
+ myself->handleMidi (byteArray, offset, len, timestamp);
}
private:
@@ -112,7 +444,7 @@ private:
class AndroidMidiOutput
{
public:
- AndroidMidiOutput (jobject midiDevice)
+ AndroidMidiOutput (const LocalRef& midiDevice)
: javaMidiDevice (midiDevice)
{
}
@@ -138,24 +470,19 @@ private:
GlobalRef javaMidiDevice;
};
-JUCE_JNI_CALLBACK (JUCE_JOIN_MACRO (JUCE_ANDROID_ACTIVITY_CLASSNAME, _00024JuceMidiInputPort), handleReceive,
- void, (JNIEnv* env, jobject, jlong host, jbyteArray byteArray,
- jint offset, jint count, jlong timestamp))
-{
- // Java may create a Midi thread which JUCE doesn't know about and this callback may be
- // received on this thread. Java will have already created a JNI Env for this new thread,
- // which we need to tell JUCE about
- setEnv (env);
+//==============================================================================
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
+ CALLBACK (AndroidMidiInput::handleReceive, "handleReceive", "(J[BIIJ)V" )
- reinterpret_cast (host)->receive (byteArray, offset, count, timestamp);
-}
+DECLARE_JNI_CLASS_WITH_MIN_SDK (JuceMidiInputPort, "com/roli/juce/JuceMidiSupport$JuceMidiInputPort", 23)
+#undef JNI_CLASS_MEMBERS
//==============================================================================
class AndroidMidiDeviceManager
{
public:
AndroidMidiDeviceManager()
- : deviceManager (android.activity.callObjectMethod (JuceAppActivity.getAndroidMidiDeviceManager))
+ : deviceManager (LocalRef(getEnv()->CallStaticObjectMethod (JuceMidiSupport, JuceMidiSupport.getAndroidMidiDeviceManager, getAppContext().get())))
{
}
@@ -187,7 +514,7 @@ public:
{
jobjectArray jDevices
= (jobjectArray) getEnv()->CallObjectMethod (dm, input ? MidiDeviceManager.getJuceAndroidMidiInputDevices
- : MidiDeviceManager.getJuceAndroidMidiOutputDevices);
+ : MidiDeviceManager.getJuceAndroidMidiOutputDevices);
// Create a local reference as converting this
// to a JUCE string will call into JNI
@@ -215,7 +542,7 @@ public:
{
if (jobject dm = deviceManager.get())
if (jobject javaMidiPort = getEnv()->CallObjectMethod (dm, MidiDeviceManager.openMidiOutputPortWithJuceIndex, (jint) idx))
- return new AndroidMidiOutput (javaMidiPort);
+ return new AndroidMidiOutput (LocalRef(javaMidiPort));
return nullptr;
}
@@ -227,18 +554,23 @@ private:
//==============================================================================
StringArray MidiOutput::getDevices()
{
- AndroidMidiDeviceManager manager;
- return manager.getDevices (false);
+ if (getAndroidSDKVersion() >= 23)
+ {
+ AndroidMidiDeviceManager manager;
+ return manager.getDevices (false);
+ }
+
+ return {};
}
int MidiOutput::getDefaultDeviceIndex()
{
- return 0;
+ return (getAndroidSDKVersion() >= 23 ? 0 : -1);
}
MidiOutput* MidiOutput::openDevice (int index)
{
- if (index < 0)
+ if (index < 0 || getAndroidSDKVersion() < 23)
return nullptr;
AndroidMidiDeviceManager manager;
@@ -295,18 +627,23 @@ MidiInput::MidiInput (const String& nm) : name (nm)
StringArray MidiInput::getDevices()
{
- AndroidMidiDeviceManager manager;
- return manager.getDevices (true);
+ if (getAndroidSDKVersion() >= 23)
+ {
+ AndroidMidiDeviceManager manager;
+ return manager.getDevices (true);
+ }
+
+ return {};
}
int MidiInput::getDefaultDeviceIndex()
{
- return 0;
+ return (getAndroidSDKVersion() >= 23 ? 0 : -1);
}
MidiInput* MidiInput::openDevice (int index, juce::MidiInputCallback* callback)
{
- if (index < 0)
+ if (getAndroidSDKVersion() < 23 || index < 0)
return nullptr;
AndroidMidiDeviceManager manager;
diff --git a/modules/juce_audio_devices/native/juce_android_Oboe.cpp b/modules/juce_audio_devices/native/juce_android_Oboe.cpp
index 0798687c10..5e18780f9f 100644
--- a/modules/juce_audio_devices/native/juce_android_Oboe.cpp
+++ b/modules/juce_audio_devices/native/juce_android_Oboe.cpp
@@ -760,8 +760,6 @@ private:
oboe::DataCallbackResult onAudioReady (oboe::AudioStream* stream, void* audioData, int32_t numFrames) override
{
- attachAndroidJNI();
-
if (audioCallbackGuard.compareAndSetBool (1, 0))
{
if (stream == nullptr)
@@ -905,8 +903,6 @@ private:
void onErrorBeforeClose (oboe::AudioStream* stream, oboe::Result error) override
{
- attachAndroidJNI();
-
// only output stream should be the master stream receiving callbacks
jassert (stream->getDirection() == oboe::Direction::Output);
@@ -916,8 +912,6 @@ private:
void onErrorAfterClose (oboe::AudioStream* stream, oboe::Result error) override
{
- attachAndroidJNI();
-
// only output stream should be the master stream receiving callbacks
jassert (stream->getDirection() == oboe::Direction::Output);
@@ -987,23 +981,6 @@ private:
bool running = false;
//==============================================================================
- static String audioManagerGetProperty (const String& property)
- {
- const LocalRef jProperty (javaString (property));
- const LocalRef text ((jstring) android.activity.callObjectMethod (JuceAppActivity.audioManagerGetProperty,
- jProperty.get()));
- if (text.get() != 0)
- return juceString (text);
-
- return {};
- }
-
- static bool androidHasSystemFeature (const String& property)
- {
- const LocalRef jProperty (javaString (property));
- return android.activity.callBooleanMethod (JuceAppActivity.hasSystemFeature, jProperty.get());
- }
-
static double getNativeSampleRate()
{
return audioManagerGetProperty ("android.media.property.OUTPUT_SAMPLE_RATE").getDoubleValue();
@@ -1023,18 +1000,9 @@ private:
static int getDefaultFramesPerBurst()
{
// NB: this function only works for inbuilt speakers and headphones
- auto* env = getEnv();
-
- auto audioManager = LocalRef (env->CallObjectMethod (android.activity,
- JuceAppActivity.getSystemService,
- javaString ("audio").get()));
-
- auto propertyJavaString = javaString ("android.media.property.OUTPUT_FRAMES_PER_BUFFER");
+ auto framesPerBurstString = javaString (audioManagerGetProperty ("android.media.property.OUTPUT_FRAMES_PER_BUFFER"));
- auto framesPerBurstString = LocalRef ((jstring) android.activity.callObjectMethod (JuceAppActivity.audioManagerGetProperty,
- propertyJavaString.get()));
-
- return framesPerBurstString != 0 ? env->CallStaticIntMethod (JavaInteger, JavaInteger.parseInt, framesPerBurstString.get(), 10) : 192;
+ return framesPerBurstString != 0 ? getEnv()->CallStaticIntMethod (JavaInteger, JavaInteger.parseInt, framesPerBurstString.get(), 10) : 192;
}
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (OboeAudioIODevice)
@@ -1051,7 +1019,7 @@ OboeAudioIODevice::OboeSessionBase* OboeAudioIODevice::OboeSessionBase::create (
{
std::unique_ptr session;
- auto sdkVersion = getEnv()->GetStaticIntField (AndroidBuildVersion, AndroidBuildVersion.SDK_INT);
+ auto sdkVersion = getAndroidSDKVersion();
// SDK versions 21 and higher should natively support floating point...
if (sdkVersion >= 21)
@@ -1119,7 +1087,7 @@ public:
forInput ? oboe::Direction::Input : oboe::Direction::Output,
oboe::SharingMode::Shared,
forInput ? 1 : 2,
- getSDKVersion() >= 21 ? oboe::AudioFormat::Float : oboe::AudioFormat::I16,
+ getAndroidSDKVersion() >= 21 ? oboe::AudioFormat::Float : oboe::AudioFormat::I16,
(int) OboeAudioIODevice::getNativeSampleRate(),
OboeAudioIODevice::getNativeBufferSize(),
nullptr);
@@ -1210,8 +1178,8 @@ public:
if (audioManagerClass == 0)
return;
- auto audioManager = LocalRef (env->CallObjectMethod (android.activity,
- JuceAppActivity.getSystemService,
+ auto audioManager = LocalRef (env->CallObjectMethod (getAppContext().get(),
+ AndroidContext.getSystemService,
javaString ("audio").get()));
static jmethodID getDevicesMethod = env->GetMethodID (audioManagerClass, "getDevices",
@@ -1253,16 +1221,10 @@ public:
bool supportsDevicesInfo() const
{
- static auto result = getSDKVersion() >= 23;
+ static auto result = getAndroidSDKVersion() >= 23;
return result;
}
- int getSDKVersion() const
- {
- static auto sdkVersion = getEnv()->GetStaticIntField (AndroidBuildVersion, AndroidBuildVersion.SDK_INT);
- return sdkVersion;
- }
-
void addDevice (const LocalRef& device, JNIEnv* env)
{
auto deviceClass = LocalRef ((jclass) env->FindClass ("android/media/AudioDeviceInfo"));
diff --git a/modules/juce_audio_devices/native/juce_android_OpenSL.cpp b/modules/juce_audio_devices/native/juce_android_OpenSL.cpp
index d24b5b0285..158dfa2f26 100644
--- a/modules/juce_audio_devices/native/juce_android_OpenSL.cpp
+++ b/modules/juce_audio_devices/native/juce_android_OpenSL.cpp
@@ -23,6 +23,10 @@
namespace juce
{
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
+DECLARE_JNI_CLASS (AndroidAudioManager, "android/media/AudioManager")
+#undef JNI_CLASS_MEMBERS
+
//==============================================================================
#ifndef SL_ANDROID_DATAFORMAT_PCM_EX
#define SL_ANDROID_DATAFORMAT_PCM_EX ((SLuint32) 0x00000004)
@@ -323,7 +327,7 @@ public:
if (runner == nullptr)
return false;
- const bool supportsJavaProxy = (getEnv()->GetStaticIntField (AndroidBuildVersion, AndroidBuildVersion.SDK_INT) >= 24);
+ const bool supportsJavaProxy = (getAndroidSDKVersion() >= 24);
if (supportsJavaProxy)
{
@@ -337,7 +341,7 @@ public:
&audioRoutingJni);
if (status == SL_RESULT_SUCCESS && audioRoutingJni != 0)
- javaProxy = GlobalRef (audioRoutingJni);
+ javaProxy = GlobalRef (LocalRef(getEnv()->NewLocalRef (audioRoutingJni)));
}
}
@@ -372,8 +376,6 @@ public:
void finished (SLAndroidSimpleBufferQueueItf)
{
- attachAndroidJNI();
-
--numBlocksOut;
owner.doSomeWorkOnAudioThread();
}
@@ -489,8 +491,7 @@ public:
{
if (Base::config != nullptr)
{
- const bool supportsUnprocessed = (getEnv()->GetStaticIntField (AndroidBuildVersion, AndroidBuildVersion.SDK_INT) >= 25);
-
+ const bool supportsUnprocessed = (getAndroidSDKVersion() >= 25);
const SLuint32 recordingPresetValue
= (shouldEnable ? SL_ANDROID_RECORDING_PRESET_GENERIC
: (supportsUnprocessed ? SL_ANDROID_RECORDING_PRESET_UNPROCESSED
@@ -660,7 +661,7 @@ public:
return;
}
- const bool supportsUnderrunCount = (getEnv()->GetStaticIntField (AndroidBuildVersion, AndroidBuildVersion.SDK_INT) >= 24);
+ const bool supportsUnderrunCount = (getAndroidSDKVersion() >= 24);
getUnderrunCount = supportsUnderrunCount ? getEnv()->GetMethodID (AudioTrack, "getUnderrunCount", "()I") : 0;
}
}
@@ -1048,9 +1049,7 @@ private:
// "For Android 4.2 (API level 17) and earlier, a buffer count of two or more is required
// for lower latency. Beginning with Android 4.3 (API level 18), a buffer count of one
// is sufficient for lower latency."
-
- auto sdkVersion = getEnv()->GetStaticIntField (AndroidBuildVersion, AndroidBuildVersion.SDK_INT);
- return (sdkVersion >= 18 ? 1 : 2);
+ return (getAndroidSDKVersion() >= 18 ? 1 : 2);
}
// we will not use the low-latency path so we can use the absolute minimum number of buffers
@@ -1079,23 +1078,6 @@ private:
}
//==============================================================================
- static String audioManagerGetProperty (const String& property)
- {
- const LocalRef jProperty (javaString (property));
- const LocalRef text ((jstring) android.activity.callObjectMethod (JuceAppActivity.audioManagerGetProperty,
- jProperty.get()));
- if (text.get() != 0)
- return juceString (text);
-
- return {};
- }
-
- static bool androidHasSystemFeature (const String& property)
- {
- const LocalRef jProperty (javaString (property));
- return android.activity.callBooleanMethod (JuceAppActivity.hasSystemFeature, jProperty.get());
- }
-
static double getNativeSampleRate()
{
return audioManagerGetProperty ("android.media.property.OUTPUT_SAMPLE_RATE").getDoubleValue();
@@ -1147,7 +1129,7 @@ OpenSLAudioIODevice::OpenSLSession* OpenSLAudioIODevice::OpenSLSession::create (
int numBuffersToUse)
{
std::unique_ptr retval;
- auto sdkVersion = getEnv()->GetStaticIntField (AndroidBuildVersion, AndroidBuildVersion.SDK_INT);
+ auto sdkVersion = getAndroidSDKVersion();
// SDK versions 21 and higher should natively support floating point...
if (sdkVersion >= 21)
diff --git a/modules/juce_audio_utils/native/juce_android_BluetoothMidiDevicePairingDialogue.cpp b/modules/juce_audio_utils/native/juce_android_BluetoothMidiDevicePairingDialogue.cpp
index 1911e83abc..664b4837e3 100644
--- a/modules/juce_audio_utils/native/juce_android_BluetoothMidiDevicePairingDialogue.cpp
+++ b/modules/juce_audio_utils/native/juce_android_BluetoothMidiDevicePairingDialogue.cpp
@@ -27,7 +27,13 @@
namespace juce
{
-#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD) \
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
+ STATICMETHOD (getAndroidBluetoothManager, "getAndroidBluetoothManager", "(Landroid/content/Context;)Lcom/roli/juce/JuceMidiSupport$BluetoothManager;")
+
+DECLARE_JNI_CLASS_WITH_MIN_SDK (AndroidJuceMidiSupport, "com/roli/juce/JuceMidiSupport", 23)
+#undef JNI_CLASS_MEMBERS
+
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
METHOD (getMidiBluetoothAddresses, "getMidiBluetoothAddresses", "()[Ljava/lang/String;") \
METHOD (pairBluetoothMidiDevice, "pairBluetoothMidiDevice", "(Ljava/lang/String;)Z") \
METHOD (unpairBluetoothMidiDevice, "unpairBluetoothMidiDevice", "(Ljava/lang/String;)V") \
@@ -35,7 +41,7 @@ namespace juce
METHOD (getBluetoothDeviceStatus, "getBluetoothDeviceStatus", "(Ljava/lang/String;)I") \
METHOD (startStopScan, "startStopScan", "(Z)V")
-DECLARE_JNI_CLASS (AndroidBluetoothManager, JUCE_ANDROID_ACTIVITY_CLASSPATH "$BluetoothManager")
+DECLARE_JNI_CLASS_WITH_MIN_SDK (AndroidBluetoothManager, "com/roli/juce/JuceMidiSupport$BluetoothManager", 23)
#undef JNI_CLASS_MEMBERS
//==============================================================================
@@ -44,7 +50,7 @@ struct AndroidBluetoothMidiInterface
static void startStopScan (bool startScanning)
{
JNIEnv* env = getEnv();
- LocalRef btManager (android.activity.callObjectMethod (JuceAppActivity.getAndroidBluetoothManager));
+ LocalRef btManager (env->CallStaticObjectMethod (AndroidJuceMidiSupport, AndroidJuceMidiSupport.getAndroidBluetoothManager, getAppContext().get()));
if (btManager.get() != nullptr)
env->CallVoidMethod (btManager.get(), AndroidBluetoothManager.startStopScan, (jboolean) (startScanning ? 1 : 0));
@@ -56,7 +62,7 @@ struct AndroidBluetoothMidiInterface
JNIEnv* env = getEnv();
- LocalRef btManager (android.activity.callObjectMethod (JuceAppActivity.getAndroidBluetoothManager));
+ LocalRef btManager (env->CallStaticObjectMethod (AndroidJuceMidiSupport, AndroidJuceMidiSupport.getAndroidBluetoothManager, getAppContext().get()));
// if this is null then bluetooth is not enabled
if (btManager.get() == nullptr)
@@ -82,7 +88,7 @@ struct AndroidBluetoothMidiInterface
{
JNIEnv* env = getEnv();
- LocalRef btManager (android.activity.callObjectMethod (JuceAppActivity.getAndroidBluetoothManager));
+ LocalRef btManager (env->CallStaticObjectMethod (AndroidJuceMidiSupport, AndroidJuceMidiSupport.getAndroidBluetoothManager, getAppContext().get()));
if (btManager.get() == nullptr)
return false;
@@ -96,7 +102,7 @@ struct AndroidBluetoothMidiInterface
{
JNIEnv* env = getEnv();
- LocalRef btManager (android.activity.callObjectMethod (JuceAppActivity.getAndroidBluetoothManager));
+ LocalRef btManager (env->CallStaticObjectMethod (AndroidJuceMidiSupport, AndroidJuceMidiSupport.getAndroidBluetoothManager, getAppContext().get()));
if (btManager.get() != nullptr)
env->CallVoidMethod (btManager.get(), AndroidBluetoothManager.unpairBluetoothMidiDevice,
@@ -108,7 +114,7 @@ struct AndroidBluetoothMidiInterface
{
JNIEnv* env = getEnv();
- LocalRef btManager (android.activity.callObjectMethod (JuceAppActivity.getAndroidBluetoothManager));
+ LocalRef btManager (env->CallStaticObjectMethod (AndroidJuceMidiSupport, AndroidJuceMidiSupport.getAndroidBluetoothManager, getAppContext().get()));
if (btManager.get() == nullptr)
return address;
@@ -136,7 +142,7 @@ struct AndroidBluetoothMidiInterface
{
JNIEnv* env = getEnv();
- LocalRef btManager (android.activity.callObjectMethod (JuceAppActivity.getAndroidBluetoothManager));
+ LocalRef btManager (env->CallStaticObjectMethod (AndroidJuceMidiSupport, AndroidJuceMidiSupport.getAndroidBluetoothManager, getAppContext().get()));
if (btManager.get() == nullptr)
return unpaired;
@@ -485,6 +491,10 @@ bool BluetoothMidiDevicePairingDialogue::open (ModalComponentManager::Callback*
Rectangle* btBounds)
{
std::unique_ptr exitCallback (exitCallbackPtr);
+
+ if (getAndroidSDKVersion() < 23)
+ return false;
+
auto boundsToUse = (btBounds != nullptr ? *btBounds : Rectangle {});
if (! RuntimePermissions::isGranted (RuntimePermissions::bluetoothMidi))
@@ -502,7 +512,12 @@ bool BluetoothMidiDevicePairingDialogue::open (ModalComponentManager::Callback*
bool BluetoothMidiDevicePairingDialogue::isAvailable()
{
- jobject btManager (android.activity.callObjectMethod (JuceAppActivity.getAndroidBluetoothManager));
+ if (getAndroidSDKVersion() < 23)
+ return false;
+
+ auto* env = getEnv();
+
+ LocalRef btManager (env->CallStaticObjectMethod (AndroidJuceMidiSupport, AndroidJuceMidiSupport.getAndroidBluetoothManager, getAppContext().get()));
return btManager != nullptr;
}
diff --git a/modules/juce_core/juce_core.cpp b/modules/juce_core/juce_core.cpp
index 111060cfd8..a1e9c90b91 100644
--- a/modules/juce_core/juce_core.cpp
+++ b/modules/juce_core/juce_core.cpp
@@ -221,7 +221,9 @@
//==============================================================================
#elif JUCE_ANDROID
+
#include "native/juce_linux_CommonFile.cpp"
+#include "native/juce_android_JNIHelpers.cpp"
#include "native/juce_android_Files.cpp"
#include "native/juce_android_Misc.cpp"
#include "native/juce_android_Network.cpp"
diff --git a/modules/juce_core/native/java/AndroidCamera.java b/modules/juce_core/native/java/AndroidCamera.java
deleted file mode 100644
index 936e46d851..0000000000
--- a/modules/juce_core/native/java/AndroidCamera.java
+++ /dev/null
@@ -1,169 +0,0 @@
-$$CameraApi21
- //==============================================================================
- public class CameraDeviceStateCallback extends CameraDevice.StateCallback
- {
- private native void cameraDeviceStateClosed (long host, CameraDevice camera);
- private native void cameraDeviceStateDisconnected (long host, CameraDevice camera);
- private native void cameraDeviceStateError (long host, CameraDevice camera, int error);
- private native void cameraDeviceStateOpened (long host, CameraDevice camera);
-
- CameraDeviceStateCallback (long hostToUse)
- {
- host = hostToUse;
- }
-
- @Override
- public void onClosed (CameraDevice camera)
- {
- cameraDeviceStateClosed (host, camera);
- }
-
- @Override
- public void onDisconnected (CameraDevice camera)
- {
- cameraDeviceStateDisconnected (host, camera);
- }
-
- @Override
- public void onError (CameraDevice camera, int error)
- {
- cameraDeviceStateError (host, camera, error);
- }
-
- @Override
- public void onOpened (CameraDevice camera)
- {
- cameraDeviceStateOpened (host, camera);
- }
-
- private long host;
- }
-
- //==============================================================================
- public class CameraCaptureSessionStateCallback extends CameraCaptureSession.StateCallback
- {
- private native void cameraCaptureSessionActive (long host, CameraCaptureSession session);
- private native void cameraCaptureSessionClosed (long host, CameraCaptureSession session);
- private native void cameraCaptureSessionConfigureFailed (long host, CameraCaptureSession session);
- private native void cameraCaptureSessionConfigured (long host, CameraCaptureSession session);
- private native void cameraCaptureSessionReady (long host, CameraCaptureSession session);
-
- CameraCaptureSessionStateCallback (long hostToUse)
- {
- host = hostToUse;
- }
-
- @Override
- public void onActive (CameraCaptureSession session)
- {
- cameraCaptureSessionActive (host, session);
- }
-
- @Override
- public void onClosed (CameraCaptureSession session)
- {
- cameraCaptureSessionClosed (host, session);
- }
-
- @Override
- public void onConfigureFailed (CameraCaptureSession session)
- {
- cameraCaptureSessionConfigureFailed (host, session);
- }
-
- @Override
- public void onConfigured (CameraCaptureSession session)
- {
- cameraCaptureSessionConfigured (host, session);
- }
-
- @Override
- public void onReady (CameraCaptureSession session)
- {
- cameraCaptureSessionReady (host, session);
- }
-
- private long host;
- }
-
- //==============================================================================
- public class CameraCaptureSessionCaptureCallback extends CameraCaptureSession.CaptureCallback
- {
- private native void cameraCaptureSessionCaptureCompleted (long host, boolean isPreview, CameraCaptureSession session, CaptureRequest request, TotalCaptureResult result);
- private native void cameraCaptureSessionCaptureFailed (long host, boolean isPreview, CameraCaptureSession session, CaptureRequest request, CaptureFailure failure);
- private native void cameraCaptureSessionCaptureProgressed (long host, boolean isPreview, CameraCaptureSession session, CaptureRequest request, CaptureResult partialResult);
- private native void cameraCaptureSessionCaptureStarted (long host, boolean isPreview, CameraCaptureSession session, CaptureRequest request, long timestamp, long frameNumber);
- private native void cameraCaptureSessionCaptureSequenceAborted (long host, boolean isPreview, CameraCaptureSession session, int sequenceId);
- private native void cameraCaptureSessionCaptureSequenceCompleted (long host, boolean isPreview, CameraCaptureSession session, int sequenceId, long frameNumber);
-
- CameraCaptureSessionCaptureCallback (long hostToUse, boolean shouldBePreview)
- {
- host = hostToUse;
- preview = shouldBePreview;
- }
-
- @Override
- public void onCaptureCompleted (CameraCaptureSession session, CaptureRequest request,
- TotalCaptureResult result)
- {
- cameraCaptureSessionCaptureCompleted (host, preview, session, request, result);
- }
-
- @Override
- public void onCaptureFailed (CameraCaptureSession session, CaptureRequest request, CaptureFailure failure)
- {
- cameraCaptureSessionCaptureFailed (host, preview, session, request, failure);
- }
-
- @Override
- public void onCaptureProgressed (CameraCaptureSession session, CaptureRequest request,
- CaptureResult partialResult)
- {
- cameraCaptureSessionCaptureProgressed (host, preview, session, request, partialResult);
- }
-
- @Override
- public void onCaptureSequenceAborted (CameraCaptureSession session, int sequenceId)
- {
- cameraCaptureSessionCaptureSequenceAborted (host, preview, session, sequenceId);
- }
-
- @Override
- public void onCaptureSequenceCompleted (CameraCaptureSession session, int sequenceId, long frameNumber)
- {
- cameraCaptureSessionCaptureSequenceCompleted (host, preview, session, sequenceId, frameNumber);
- }
-
- @Override
- public void onCaptureStarted (CameraCaptureSession session, CaptureRequest request, long timestamp,
- long frameNumber)
- {
- cameraCaptureSessionCaptureStarted (host, preview, session, request, timestamp, frameNumber);
- }
-
- private long host;
- private boolean preview;
- }
-
- //==============================================================================
- public class JuceOrientationEventListener extends OrientationEventListener
- {
- private native void deviceOrientationChanged (long host, int orientation);
-
- public JuceOrientationEventListener (long hostToUse, Context context, int rate)
- {
- super (context, rate);
-
- host = hostToUse;
- }
-
- @Override
- public void onOrientationChanged (int orientation)
- {
- deviceOrientationChanged (host, orientation);
- }
-
- private long host;
- }
-
-CameraApi21$$
diff --git a/modules/juce_core/native/java/AndroidMidiFallback.java b/modules/juce_core/native/java/AndroidMidiFallback.java
deleted file mode 100644
index 5e3d57ff4e..0000000000
--- a/modules/juce_core/native/java/AndroidMidiFallback.java
+++ /dev/null
@@ -1,85 +0,0 @@
- //==============================================================================
- public class BluetoothManager
- {
- BluetoothManager()
- {
- }
-
- public String[] getMidiBluetoothAddresses()
- {
- String[] bluetoothAddresses = new String[0];
- return bluetoothAddresses;
- }
-
- public String getHumanReadableStringForBluetoothAddress (String address)
- {
- return address;
- }
-
- public int getBluetoothDeviceStatus (String address)
- {
- return 0;
- }
-
- public void startStopScan (boolean shouldStart)
- {
- }
-
- public boolean pairBluetoothMidiDevice(String address)
- {
- return false;
- }
-
- public void unpairBluetoothMidiDevice (String address)
- {
- }
- }
-
- //==============================================================================
- public class MidiDeviceManager
- {
- public MidiDeviceManager()
- {
- }
-
- public String[] getJuceAndroidMidiInputDevices()
- {
- return new String[0];
- }
-
- public String[] getJuceAndroidMidiOutputDevices()
- {
- return new String[0];
- }
-
- public JuceMidiPort openMidiInputPortWithJuceIndex (int index, long host)
- {
- return null;
- }
-
- public JuceMidiPort openMidiOutputPortWithJuceIndex (int index)
- {
- return null;
- }
-
- public String getInputPortNameForJuceIndex (int index)
- {
- return "";
- }
-
- public String getOutputPortNameForJuceIndex (int index)
- {
- return "";
- }
- }
-
-
- public MidiDeviceManager getAndroidMidiDeviceManager()
- {
- return null;
- }
-
- public BluetoothManager getAndroidBluetoothManager()
- {
- return null;
- }
diff --git a/modules/juce_core/native/java/AndroidRuntimePermissions.java b/modules/juce_core/native/java/AndroidRuntimePermissions.java
deleted file mode 100644
index 6e1b160a84..0000000000
--- a/modules/juce_core/native/java/AndroidRuntimePermissions.java
+++ /dev/null
@@ -1,12 +0,0 @@
- @Override
- public void onRequestPermissionsResult (int permissionID, String permissions[], int[] grantResults)
- {
- boolean permissionsGranted = (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED);
-
- if (! permissionsGranted)
- Log.d ("JUCE", "onRequestPermissionsResult: runtime permission was DENIED: " + getAndroidPermissionName (permissionID));
-
- Long ptrToCallback = permissionCallbackPtrMap.get (permissionID);
- permissionCallbackPtrMap.remove (permissionID);
- androidRuntimePermissionsCallback (permissionsGranted, ptrToCallback);
- }
diff --git a/modules/juce_core/native/java/AndroidVideo.java b/modules/juce_core/native/java/AndroidVideo.java
deleted file mode 100644
index abda5e0c15..0000000000
--- a/modules/juce_core/native/java/AndroidVideo.java
+++ /dev/null
@@ -1,146 +0,0 @@
-$$VideoApi21
- //==============================================================================
- public class MediaControllerCallback extends MediaController.Callback
- {
- private native void mediaControllerAudioInfoChanged (long host, MediaController.PlaybackInfo info);
- private native void mediaControllerMetadataChanged (long host, MediaMetadata metadata);
- private native void mediaControllerPlaybackStateChanged (long host, PlaybackState state);
- private native void mediaControllerSessionDestroyed (long host);
-
- MediaControllerCallback (long hostToUse)
- {
- host = hostToUse;
- }
-
- @Override
- public void onAudioInfoChanged (MediaController.PlaybackInfo info)
- {
- mediaControllerAudioInfoChanged (host, info);
- }
-
- @Override
- public void onMetadataChanged (MediaMetadata metadata)
- {
- mediaControllerMetadataChanged (host, metadata);
- }
-
- @Override
- public void onPlaybackStateChanged (PlaybackState state)
- {
- mediaControllerPlaybackStateChanged (host, state);
- }
-
- @Override
- public void onQueueChanged (List queue) {}
-
- @Override
- public void onSessionDestroyed()
- {
- mediaControllerSessionDestroyed (host);
- }
-
- private long host;
- }
-
- //==============================================================================
- public class MediaSessionCallback extends MediaSession.Callback
- {
- private native void mediaSessionPause (long host);
- private native void mediaSessionPlay (long host);
- private native void mediaSessionPlayFromMediaId (long host, String mediaId, Bundle extras);
- private native void mediaSessionSeekTo (long host, long pos);
- private native void mediaSessionStop (long host);
-
-
- MediaSessionCallback (long hostToUse)
- {
- host = hostToUse;
- }
-
- @Override
- public void onPause()
- {
- mediaSessionPause (host);
- }
-
- @Override
- public void onPlay()
- {
- mediaSessionPlay (host);
- }
-
- @Override
- public void onPlayFromMediaId (String mediaId, Bundle extras)
- {
- mediaSessionPlayFromMediaId (host, mediaId, extras);
- }
-
- @Override
- public void onSeekTo (long pos)
- {
- mediaSessionSeekTo (host, pos);
- }
-
- @Override
- public void onStop()
- {
- mediaSessionStop (host);
- }
-
- @Override
- public void onFastForward() {}
-
- @Override
- public boolean onMediaButtonEvent (Intent mediaButtonIntent)
- {
- return true;
- }
-
- @Override
- public void onRewind() {}
-
- @Override
- public void onSkipToNext() {}
-
- @Override
- public void onSkipToPrevious() {}
-
- @Override
- public void onSkipToQueueItem (long id) {}
-
- private long host;
- }
-
- //==============================================================================
- public class SystemVolumeObserver extends ContentObserver
- {
- private native void mediaSessionSystemVolumeChanged (long host);
-
- SystemVolumeObserver (Activity activityToUse, long hostToUse)
- {
- super (null);
-
- activity = activityToUse;
- host = hostToUse;
- }
-
- void setEnabled (boolean shouldBeEnabled)
- {
- if (shouldBeEnabled)
- activity.getApplicationContext().getContentResolver().registerContentObserver (android.provider.Settings.System.CONTENT_URI, true, this);
- else
- activity.getApplicationContext().getContentResolver().unregisterContentObserver (this);
- }
-
- @Override
- public void onChange (boolean selfChange, Uri uri)
- {
- if (uri.toString().startsWith ("content://settings/system/volume_music"))
- mediaSessionSystemVolumeChanged (host);
- }
-
- private Activity activity;
- private long host;
- }
-
-VideoApi21$$
diff --git a/modules/juce_core/native/java/AndroidWebView.java b/modules/juce_core/native/java/AndroidWebView.java
deleted file mode 100644
index 74d851ff70..0000000000
--- a/modules/juce_core/native/java/AndroidWebView.java
+++ /dev/null
@@ -1,69 +0,0 @@
-$$WebViewNativeApi23 private native void webViewReceivedError (long host, WebView view, WebResourceRequest request, WebResourceError error);WebViewNativeApi23$$
-$$WebViewNativeApi21 private native void webViewReceivedHttpError (long host, WebView view, WebResourceRequest request, WebResourceResponse errorResponse);WebViewNativeApi21$$
-
-$$WebViewApi1_10
- @Override
- public void onPageStarted (WebView view, String url, Bitmap favicon)
- {
- if (host != 0)
- webViewPageLoadStarted (host, view, url);
- }
-WebViewApi1_10$$
-
-$$WebViewApi11_20
- @Override
- public WebResourceResponse shouldInterceptRequest (WebView view, String url)
- {
- synchronized (hostLock)
- {
- if (host != 0)
- {
- boolean shouldLoad = webViewPageLoadStarted (host, view, url);
-
- if (shouldLoad)
- return null;
- }
- }
-
- return new WebResourceResponse ("text/html", null, null);
- }
-WebViewApi11_20$$
-
-$$WebViewApi21
- @Override
- public WebResourceResponse shouldInterceptRequest (WebView view, WebResourceRequest request)
- {
- synchronized (hostLock)
- {
- if (host != 0)
- {
- boolean shouldLoad = webViewPageLoadStarted (host, view, request.getUrl().toString());
-
- if (shouldLoad)
- return null;
- }
- }
-
- return new WebResourceResponse ("text/html", null, null);
- }
-WebViewApi21$$
-
-$$WebViewApi23
- @Override
- public void onReceivedError (WebView view, WebResourceRequest request, WebResourceError error)
- {
- if (host == 0)
- return;
-
- webViewReceivedError (host, view, request, error);
- }
-
- @Override
- public void onReceivedHttpError (WebView view, WebResourceRequest request, WebResourceResponse errorResponse)
- {
- if (host == 0)
- return;
-
- webViewReceivedHttpError (host, view, request, errorResponse);
- }
-WebViewApi23$$
diff --git a/modules/juce_core/native/java/IInAppBillingService.java b/modules/juce_core/native/java/IInAppBillingService.java
deleted file mode 100644
index 0bb31cb5d3..0000000000
--- a/modules/juce_core/native/java/IInAppBillingService.java
+++ /dev/null
@@ -1,971 +0,0 @@
-/*
- ==============================================================================
-
- This file is part of the JUCE library.
- Copyright (c) 2017 - ROLI Ltd.
-
- JUCE is an open source library subject to commercial or open-source
- licensing.
-
- The code included in this file is provided under the terms of the ISC license
- http://www.isc.org/downloads/software-support-policy/isc-license. Permission
- To use, copy, modify, and/or distribute this software for any purpose with or
- without fee is hereby granted provided that the above copyright notice and
- this permission notice appear in all copies.
-
- JUCE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER
- EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE
- DISCLAIMED.
-
- ==============================================================================
-*/
-
-package com.android.vending.billing;
-/**
- * InAppBillingService is the service that provides in-app billing version 3 and beyond.
- * This service provides the following features:
- * 1. Provides a new API to get details of in-app items published for the app including
- * price, type, title and description.
- * 2. The purchase flow is synchronous and purchase information is available immediately
- * after it completes.
- * 3. Purchase information of in-app purchases is maintained within the Google Play system
- * till the purchase is consumed.
- * 4. An API to consume a purchase of an inapp item. All purchases of one-time
- * in-app items are consumable and thereafter can be purchased again.
- * 5. An API to get current purchases of the user immediately. This will not contain any
- * consumed purchases.
- *
- * All calls will give a response code with the following possible values
- * RESULT_OK = 0 - success
- * RESULT_USER_CANCELED = 1 - User pressed back or canceled a dialog
- * RESULT_SERVICE_UNAVAILABLE = 2 - The network connection is down
- * RESULT_BILLING_UNAVAILABLE = 3 - This billing API version is not supported for the type requested
- * RESULT_ITEM_UNAVAILABLE = 4 - Requested SKU is not available for purchase
- * RESULT_DEVELOPER_ERROR = 5 - Invalid arguments provided to the API
- * RESULT_ERROR = 6 - Fatal error during the API action
- * RESULT_ITEM_ALREADY_OWNED = 7 - Failure to purchase since item is already owned
- * RESULT_ITEM_NOT_OWNED = 8 - Failure to consume since item is not owned
- */
-public interface IInAppBillingService extends android.os.IInterface
- {
- /** Local-side IPC implementation stub class. */
- public static abstract class Stub extends android.os.Binder implements com.android.vending.billing.IInAppBillingService
- {
- private static final java.lang.String DESCRIPTOR = "com.android.vending.billing.IInAppBillingService";
- /** Construct the stub at attach it to the interface. */
- public Stub()
- {
- this.attachInterface(this, DESCRIPTOR);
- }
- /**
- * Cast an IBinder object into an com.android.vending.billing.IInAppBillingService interface,
- * generating a proxy if needed.
- */
- public static com.android.vending.billing.IInAppBillingService asInterface(android.os.IBinder obj)
- {
- if ((obj==null)) {
- return null;
- }
- android.os.IInterface iin = obj.queryLocalInterface(DESCRIPTOR);
- if (((iin!=null)&&(iin instanceof com.android.vending.billing.IInAppBillingService))) {
- return ((com.android.vending.billing.IInAppBillingService)iin);
- }
- return new com.android.vending.billing.IInAppBillingService.Stub.Proxy(obj);
- }
- @Override public android.os.IBinder asBinder()
- {
- return this;
- }
- @Override public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException
- {
- switch (code)
- {
- case INTERFACE_TRANSACTION:
- {
- reply.writeString(DESCRIPTOR);
- return true;
- }
- case TRANSACTION_isBillingSupported:
- {
- data.enforceInterface(DESCRIPTOR);
- int _arg0;
- _arg0 = data.readInt();
- java.lang.String _arg1;
- _arg1 = data.readString();
- java.lang.String _arg2;
- _arg2 = data.readString();
- int _result = this.isBillingSupported(_arg0, _arg1, _arg2);
- reply.writeNoException();
- reply.writeInt(_result);
- return true;
- }
- case TRANSACTION_getSkuDetails:
- {
- data.enforceInterface(DESCRIPTOR);
- int _arg0;
- _arg0 = data.readInt();
- java.lang.String _arg1;
- _arg1 = data.readString();
- java.lang.String _arg2;
- _arg2 = data.readString();
- android.os.Bundle _arg3;
- if ((0!=data.readInt())) {
- _arg3 = android.os.Bundle.CREATOR.createFromParcel(data);
- }
- else {
- _arg3 = null;
- }
- android.os.Bundle _result = this.getSkuDetails(_arg0, _arg1, _arg2, _arg3);
- reply.writeNoException();
- if ((_result!=null)) {
- reply.writeInt(1);
- _result.writeToParcel(reply, android.os.Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
- }
- else {
- reply.writeInt(0);
- }
- return true;
- }
- case TRANSACTION_getBuyIntent:
- {
- data.enforceInterface(DESCRIPTOR);
- int _arg0;
- _arg0 = data.readInt();
- java.lang.String _arg1;
- _arg1 = data.readString();
- java.lang.String _arg2;
- _arg2 = data.readString();
- java.lang.String _arg3;
- _arg3 = data.readString();
- java.lang.String _arg4;
- _arg4 = data.readString();
- android.os.Bundle _result = this.getBuyIntent(_arg0, _arg1, _arg2, _arg3, _arg4);
- reply.writeNoException();
- if ((_result!=null)) {
- reply.writeInt(1);
- _result.writeToParcel(reply, android.os.Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
- }
- else {
- reply.writeInt(0);
- }
- return true;
- }
- case TRANSACTION_getPurchases:
- {
- data.enforceInterface(DESCRIPTOR);
- int _arg0;
- _arg0 = data.readInt();
- java.lang.String _arg1;
- _arg1 = data.readString();
- java.lang.String _arg2;
- _arg2 = data.readString();
- java.lang.String _arg3;
- _arg3 = data.readString();
- android.os.Bundle _result = this.getPurchases(_arg0, _arg1, _arg2, _arg3);
- reply.writeNoException();
- if ((_result!=null)) {
- reply.writeInt(1);
- _result.writeToParcel(reply, android.os.Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
- }
- else {
- reply.writeInt(0);
- }
- return true;
- }
- case TRANSACTION_consumePurchase:
- {
- data.enforceInterface(DESCRIPTOR);
- int _arg0;
- _arg0 = data.readInt();
- java.lang.String _arg1;
- _arg1 = data.readString();
- java.lang.String _arg2;
- _arg2 = data.readString();
- int _result = this.consumePurchase(_arg0, _arg1, _arg2);
- reply.writeNoException();
- reply.writeInt(_result);
- return true;
- }
- case TRANSACTION_stub:
- {
- data.enforceInterface(DESCRIPTOR);
- int _arg0;
- _arg0 = data.readInt();
- java.lang.String _arg1;
- _arg1 = data.readString();
- java.lang.String _arg2;
- _arg2 = data.readString();
- int _result = this.stub(_arg0, _arg1, _arg2);
- reply.writeNoException();
- reply.writeInt(_result);
- return true;
- }
- case TRANSACTION_getBuyIntentToReplaceSkus:
- {
- data.enforceInterface(DESCRIPTOR);
- int _arg0;
- _arg0 = data.readInt();
- java.lang.String _arg1;
- _arg1 = data.readString();
- java.util.List _arg2;
- _arg2 = data.createStringArrayList();
- java.lang.String _arg3;
- _arg3 = data.readString();
- java.lang.String _arg4;
- _arg4 = data.readString();
- java.lang.String _arg5;
- _arg5 = data.readString();
- android.os.Bundle _result = this.getBuyIntentToReplaceSkus(_arg0, _arg1, _arg2, _arg3, _arg4, _arg5);
- reply.writeNoException();
- if ((_result!=null)) {
- reply.writeInt(1);
- _result.writeToParcel(reply, android.os.Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
- }
- else {
- reply.writeInt(0);
- }
- return true;
- }
- case TRANSACTION_getBuyIntentExtraParams:
- {
- data.enforceInterface(DESCRIPTOR);
- int _arg0;
- _arg0 = data.readInt();
- java.lang.String _arg1;
- _arg1 = data.readString();
- java.lang.String _arg2;
- _arg2 = data.readString();
- java.lang.String _arg3;
- _arg3 = data.readString();
- java.lang.String _arg4;
- _arg4 = data.readString();
- android.os.Bundle _arg5;
- if ((0!=data.readInt())) {
- _arg5 = android.os.Bundle.CREATOR.createFromParcel(data);
- }
- else {
- _arg5 = null;
- }
- android.os.Bundle _result = this.getBuyIntentExtraParams(_arg0, _arg1, _arg2, _arg3, _arg4, _arg5);
- reply.writeNoException();
- if ((_result!=null)) {
- reply.writeInt(1);
- _result.writeToParcel(reply, android.os.Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
- }
- else {
- reply.writeInt(0);
- }
- return true;
- }
- case TRANSACTION_getPurchaseHistory:
- {
- data.enforceInterface(DESCRIPTOR);
- int _arg0;
- _arg0 = data.readInt();
- java.lang.String _arg1;
- _arg1 = data.readString();
- java.lang.String _arg2;
- _arg2 = data.readString();
- java.lang.String _arg3;
- _arg3 = data.readString();
- android.os.Bundle _arg4;
- if ((0!=data.readInt())) {
- _arg4 = android.os.Bundle.CREATOR.createFromParcel(data);
- }
- else {
- _arg4 = null;
- }
- android.os.Bundle _result = this.getPurchaseHistory(_arg0, _arg1, _arg2, _arg3, _arg4);
- reply.writeNoException();
- if ((_result!=null)) {
- reply.writeInt(1);
- _result.writeToParcel(reply, android.os.Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
- }
- else {
- reply.writeInt(0);
- }
- return true;
- }
- case TRANSACTION_isBillingSupportedExtraParams:
- {
- data.enforceInterface(DESCRIPTOR);
- int _arg0;
- _arg0 = data.readInt();
- java.lang.String _arg1;
- _arg1 = data.readString();
- java.lang.String _arg2;
- _arg2 = data.readString();
- android.os.Bundle _arg3;
- if ((0!=data.readInt())) {
- _arg3 = android.os.Bundle.CREATOR.createFromParcel(data);
- }
- else {
- _arg3 = null;
- }
- int _result = this.isBillingSupportedExtraParams(_arg0, _arg1, _arg2, _arg3);
- reply.writeNoException();
- reply.writeInt(_result);
- return true;
- }
- }
- return super.onTransact(code, data, reply, flags);
- }
- private static class Proxy implements com.android.vending.billing.IInAppBillingService
- {
- private android.os.IBinder mRemote;
- Proxy(android.os.IBinder remote)
- {
- mRemote = remote;
- }
- @Override public android.os.IBinder asBinder()
- {
- return mRemote;
- }
- public java.lang.String getInterfaceDescriptor()
- {
- return DESCRIPTOR;
- }
- @Override public int isBillingSupported(int apiVersion, java.lang.String packageName, java.lang.String type) throws android.os.RemoteException
- {
- android.os.Parcel _data = android.os.Parcel.obtain();
- android.os.Parcel _reply = android.os.Parcel.obtain();
- int _result;
- try {
- _data.writeInterfaceToken(DESCRIPTOR);
- _data.writeInt(apiVersion);
- _data.writeString(packageName);
- _data.writeString(type);
- mRemote.transact(Stub.TRANSACTION_isBillingSupported, _data, _reply, 0);
- _reply.readException();
- _result = _reply.readInt();
- }
- finally {
- _reply.recycle();
- _data.recycle();
- }
- return _result;
- }
- /**
- * Provides details of a list of SKUs
- * Given a list of SKUs of a valid type in the skusBundle, this returns a bundle
- * with a list JSON strings containing the productId, price, title and description.
- * This API can be called with a maximum of 20 SKUs.
- * @param apiVersion billing API version that the app is using
- * @param packageName the package name of the calling app
- * @param type of the in-app items ("inapp" for one-time purchases
- * and "subs" for subscriptions)
- * @param skusBundle bundle containing a StringArrayList of SKUs with key "ITEM_ID_LIST"
- * @return Bundle containing the following key-value pairs
- * "RESPONSE_CODE" with int value, RESULT_OK(0) if success, appropriate response codes
- * on failures.
- * "DETAILS_LIST" with a StringArrayList containing purchase information
- * in JSON format similar to:
- * '{ "productId" : "exampleSku",
- * "type" : "inapp",
- * "price" : "$5.00",
- * "price_currency": "USD",
- * "price_amount_micros": 5000000,
- * "title : "Example Title",
- * "description" : "This is an example description" }'
- */
- @Override public android.os.Bundle getSkuDetails(int apiVersion, java.lang.String packageName, java.lang.String type, android.os.Bundle skusBundle) throws android.os.RemoteException
- {
- android.os.Parcel _data = android.os.Parcel.obtain();
- android.os.Parcel _reply = android.os.Parcel.obtain();
- android.os.Bundle _result;
- try {
- _data.writeInterfaceToken(DESCRIPTOR);
- _data.writeInt(apiVersion);
- _data.writeString(packageName);
- _data.writeString(type);
- if ((skusBundle!=null)) {
- _data.writeInt(1);
- skusBundle.writeToParcel(_data, 0);
- }
- else {
- _data.writeInt(0);
- }
- mRemote.transact(Stub.TRANSACTION_getSkuDetails, _data, _reply, 0);
- _reply.readException();
- if ((0!=_reply.readInt())) {
- _result = android.os.Bundle.CREATOR.createFromParcel(_reply);
- }
- else {
- _result = null;
- }
- }
- finally {
- _reply.recycle();
- _data.recycle();
- }
- return _result;
- }
- /**
- * Returns a pending intent to launch the purchase flow for an in-app item by providing a SKU,
- * the type, a unique purchase token and an optional developer payload.
- * @param apiVersion billing API version that the app is using
- * @param packageName package name of the calling app
- * @param sku the SKU of the in-app item as published in the developer console
- * @param type of the in-app item being purchased ("inapp" for one-time purchases
- * and "subs" for subscriptions)
- * @param developerPayload optional argument to be sent back with the purchase information
- * @return Bundle containing the following key-value pairs
- * "RESPONSE_CODE" with int value, RESULT_OK(0) if success, appropriate response codes
- * on failures.
- * "BUY_INTENT" - PendingIntent to start the purchase flow
- *
- * The Pending intent should be launched with startIntentSenderForResult. When purchase flow
- * has completed, the onActivityResult() will give a resultCode of OK or CANCELED.
- * If the purchase is successful, the result data will contain the following key-value pairs
- * "RESPONSE_CODE" with int value, RESULT_OK(0) if success, appropriate response
- * codes on failures.
- * "INAPP_PURCHASE_DATA" - String in JSON format similar to
- * '{"orderId":"12999763169054705758.1371079406387615",
- * "packageName":"com.example.app",
- * "productId":"exampleSku",
- * "purchaseTime":1345678900000,
- * "purchaseToken" : "122333444455555",
- * "developerPayload":"example developer payload" }'
- * "INAPP_DATA_SIGNATURE" - String containing the signature of the purchase data that
- * was signed with the private key of the developer
- */
- @Override public android.os.Bundle getBuyIntent(int apiVersion, java.lang.String packageName, java.lang.String sku, java.lang.String type, java.lang.String developerPayload) throws android.os.RemoteException
- {
- android.os.Parcel _data = android.os.Parcel.obtain();
- android.os.Parcel _reply = android.os.Parcel.obtain();
- android.os.Bundle _result;
- try {
- _data.writeInterfaceToken(DESCRIPTOR);
- _data.writeInt(apiVersion);
- _data.writeString(packageName);
- _data.writeString(sku);
- _data.writeString(type);
- _data.writeString(developerPayload);
- mRemote.transact(Stub.TRANSACTION_getBuyIntent, _data, _reply, 0);
- _reply.readException();
- if ((0!=_reply.readInt())) {
- _result = android.os.Bundle.CREATOR.createFromParcel(_reply);
- }
- else {
- _result = null;
- }
- }
- finally {
- _reply.recycle();
- _data.recycle();
- }
- return _result;
- }
- /**
- * Returns the current SKUs owned by the user of the type and package name specified along with
- * purchase information and a signature of the data to be validated.
- * This will return all SKUs that have been purchased in V3 and managed items purchased using
- * V1 and V2 that have not been consumed.
- * @param apiVersion billing API version that the app is using
- * @param packageName package name of the calling app
- * @param type of the in-app items being requested ("inapp" for one-time purchases
- * and "subs" for subscriptions)
- * @param continuationToken to be set as null for the first call, if the number of owned
- * skus are too many, a continuationToken is returned in the response bundle.
- * This method can be called again with the continuation token to get the next set of
- * owned skus.
- * @return Bundle containing the following key-value pairs
- * "RESPONSE_CODE" with int value, RESULT_OK(0) if success, appropriate response codes
- on failures.
- * "INAPP_PURCHASE_ITEM_LIST" - StringArrayList containing the list of SKUs
- * "INAPP_PURCHASE_DATA_LIST" - StringArrayList containing the purchase information
- * "INAPP_DATA_SIGNATURE_LIST"- StringArrayList containing the signatures
- * of the purchase information
- * "INAPP_CONTINUATION_TOKEN" - String containing a continuation token for the
- * next set of in-app purchases. Only set if the
- * user has more owned skus than the current list.
- */
- @Override public android.os.Bundle getPurchases(int apiVersion, java.lang.String packageName, java.lang.String type, java.lang.String continuationToken) throws android.os.RemoteException
- {
- android.os.Parcel _data = android.os.Parcel.obtain();
- android.os.Parcel _reply = android.os.Parcel.obtain();
- android.os.Bundle _result;
- try {
- _data.writeInterfaceToken(DESCRIPTOR);
- _data.writeInt(apiVersion);
- _data.writeString(packageName);
- _data.writeString(type);
- _data.writeString(continuationToken);
- mRemote.transact(Stub.TRANSACTION_getPurchases, _data, _reply, 0);
- _reply.readException();
- if ((0!=_reply.readInt())) {
- _result = android.os.Bundle.CREATOR.createFromParcel(_reply);
- }
- else {
- _result = null;
- }
- }
- finally {
- _reply.recycle();
- _data.recycle();
- }
- return _result;
- }
- @Override public int consumePurchase(int apiVersion, java.lang.String packageName, java.lang.String purchaseToken) throws android.os.RemoteException
- {
- android.os.Parcel _data = android.os.Parcel.obtain();
- android.os.Parcel _reply = android.os.Parcel.obtain();
- int _result;
- try {
- _data.writeInterfaceToken(DESCRIPTOR);
- _data.writeInt(apiVersion);
- _data.writeString(packageName);
- _data.writeString(purchaseToken);
- mRemote.transact(Stub.TRANSACTION_consumePurchase, _data, _reply, 0);
- _reply.readException();
- _result = _reply.readInt();
- }
- finally {
- _reply.recycle();
- _data.recycle();
- }
- return _result;
- }
- @Override public int stub(int apiVersion, java.lang.String packageName, java.lang.String type) throws android.os.RemoteException
- {
- android.os.Parcel _data = android.os.Parcel.obtain();
- android.os.Parcel _reply = android.os.Parcel.obtain();
- int _result;
- try {
- _data.writeInterfaceToken(DESCRIPTOR);
- _data.writeInt(apiVersion);
- _data.writeString(packageName);
- _data.writeString(type);
- mRemote.transact(Stub.TRANSACTION_stub, _data, _reply, 0);
- _reply.readException();
- _result = _reply.readInt();
- }
- finally {
- _reply.recycle();
- _data.recycle();
- }
- return _result;
- }
- /**
- * Returns a pending intent to launch the purchase flow for upgrading or downgrading a
- * subscription. The existing owned SKU(s) should be provided along with the new SKU that
- * the user is upgrading or downgrading to.
- * @param apiVersion billing API version that the app is using, must be 5 or later
- * @param packageName package name of the calling app
- * @param oldSkus the SKU(s) that the user is upgrading or downgrading from,
- * if null or empty this method will behave like {@link #getBuyIntent}
- * @param newSku the SKU that the user is upgrading or downgrading to
- * @param type of the item being purchased, currently must be "subs"
- * @param developerPayload optional argument to be sent back with the purchase information
- * @return Bundle containing the following key-value pairs
- * "RESPONSE_CODE" with int value, RESULT_OK(0) if success, appropriate response codes
- * on failures.
- * "BUY_INTENT" - PendingIntent to start the purchase flow
- *
- * The Pending intent should be launched with startIntentSenderForResult. When purchase flow
- * has completed, the onActivityResult() will give a resultCode of OK or CANCELED.
- * If the purchase is successful, the result data will contain the following key-value pairs
- * "RESPONSE_CODE" with int value, RESULT_OK(0) if success, appropriate response
- * codes on failures.
- * "INAPP_PURCHASE_DATA" - String in JSON format similar to
- * '{"orderId":"12999763169054705758.1371079406387615",
- * "packageName":"com.example.app",
- * "productId":"exampleSku",
- * "purchaseTime":1345678900000,
- * "purchaseToken" : "122333444455555",
- * "developerPayload":"example developer payload" }'
- * "INAPP_DATA_SIGNATURE" - String containing the signature of the purchase data that
- * was signed with the private key of the developer
- */
- @Override public android.os.Bundle getBuyIntentToReplaceSkus(int apiVersion, java.lang.String packageName, java.util.List oldSkus, java.lang.String newSku, java.lang.String type, java.lang.String developerPayload) throws android.os.RemoteException
- {
- android.os.Parcel _data = android.os.Parcel.obtain();
- android.os.Parcel _reply = android.os.Parcel.obtain();
- android.os.Bundle _result;
- try {
- _data.writeInterfaceToken(DESCRIPTOR);
- _data.writeInt(apiVersion);
- _data.writeString(packageName);
- _data.writeStringList(oldSkus);
- _data.writeString(newSku);
- _data.writeString(type);
- _data.writeString(developerPayload);
- mRemote.transact(Stub.TRANSACTION_getBuyIntentToReplaceSkus, _data, _reply, 0);
- _reply.readException();
- if ((0!=_reply.readInt())) {
- _result = android.os.Bundle.CREATOR.createFromParcel(_reply);
- }
- else {
- _result = null;
- }
- }
- finally {
- _reply.recycle();
- _data.recycle();
- }
- return _result;
- }
- /**
- * Returns a pending intent to launch the purchase flow for an in-app item. This method is
- * a variant of the {@link #getBuyIntent} method and takes an additional {@code extraParams}
- * parameter. This parameter is a Bundle of optional keys and values that affect the
- * operation of the method.
- * @param apiVersion billing API version that the app is using, must be 6 or later
- * @param packageName package name of the calling app
- * @param sku the SKU of the in-app item as published in the developer console
- * @param type of the in-app item being purchased ("inapp" for one-time purchases
- * and "subs" for subscriptions)
- * @param developerPayload optional argument to be sent back with the purchase information
- * @extraParams a Bundle with the following optional keys:
- * "skusToReplace" - List - an optional list of SKUs that the user is
- * upgrading or downgrading from.
- * Pass this field if the purchase is upgrading or downgrading
- * existing subscriptions.
- * The specified SKUs are replaced with the SKUs that the user is
- * purchasing. Google Play replaces the specified SKUs at the start of
- * the next billing cycle.
- * "replaceSkusProration" - Boolean - whether the user should be credited for any unused
- * subscription time on the SKUs they are upgrading or downgrading.
- * If you set this field to true, Google Play swaps out the old SKUs
- * and credits the user with the unused value of their subscription
- * time on a pro-rated basis.
- * Google Play applies this credit to the new subscription, and does
- * not begin billing the user for the new subscription until after
- * the credit is used up.
- * If you set this field to false, the user does not receive credit for
- * any unused subscription time and the recurrence date does not
- * change.
- * Default value is true. Ignored if you do not pass skusToReplace.
- * "accountId" - String - an optional obfuscated string that is uniquely
- * associated with the user's account in your app.
- * If you pass this value, Google Play can use it to detect irregular
- * activity, such as many devices making purchases on the same
- * account in a short period of time.
- * Do not use the developer ID or the user's Google ID for this field.
- * In addition, this field should not contain the user's ID in
- * cleartext.
- * We recommend that you use a one-way hash to generate a string from
- * the user's ID, and store the hashed string in this field.
- * "vr" - Boolean - an optional flag indicating whether the returned intent
- * should start a VR purchase flow. The apiVersion must also be 7 or
- * later to use this flag.
- */
- @Override public android.os.Bundle getBuyIntentExtraParams(int apiVersion, java.lang.String packageName, java.lang.String sku, java.lang.String type, java.lang.String developerPayload, android.os.Bundle extraParams) throws android.os.RemoteException
- {
- android.os.Parcel _data = android.os.Parcel.obtain();
- android.os.Parcel _reply = android.os.Parcel.obtain();
- android.os.Bundle _result;
- try {
- _data.writeInterfaceToken(DESCRIPTOR);
- _data.writeInt(apiVersion);
- _data.writeString(packageName);
- _data.writeString(sku);
- _data.writeString(type);
- _data.writeString(developerPayload);
- if ((extraParams!=null)) {
- _data.writeInt(1);
- extraParams.writeToParcel(_data, 0);
- }
- else {
- _data.writeInt(0);
- }
- mRemote.transact(Stub.TRANSACTION_getBuyIntentExtraParams, _data, _reply, 0);
- _reply.readException();
- if ((0!=_reply.readInt())) {
- _result = android.os.Bundle.CREATOR.createFromParcel(_reply);
- }
- else {
- _result = null;
- }
- }
- finally {
- _reply.recycle();
- _data.recycle();
- }
- return _result;
- }
- /**
- * Returns the most recent purchase made by the user for each SKU, even if that purchase is
- * expired, canceled, or consumed.
- * @param apiVersion billing API version that the app is using, must be 6 or later
- * @param packageName package name of the calling app
- * @param type of the in-app items being requested ("inapp" for one-time purchases
- * and "subs" for subscriptions)
- * @param continuationToken to be set as null for the first call, if the number of owned
- * skus is too large, a continuationToken is returned in the response bundle.
- * This method can be called again with the continuation token to get the next set of
- * owned skus.
- * @param extraParams a Bundle with extra params that would be appended into http request
- * query string. Not used at this moment. Reserved for future functionality.
- * @return Bundle containing the following key-value pairs
- * "RESPONSE_CODE" with int value: RESULT_OK(0) if success,
- * {@link IabHelper#BILLING_RESPONSE_RESULT_*} response codes on failures.
- *
- * "INAPP_PURCHASE_ITEM_LIST" - ArrayList containing the list of SKUs
- * "INAPP_PURCHASE_DATA_LIST" - ArrayList containing the purchase information
- * "INAPP_DATA_SIGNATURE_LIST"- ArrayList containing the signatures
- * of the purchase information
- * "INAPP_CONTINUATION_TOKEN" - String containing a continuation token for the
- * next set of in-app purchases. Only set if the
- * user has more owned skus than the current list.
- */
- @Override public android.os.Bundle getPurchaseHistory(int apiVersion, java.lang.String packageName, java.lang.String type, java.lang.String continuationToken, android.os.Bundle extraParams) throws android.os.RemoteException
- {
- android.os.Parcel _data = android.os.Parcel.obtain();
- android.os.Parcel _reply = android.os.Parcel.obtain();
- android.os.Bundle _result;
- try {
- _data.writeInterfaceToken(DESCRIPTOR);
- _data.writeInt(apiVersion);
- _data.writeString(packageName);
- _data.writeString(type);
- _data.writeString(continuationToken);
- if ((extraParams!=null)) {
- _data.writeInt(1);
- extraParams.writeToParcel(_data, 0);
- }
- else {
- _data.writeInt(0);
- }
- mRemote.transact(Stub.TRANSACTION_getPurchaseHistory, _data, _reply, 0);
- _reply.readException();
- if ((0!=_reply.readInt())) {
- _result = android.os.Bundle.CREATOR.createFromParcel(_reply);
- }
- else {
- _result = null;
- }
- }
- finally {
- _reply.recycle();
- _data.recycle();
- }
- return _result;
- }
- @Override public int isBillingSupportedExtraParams(int apiVersion, java.lang.String packageName, java.lang.String type, android.os.Bundle extraParams) throws android.os.RemoteException
- {
- android.os.Parcel _data = android.os.Parcel.obtain();
- android.os.Parcel _reply = android.os.Parcel.obtain();
- int _result;
- try {
- _data.writeInterfaceToken(DESCRIPTOR);
- _data.writeInt(apiVersion);
- _data.writeString(packageName);
- _data.writeString(type);
- if ((extraParams!=null)) {
- _data.writeInt(1);
- extraParams.writeToParcel(_data, 0);
- }
- else {
- _data.writeInt(0);
- }
- mRemote.transact(Stub.TRANSACTION_isBillingSupportedExtraParams, _data, _reply, 0);
- _reply.readException();
- _result = _reply.readInt();
- }
- finally {
- _reply.recycle();
- _data.recycle();
- }
- return _result;
- }
- }
- static final int TRANSACTION_isBillingSupported = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0);
- static final int TRANSACTION_getSkuDetails = (android.os.IBinder.FIRST_CALL_TRANSACTION + 1);
- static final int TRANSACTION_getBuyIntent = (android.os.IBinder.FIRST_CALL_TRANSACTION + 2);
- static final int TRANSACTION_getPurchases = (android.os.IBinder.FIRST_CALL_TRANSACTION + 3);
- static final int TRANSACTION_consumePurchase = (android.os.IBinder.FIRST_CALL_TRANSACTION + 4);
- static final int TRANSACTION_stub = (android.os.IBinder.FIRST_CALL_TRANSACTION + 5);
- static final int TRANSACTION_getBuyIntentToReplaceSkus = (android.os.IBinder.FIRST_CALL_TRANSACTION + 6);
- static final int TRANSACTION_getBuyIntentExtraParams = (android.os.IBinder.FIRST_CALL_TRANSACTION + 7);
- static final int TRANSACTION_getPurchaseHistory = (android.os.IBinder.FIRST_CALL_TRANSACTION + 8);
- static final int TRANSACTION_isBillingSupportedExtraParams = (android.os.IBinder.FIRST_CALL_TRANSACTION + 9);
- }
- public int isBillingSupported(int apiVersion, java.lang.String packageName, java.lang.String type) throws android.os.RemoteException;
- /**
- * Provides details of a list of SKUs
- * Given a list of SKUs of a valid type in the skusBundle, this returns a bundle
- * with a list JSON strings containing the productId, price, title and description.
- * This API can be called with a maximum of 20 SKUs.
- * @param apiVersion billing API version that the app is using
- * @param packageName the package name of the calling app
- * @param type of the in-app items ("inapp" for one-time purchases
- * and "subs" for subscriptions)
- * @param skusBundle bundle containing a StringArrayList of SKUs with key "ITEM_ID_LIST"
- * @return Bundle containing the following key-value pairs
- * "RESPONSE_CODE" with int value, RESULT_OK(0) if success, appropriate response codes
- * on failures.
- * "DETAILS_LIST" with a StringArrayList containing purchase information
- * in JSON format similar to:
- * '{ "productId" : "exampleSku",
- * "type" : "inapp",
- * "price" : "$5.00",
- * "price_currency": "USD",
- * "price_amount_micros": 5000000,
- * "title : "Example Title",
- * "description" : "This is an example description" }'
- */
- public android.os.Bundle getSkuDetails(int apiVersion, java.lang.String packageName, java.lang.String type, android.os.Bundle skusBundle) throws android.os.RemoteException;
- /**
- * Returns a pending intent to launch the purchase flow for an in-app item by providing a SKU,
- * the type, a unique purchase token and an optional developer payload.
- * @param apiVersion billing API version that the app is using
- * @param packageName package name of the calling app
- * @param sku the SKU of the in-app item as published in the developer console
- * @param type of the in-app item being purchased ("inapp" for one-time purchases
- * and "subs" for subscriptions)
- * @param developerPayload optional argument to be sent back with the purchase information
- * @return Bundle containing the following key-value pairs
- * "RESPONSE_CODE" with int value, RESULT_OK(0) if success, appropriate response codes
- * on failures.
- * "BUY_INTENT" - PendingIntent to start the purchase flow
- *
- * The Pending intent should be launched with startIntentSenderForResult. When purchase flow
- * has completed, the onActivityResult() will give a resultCode of OK or CANCELED.
- * If the purchase is successful, the result data will contain the following key-value pairs
- * "RESPONSE_CODE" with int value, RESULT_OK(0) if success, appropriate response
- * codes on failures.
- * "INAPP_PURCHASE_DATA" - String in JSON format similar to
- * '{"orderId":"12999763169054705758.1371079406387615",
- * "packageName":"com.example.app",
- * "productId":"exampleSku",
- * "purchaseTime":1345678900000,
- * "purchaseToken" : "122333444455555",
- * "developerPayload":"example developer payload" }'
- * "INAPP_DATA_SIGNATURE" - String containing the signature of the purchase data that
- * was signed with the private key of the developer
- */
- public android.os.Bundle getBuyIntent(int apiVersion, java.lang.String packageName, java.lang.String sku, java.lang.String type, java.lang.String developerPayload) throws android.os.RemoteException;
- /**
- * Returns the current SKUs owned by the user of the type and package name specified along with
- * purchase information and a signature of the data to be validated.
- * This will return all SKUs that have been purchased in V3 and managed items purchased using
- * V1 and V2 that have not been consumed.
- * @param apiVersion billing API version that the app is using
- * @param packageName package name of the calling app
- * @param type of the in-app items being requested ("inapp" for one-time purchases
- * and "subs" for subscriptions)
- * @param continuationToken to be set as null for the first call, if the number of owned
- * skus are too many, a continuationToken is returned in the response bundle.
- * This method can be called again with the continuation token to get the next set of
- * owned skus.
- * @return Bundle containing the following key-value pairs
- * "RESPONSE_CODE" with int value, RESULT_OK(0) if success, appropriate response codes
- on failures.
- * "INAPP_PURCHASE_ITEM_LIST" - StringArrayList containing the list of SKUs
- * "INAPP_PURCHASE_DATA_LIST" - StringArrayList containing the purchase information
- * "INAPP_DATA_SIGNATURE_LIST"- StringArrayList containing the signatures
- * of the purchase information
- * "INAPP_CONTINUATION_TOKEN" - String containing a continuation token for the
- * next set of in-app purchases. Only set if the
- * user has more owned skus than the current list.
- */
- public android.os.Bundle getPurchases(int apiVersion, java.lang.String packageName, java.lang.String type, java.lang.String continuationToken) throws android.os.RemoteException;
- public int consumePurchase(int apiVersion, java.lang.String packageName, java.lang.String purchaseToken) throws android.os.RemoteException;
- public int stub(int apiVersion, java.lang.String packageName, java.lang.String type) throws android.os.RemoteException;
- /**
- * Returns a pending intent to launch the purchase flow for upgrading or downgrading a
- * subscription. The existing owned SKU(s) should be provided along with the new SKU that
- * the user is upgrading or downgrading to.
- * @param apiVersion billing API version that the app is using, must be 5 or later
- * @param packageName package name of the calling app
- * @param oldSkus the SKU(s) that the user is upgrading or downgrading from,
- * if null or empty this method will behave like {@link #getBuyIntent}
- * @param newSku the SKU that the user is upgrading or downgrading to
- * @param type of the item being purchased, currently must be "subs"
- * @param developerPayload optional argument to be sent back with the purchase information
- * @return Bundle containing the following key-value pairs
- * "RESPONSE_CODE" with int value, RESULT_OK(0) if success, appropriate response codes
- * on failures.
- * "BUY_INTENT" - PendingIntent to start the purchase flow
- *
- * The Pending intent should be launched with startIntentSenderForResult. When purchase flow
- * has completed, the onActivityResult() will give a resultCode of OK or CANCELED.
- * If the purchase is successful, the result data will contain the following key-value pairs
- * "RESPONSE_CODE" with int value, RESULT_OK(0) if success, appropriate response
- * codes on failures.
- * "INAPP_PURCHASE_DATA" - String in JSON format similar to
- * '{"orderId":"12999763169054705758.1371079406387615",
- * "packageName":"com.example.app",
- * "productId":"exampleSku",
- * "purchaseTime":1345678900000,
- * "purchaseToken" : "122333444455555",
- * "developerPayload":"example developer payload" }'
- * "INAPP_DATA_SIGNATURE" - String containing the signature of the purchase data that
- * was signed with the private key of the developer
- */
- public android.os.Bundle getBuyIntentToReplaceSkus(int apiVersion, java.lang.String packageName, java.util.List oldSkus, java.lang.String newSku, java.lang.String type, java.lang.String developerPayload) throws android.os.RemoteException;
- /**
- * Returns a pending intent to launch the purchase flow for an in-app item. This method is
- * a variant of the {@link #getBuyIntent} method and takes an additional {@code extraParams}
- * parameter. This parameter is a Bundle of optional keys and values that affect the
- * operation of the method.
- * @param apiVersion billing API version that the app is using, must be 6 or later
- * @param packageName package name of the calling app
- * @param sku the SKU of the in-app item as published in the developer console
- * @param type of the in-app item being purchased ("inapp" for one-time purchases
- * and "subs" for subscriptions)
- * @param developerPayload optional argument to be sent back with the purchase information
- * @extraParams a Bundle with the following optional keys:
- * "skusToReplace" - List - an optional list of SKUs that the user is
- * upgrading or downgrading from.
- * Pass this field if the purchase is upgrading or downgrading
- * existing subscriptions.
- * The specified SKUs are replaced with the SKUs that the user is
- * purchasing. Google Play replaces the specified SKUs at the start of
- * the next billing cycle.
- * "replaceSkusProration" - Boolean - whether the user should be credited for any unused
- * subscription time on the SKUs they are upgrading or downgrading.
- * If you set this field to true, Google Play swaps out the old SKUs
- * and credits the user with the unused value of their subscription
- * time on a pro-rated basis.
- * Google Play applies this credit to the new subscription, and does
- * not begin billing the user for the new subscription until after
- * the credit is used up.
- * If you set this field to false, the user does not receive credit for
- * any unused subscription time and the recurrence date does not
- * change.
- * Default value is true. Ignored if you do not pass skusToReplace.
- * "accountId" - String - an optional obfuscated string that is uniquely
- * associated with the user's account in your app.
- * If you pass this value, Google Play can use it to detect irregular
- * activity, such as many devices making purchases on the same
- * account in a short period of time.
- * Do not use the developer ID or the user's Google ID for this field.
- * In addition, this field should not contain the user's ID in
- * cleartext.
- * We recommend that you use a one-way hash to generate a string from
- * the user's ID, and store the hashed string in this field.
- * "vr" - Boolean - an optional flag indicating whether the returned intent
- * should start a VR purchase flow. The apiVersion must also be 7 or
- * later to use this flag.
- */
- public android.os.Bundle getBuyIntentExtraParams(int apiVersion, java.lang.String packageName, java.lang.String sku, java.lang.String type, java.lang.String developerPayload, android.os.Bundle extraParams) throws android.os.RemoteException;
- /**
- * Returns the most recent purchase made by the user for each SKU, even if that purchase is
- * expired, canceled, or consumed.
- * @param apiVersion billing API version that the app is using, must be 6 or later
- * @param packageName package name of the calling app
- * @param type of the in-app items being requested ("inapp" for one-time purchases
- * and "subs" for subscriptions)
- * @param continuationToken to be set as null for the first call, if the number of owned
- * skus is too large, a continuationToken is returned in the response bundle.
- * This method can be called again with the continuation token to get the next set of
- * owned skus.
- * @param extraParams a Bundle with extra params that would be appended into http request
- * query string. Not used at this moment. Reserved for future functionality.
- * @return Bundle containing the following key-value pairs
- * "RESPONSE_CODE" with int value: RESULT_OK(0) if success,
- * {@link IabHelper#BILLING_RESPONSE_RESULT_*} response codes on failures.
- *
- * "INAPP_PURCHASE_ITEM_LIST" - ArrayList containing the list of SKUs
- * "INAPP_PURCHASE_DATA_LIST" - ArrayList containing the purchase information
- * "INAPP_DATA_SIGNATURE_LIST"- ArrayList containing the signatures
- * of the purchase information
- * "INAPP_CONTINUATION_TOKEN" - String containing a continuation token for the
- * next set of in-app purchases. Only set if the
- * user has more owned skus than the current list.
- */
- public android.os.Bundle getPurchaseHistory(int apiVersion, java.lang.String packageName, java.lang.String type, java.lang.String continuationToken, android.os.Bundle extraParams) throws android.os.RemoteException;
- public int isBillingSupportedExtraParams(int apiVersion, java.lang.String packageName, java.lang.String type, android.os.Bundle extraParams) throws android.os.RemoteException;
- }
diff --git a/modules/juce_core/native/java/JuceAppActivity.java b/modules/juce_core/native/java/JuceAppActivity.java
deleted file mode 100644
index 28939a2f9c..0000000000
--- a/modules/juce_core/native/java/JuceAppActivity.java
+++ /dev/null
@@ -1,1806 +0,0 @@
-/*
- ==============================================================================
-
- This file is part of the JUCE library.
- Copyright (c) 2017 - ROLI Ltd.
-
- JUCE is an open source library subject to commercial or open-source
- licensing.
-
- The code included in this file is provided under the terms of the ISC license
- http://www.isc.org/downloads/software-support-policy/isc-license. Permission
- To use, copy, modify, and/or distribute this software for any purpose with or
- without fee is hereby granted provided that the above copyright notice and
- this permission notice appear in all copies.
-
- JUCE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER
- EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE
- DISCLAIMED.
-
- ==============================================================================
-*/
-
-package com.juce;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Configuration;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-$$JuceAndroidCameraImports$$ // If you get an error here, you need to re-save your project with the Projucer!
-$$JuceAndroidVideoImports$$ // If you get an error here, you need to re-save your project with the Projucer!
-import android.net.http.SslError;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Looper;
-import android.os.Handler;
-import android.os.Message;
-import android.os.ParcelUuid;
-import android.os.Environment;
-import android.view.*;
-import android.view.inputmethod.BaseInputConnection;
-import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputConnection;
-import android.view.inputmethod.InputMethodManager;
-import android.graphics.*;
-import android.text.ClipboardManager;
-import android.text.InputType;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.util.Pair;
-import android.webkit.SslErrorHandler;
-import android.webkit.WebChromeClient;
-$$JuceAndroidWebViewImports$$ // If you get an error here, you need to re-save your project with the Projucer!
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import java.lang.Runnable;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.*;
-import java.util.*;
-import java.io.*;
-import java.net.URL;
-import java.net.HttpURLConnection;
-import android.media.AudioManager;
-import android.Manifest;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.Future;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.Callable;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.locks.ReentrantLock;
-import java.util.concurrent.atomic.*;
-$$JuceAndroidMidiImports$$ // If you get an error here, you need to re-save your project with the Projucer!
-
-
-//==============================================================================
-public class JuceAppActivity extends $$JuceAppActivityBaseClass$$
-{
- //==============================================================================
- static
- {
- System.loadLibrary ("juce_jni");
- }
-
- //==============================================================================
- public boolean isPermissionDeclaredInManifest (int permissionID)
- {
- return isPermissionDeclaredInManifest (getAndroidPermissionName (permissionID));
- }
-
- public boolean isPermissionDeclaredInManifest (String permissionToCheck)
- {
- try
- {
- PackageInfo info = getPackageManager().getPackageInfo(getApplicationContext().getPackageName(), PackageManager.GET_PERMISSIONS);
-
- if (info.requestedPermissions != null)
- for (String permission : info.requestedPermissions)
- if (permission.equals (permissionToCheck))
- return true;
- }
- catch (PackageManager.NameNotFoundException e)
- {
- Log.d ("JUCE", "isPermissionDeclaredInManifest: PackageManager.NameNotFoundException = " + e.toString());
- }
-
- Log.d ("JUCE", "isPermissionDeclaredInManifest: could not find requested permission " + permissionToCheck);
- return false;
- }
-
- //==============================================================================
- // these have to match the values of enum PermissionID in C++ class RuntimePermissions:
- private static final int JUCE_PERMISSIONS_RECORD_AUDIO = 1;
- private static final int JUCE_PERMISSIONS_BLUETOOTH_MIDI = 2;
- private static final int JUCE_PERMISSIONS_READ_EXTERNAL_STORAGE = 3;
- private static final int JUCE_PERMISSIONS_WRITE_EXTERNAL_STORAGE = 4;
- private static final int JUCE_PERMISSIONS_CAMERA = 5;
-
- private static String getAndroidPermissionName (int permissionID)
- {
- switch (permissionID)
- {
- case JUCE_PERMISSIONS_RECORD_AUDIO: return Manifest.permission.RECORD_AUDIO;
- case JUCE_PERMISSIONS_BLUETOOTH_MIDI: return Manifest.permission.ACCESS_COARSE_LOCATION;
- // use string value as this is not defined in SDKs < 16
- case JUCE_PERMISSIONS_READ_EXTERNAL_STORAGE: return "android.permission.READ_EXTERNAL_STORAGE";
- case JUCE_PERMISSIONS_WRITE_EXTERNAL_STORAGE: return Manifest.permission.WRITE_EXTERNAL_STORAGE;
- case JUCE_PERMISSIONS_CAMERA: return Manifest.permission.CAMERA;
- }
-
- // unknown permission ID!
- assert false;
- return new String();
- }
-
- public boolean isPermissionGranted (int permissionID)
- {
- return getApplicationContext().checkCallingOrSelfPermission (getAndroidPermissionName (permissionID)) == PackageManager.PERMISSION_GRANTED;
- }
-
- private Map permissionCallbackPtrMap;
-
- public void requestRuntimePermission (int permissionID, long ptrToCallback)
- {
- String permissionName = getAndroidPermissionName (permissionID);
-
- if (getApplicationContext().checkCallingOrSelfPermission (permissionName) != PackageManager.PERMISSION_GRANTED)
- {
- // remember callbackPtr, request permissions, and let onRequestPermissionResult call callback asynchronously
- permissionCallbackPtrMap.put (permissionID, ptrToCallback);
- requestPermissionsCompat (new String[]{permissionName}, permissionID);
- }
- else
- {
- // permissions were already granted before, we can call callback directly
- androidRuntimePermissionsCallback (true, ptrToCallback);
- }
- }
-
- private native void androidRuntimePermissionsCallback (boolean permissionWasGranted, long ptrToCallback);
-
- $$JuceAndroidRuntimePermissionsCode$$ // If you get an error here, you need to re-save your project with the Projucer!
-
- //==============================================================================
- public interface JuceMidiPort
- {
- boolean isInputPort();
-
- // start, stop does nothing on an output port
- void start();
- void stop();
-
- void close();
-
- // send will do nothing on an input port
- void sendMidi (byte[] msg, int offset, int count);
- }
-
- //==============================================================================
- $$JuceAndroidMidiCode$$ // If you get an error here, you need to re-save your project with the Projucer!
-
- //==============================================================================
- @Override
- public void onCreate (Bundle savedInstanceState)
- {
- super.onCreate (savedInstanceState);
-
- isScreenSaverEnabled = true;
- hideActionBar();
- viewHolder = new ViewHolder (this);
- setContentView (viewHolder);
-
- setVolumeControlStream (AudioManager.STREAM_MUSIC);
-
- permissionCallbackPtrMap = new HashMap();
- appPausedResumedListeners = new HashMap();
- }
-
- @Override
- protected void onDestroy()
- {
- quitApp();
- super.onDestroy();
-
- clearDataCache();
- }
-
- @Override
- protected void onPause()
- {
- suspendApp();
-
- Long[] keys = appPausedResumedListeners.keySet().toArray (new Long[appPausedResumedListeners.keySet().size()]);
-
- for (Long k : keys)
- appPausedResumedListeners.get (k).appPaused();
-
- try
- {
- Thread.sleep (1000); // This is a bit of a hack to avoid some hard-to-track-down
- // openGL glitches when pausing/resuming apps..
- } catch (InterruptedException e) {}
-
- super.onPause();
- }
-
- @Override
- protected void onResume()
- {
- super.onResume();
- resumeApp();
-
- Long[] keys = appPausedResumedListeners.keySet().toArray (new Long[appPausedResumedListeners.keySet().size()]);
-
- for (Long k : keys)
- appPausedResumedListeners.get (k).appResumed();
- }
-
- @Override
- public void onConfigurationChanged (Configuration cfg)
- {
- super.onConfigurationChanged (cfg);
- setContentView (viewHolder);
- }
-
- private void callAppLauncher()
- {
- launchApp (getApplicationInfo().publicSourceDir,
- getApplicationInfo().dataDir);
- }
-
- // Need to override this as the default implementation always finishes the activity.
- @Override
- public void onBackPressed()
- {
- ComponentPeerView focusedView = getViewWithFocusOrDefaultView();
-
- if (focusedView == null)
- return;
-
- focusedView.backButtonPressed();
- }
-
- private ComponentPeerView getViewWithFocusOrDefaultView()
- {
- for (int i = 0; i < viewHolder.getChildCount(); ++i)
- {
- if (viewHolder.getChildAt (i).hasFocus())
- return (ComponentPeerView) viewHolder.getChildAt (i);
- }
-
- if (viewHolder.getChildCount() > 0)
- return (ComponentPeerView) viewHolder.getChildAt (0);
-
- return null;
- }
-
- //==============================================================================
- private void hideActionBar()
- {
- // get "getActionBar" method
- java.lang.reflect.Method getActionBarMethod = null;
- try
- {
- getActionBarMethod = this.getClass().getMethod ("getActionBar");
- }
- catch (SecurityException e) { return; }
- catch (NoSuchMethodException e) { return; }
- if (getActionBarMethod == null) return;
-
- // invoke "getActionBar" method
- Object actionBar = null;
- try
- {
- actionBar = getActionBarMethod.invoke (this);
- }
- catch (java.lang.IllegalArgumentException e) { return; }
- catch (java.lang.IllegalAccessException e) { return; }
- catch (java.lang.reflect.InvocationTargetException e) { return; }
- if (actionBar == null) return;
-
- // get "hide" method
- java.lang.reflect.Method actionBarHideMethod = null;
- try
- {
- actionBarHideMethod = actionBar.getClass().getMethod ("hide");
- }
- catch (SecurityException e) { return; }
- catch (NoSuchMethodException e) { return; }
- if (actionBarHideMethod == null) return;
-
- // invoke "hide" method
- try
- {
- actionBarHideMethod.invoke (actionBar);
- }
- catch (java.lang.IllegalArgumentException e) {}
- catch (java.lang.IllegalAccessException e) {}
- catch (java.lang.reflect.InvocationTargetException e) {}
- }
-
- void requestPermissionsCompat (String[] permissions, int requestCode)
- {
- Method requestPermissionsMethod = null;
- try
- {
- requestPermissionsMethod = this.getClass().getMethod ("requestPermissions",
- String[].class, int.class);
- }
- catch (SecurityException e) { return; }
- catch (NoSuchMethodException e) { return; }
- if (requestPermissionsMethod == null) return;
-
- try
- {
- requestPermissionsMethod.invoke (this, permissions, requestCode);
- }
- catch (java.lang.IllegalArgumentException e) {}
- catch (java.lang.IllegalAccessException e) {}
- catch (java.lang.reflect.InvocationTargetException e) {}
- }
-
- //==============================================================================
- private native void launchApp (String appFile, String appDataDir);
- private native void quitApp();
- private native void suspendApp();
- private native void resumeApp();
- private native void setScreenSize (int screenWidth, int screenHeight, int dpi);
- private native void appActivityResult (int requestCode, int resultCode, Intent data);
- private native void appNewIntent (Intent intent);
-
- //==============================================================================
- private ViewHolder viewHolder;
- private MidiDeviceManager midiDeviceManager = null;
- private BluetoothManager bluetoothManager = null;
- private boolean isScreenSaverEnabled;
- private java.util.Timer keepAliveTimer;
-
- public final ComponentPeerView createNewView (boolean opaque, long host)
- {
- ComponentPeerView v = new ComponentPeerView (this, opaque, host);
- viewHolder.addView (v);
- addAppPausedResumedListener (v, host);
- return v;
- }
-
- public final void deleteView (ComponentPeerView view)
- {
- removeAppPausedResumedListener (view, view.host);
-
- view.host = 0;
-
- ViewGroup group = (ViewGroup) (view.getParent());
-
- if (group != null)
- group.removeView (view);
- }
-
- public final void deleteNativeSurfaceView (NativeSurfaceView view)
- {
- ViewGroup group = (ViewGroup) (view.getParent());
-
- if (group != null)
- group.removeView (view);
- }
-
- final class ViewHolder extends ViewGroup
- {
- public ViewHolder (Context context)
- {
- super (context);
- setDescendantFocusability (ViewGroup.FOCUS_AFTER_DESCENDANTS);
- setFocusable (false);
- }
-
- protected final void onLayout (boolean changed, int left, int top, int right, int bottom)
- {
- setScreenSize (getWidth(), getHeight(), getDPI());
-
- if (isFirstResize)
- {
- isFirstResize = false;
- callAppLauncher();
- }
- }
-
- private final int getDPI()
- {
- DisplayMetrics metrics = new DisplayMetrics();
- getWindowManager().getDefaultDisplay().getMetrics (metrics);
- return metrics.densityDpi;
- }
-
- private boolean isFirstResize = true;
- }
-
- public final void excludeClipRegion (android.graphics.Canvas canvas, float left, float top, float right, float bottom)
- {
- canvas.clipRect (left, top, right, bottom, android.graphics.Region.Op.DIFFERENCE);
- }
-
- //==============================================================================
- public final void setScreenSaver (boolean enabled)
- {
- if (isScreenSaverEnabled != enabled)
- {
- isScreenSaverEnabled = enabled;
-
- if (keepAliveTimer != null)
- {
- keepAliveTimer.cancel();
- keepAliveTimer = null;
- }
-
- if (enabled)
- {
- getWindow().clearFlags (WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
- }
- else
- {
- getWindow().addFlags (WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-
- // If no user input is received after about 3 seconds, the OS will lower the
- // task's priority, so this timer forces it to be kept active.
- keepAliveTimer = new java.util.Timer();
-
- keepAliveTimer.scheduleAtFixedRate (new TimerTask()
- {
- @Override
- public void run()
- {
- android.app.Instrumentation instrumentation = new android.app.Instrumentation();
-
- try
- {
- instrumentation.sendKeyDownUpSync (KeyEvent.KEYCODE_UNKNOWN);
- }
- catch (Exception e)
- {
- }
- }
- }, 2000, 2000);
- }
- }
- }
-
- public final boolean getScreenSaver()
- {
- return isScreenSaverEnabled;
- }
-
- //==============================================================================
- public final String getClipboardContent()
- {
- ClipboardManager clipboard = (ClipboardManager) getSystemService (CLIPBOARD_SERVICE);
-
- CharSequence content = clipboard.getText();
- return content != null ? content.toString() : new String();
- }
-
- public final void setClipboardContent (String newText)
- {
- ClipboardManager clipboard = (ClipboardManager) getSystemService (CLIPBOARD_SERVICE);
- clipboard.setText (newText);
- }
-
- //==============================================================================
- public final void showMessageBox (String title, String message, final long callback)
- {
- AlertDialog.Builder builder = new AlertDialog.Builder (this);
- builder.setTitle (title)
- .setMessage (message)
- .setCancelable (true)
- .setOnCancelListener (new DialogInterface.OnCancelListener()
- {
- public void onCancel (DialogInterface dialog)
- {
- JuceAppActivity.this.alertDismissed (callback, 0);
- }
- })
- .setPositiveButton ("OK", new DialogInterface.OnClickListener()
- {
- public void onClick (DialogInterface dialog, int id)
- {
- dialog.dismiss();
- JuceAppActivity.this.alertDismissed (callback, 0);
- }
- });
-
- builder.create().show();
- }
-
- public final void showOkCancelBox (String title, String message, final long callback,
- String okButtonText, String cancelButtonText)
- {
- AlertDialog.Builder builder = new AlertDialog.Builder (this);
- builder.setTitle (title)
- .setMessage (message)
- .setCancelable (true)
- .setOnCancelListener (new DialogInterface.OnCancelListener()
- {
- public void onCancel (DialogInterface dialog)
- {
- JuceAppActivity.this.alertDismissed (callback, 0);
- }
- })
- .setPositiveButton (okButtonText.isEmpty() ? "OK" : okButtonText, new DialogInterface.OnClickListener()
- {
- public void onClick (DialogInterface dialog, int id)
- {
- dialog.dismiss();
- JuceAppActivity.this.alertDismissed (callback, 1);
- }
- })
- .setNegativeButton (cancelButtonText.isEmpty() ? "Cancel" : cancelButtonText, new DialogInterface.OnClickListener()
- {
- public void onClick (DialogInterface dialog, int id)
- {
- dialog.dismiss();
- JuceAppActivity.this.alertDismissed (callback, 0);
- }
- });
-
- builder.create().show();
- }
-
- public final void showYesNoCancelBox (String title, String message, final long callback)
- {
- AlertDialog.Builder builder = new AlertDialog.Builder (this);
- builder.setTitle (title)
- .setMessage (message)
- .setCancelable (true)
- .setOnCancelListener (new DialogInterface.OnCancelListener()
- {
- public void onCancel (DialogInterface dialog)
- {
- JuceAppActivity.this.alertDismissed (callback, 0);
- }
- })
- .setPositiveButton ("Yes", new DialogInterface.OnClickListener()
- {
- public void onClick (DialogInterface dialog, int id)
- {
- dialog.dismiss();
- JuceAppActivity.this.alertDismissed (callback, 1);
- }
- })
- .setNegativeButton ("No", new DialogInterface.OnClickListener()
- {
- public void onClick (DialogInterface dialog, int id)
- {
- dialog.dismiss();
- JuceAppActivity.this.alertDismissed (callback, 2);
- }
- })
- .setNeutralButton ("Cancel", new DialogInterface.OnClickListener()
- {
- public void onClick (DialogInterface dialog, int id)
- {
- dialog.dismiss();
- JuceAppActivity.this.alertDismissed (callback, 0);
- }
- });
-
- builder.create().show();
- }
-
- public native void alertDismissed (long callback, int id);
-
- //==============================================================================
- public interface AppPausedResumedListener
- {
- void appPaused();
- void appResumed();
- }
-
- private Map appPausedResumedListeners;
-
- public void addAppPausedResumedListener (AppPausedResumedListener l, long listenerHost)
- {
- appPausedResumedListeners.put (new Long (listenerHost), l);
- }
-
- public void removeAppPausedResumedListener (AppPausedResumedListener l, long listenerHost)
- {
- appPausedResumedListeners.remove (new Long (listenerHost));
- }
-
- //==============================================================================
- public final class ComponentPeerView extends ViewGroup
- implements View.OnFocusChangeListener, AppPausedResumedListener
- {
- public ComponentPeerView (Context context, boolean opaque_, long host)
- {
- super (context);
- this.host = host;
- setWillNotDraw (false);
- opaque = opaque_;
-
- setFocusable (true);
- setFocusableInTouchMode (true);
- setOnFocusChangeListener (this);
-
- // swap red and blue colours to match internal opengl texture format
- ColorMatrix colorMatrix = new ColorMatrix();
-
- float[] colorTransform = { 0, 0, 1.0f, 0, 0,
- 0, 1.0f, 0, 0, 0,
- 1.0f, 0, 0, 0, 0,
- 0, 0, 0, 1.0f, 0 };
-
- colorMatrix.set (colorTransform);
- paint.setColorFilter (new ColorMatrixColorFilter (colorMatrix));
-
- java.lang.reflect.Method method = null;
-
- try
- {
- method = getClass().getMethod ("setLayerType", int.class, Paint.class);
- }
- catch (SecurityException e) {}
- catch (NoSuchMethodException e) {}
-
- if (method != null)
- {
- try
- {
- int layerTypeNone = 0;
- method.invoke (this, layerTypeNone, null);
- }
- catch (java.lang.IllegalArgumentException e) {}
- catch (java.lang.IllegalAccessException e) {}
- catch (java.lang.reflect.InvocationTargetException e) {}
- }
- }
-
- //==============================================================================
- private native void handlePaint (long host, Canvas canvas, Paint paint);
-
- @Override
- public void onDraw (Canvas canvas)
- {
- if (host == 0)
- return;
-
- handlePaint (host, canvas, paint);
- }
-
- @Override
- public boolean isOpaque()
- {
- return opaque;
- }
-
- private boolean opaque;
- private long host;
- private Paint paint = new Paint();
-
- //==============================================================================
- private native void handleMouseDown (long host, int index, float x, float y, long time);
- private native void handleMouseDrag (long host, int index, float x, float y, long time);
- private native void handleMouseUp (long host, int index, float x, float y, long time);
-
- @Override
- public boolean onTouchEvent (MotionEvent event)
- {
- if (host == 0)
- return false;
-
- int action = event.getAction();
- long time = event.getEventTime();
-
- switch (action & MotionEvent.ACTION_MASK)
- {
- case MotionEvent.ACTION_DOWN:
- handleMouseDown (host, event.getPointerId(0), event.getX(), event.getY(), time);
- return true;
-
- case MotionEvent.ACTION_CANCEL:
- case MotionEvent.ACTION_UP:
- handleMouseUp (host, event.getPointerId(0), event.getX(), event.getY(), time);
- return true;
-
- case MotionEvent.ACTION_MOVE:
- {
- int n = event.getPointerCount();
- for (int i = 0; i < n; ++i)
- handleMouseDrag (host, event.getPointerId(i), event.getX(i), event.getY(i), time);
-
- return true;
- }
-
- case MotionEvent.ACTION_POINTER_UP:
- {
- int i = (action & MotionEvent.ACTION_POINTER_INDEX_MASK) >> MotionEvent.ACTION_POINTER_INDEX_SHIFT;
- handleMouseUp (host, event.getPointerId(i), event.getX(i), event.getY(i), time);
- return true;
- }
-
- case MotionEvent.ACTION_POINTER_DOWN:
- {
- int i = (action & MotionEvent.ACTION_POINTER_INDEX_MASK) >> MotionEvent.ACTION_POINTER_INDEX_SHIFT;
- handleMouseDown (host, event.getPointerId(i), event.getX(i), event.getY(i), time);
- return true;
- }
-
- default:
- break;
- }
-
- return false;
- }
-
- //==============================================================================
- private native void handleKeyDown (long host, int keycode, int textchar);
- private native void handleKeyUp (long host, int keycode, int textchar);
- private native void handleBackButton (long host);
- private native void handleKeyboardHidden (long host);
-
- public void showKeyboard (String type)
- {
- InputMethodManager imm = (InputMethodManager) getSystemService (Context.INPUT_METHOD_SERVICE);
-
- if (imm != null)
- {
- if (type.length() > 0)
- {
- imm.showSoftInput (this, android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT);
- imm.setInputMethod (getWindowToken(), type);
- keyboardDismissListener.startListening();
- }
- else
- {
- imm.hideSoftInputFromWindow (getWindowToken(), 0);
- keyboardDismissListener.stopListening();
- }
- }
- }
-
- public void backButtonPressed()
- {
- if (host == 0)
- return;
-
- handleBackButton (host);
- }
-
- @Override
- public boolean onKeyDown (int keyCode, KeyEvent event)
- {
- if (host == 0)
- return false;
-
- switch (keyCode)
- {
- case KeyEvent.KEYCODE_VOLUME_UP:
- case KeyEvent.KEYCODE_VOLUME_DOWN:
- return super.onKeyDown (keyCode, event);
- case KeyEvent.KEYCODE_BACK:
- {
- ((Activity) getContext()).onBackPressed();
- return true;
- }
-
- default:
- break;
- }
-
- handleKeyDown (host, keyCode, event.getUnicodeChar());
- return true;
- }
-
- @Override
- public boolean onKeyUp (int keyCode, KeyEvent event)
- {
- if (host == 0)
- return false;
-
- handleKeyUp (host, keyCode, event.getUnicodeChar());
- return true;
- }
-
- @Override
- public boolean onKeyMultiple (int keyCode, int count, KeyEvent event)
- {
- if (host == 0)
- return false;
-
- if (keyCode != KeyEvent.KEYCODE_UNKNOWN || event.getAction() != KeyEvent.ACTION_MULTIPLE)
- return super.onKeyMultiple (keyCode, count, event);
-
- if (event.getCharacters() != null)
- {
- int utf8Char = event.getCharacters().codePointAt (0);
- handleKeyDown (host, utf8Char, utf8Char);
- return true;
- }
-
- return false;
- }
-
- //==============================================================================
- private final class KeyboardDismissListener
- {
- public KeyboardDismissListener (ComponentPeerView viewToUse)
- {
- view = viewToUse;
- }
-
- private void startListening()
- {
- view.getViewTreeObserver().addOnGlobalLayoutListener(viewTreeObserver);
- }
-
- private void stopListening()
- {
- view.getViewTreeObserver().removeGlobalOnLayoutListener(viewTreeObserver);
- }
-
- private class TreeObserver implements ViewTreeObserver.OnGlobalLayoutListener
- {
- TreeObserver()
- {
- keyboardShown = false;
- }
-
- @Override
- public void onGlobalLayout()
- {
- Rect r = new Rect();
-
- ViewGroup parentView = (ViewGroup) getParent();
-
- if (parentView == null)
- return;
-
- parentView.getWindowVisibleDisplayFrame (r);
-
- int diff = parentView.getHeight() - (r.bottom - r.top);
-
- // Arbitrary threshold, surely keyboard would take more than 20 pix.
- if (diff < 20 && keyboardShown)
- {
- keyboardShown = false;
- handleKeyboardHidden (view.host);
- }
-
- if (! keyboardShown && diff > 20)
- keyboardShown = true;
- };
-
- private boolean keyboardShown;
- };
-
- private ComponentPeerView view;
- private TreeObserver viewTreeObserver = new TreeObserver();
- }
-
- private KeyboardDismissListener keyboardDismissListener = new KeyboardDismissListener(this);
-
- // this is here to make keyboard entry work on a Galaxy Tab2 10.1
- @Override
- public InputConnection onCreateInputConnection (EditorInfo outAttrs)
- {
- outAttrs.actionLabel = "";
- outAttrs.hintText = "";
- outAttrs.initialCapsMode = 0;
- outAttrs.initialSelEnd = outAttrs.initialSelStart = -1;
- outAttrs.label = "";
- outAttrs.imeOptions = EditorInfo.IME_ACTION_DONE | EditorInfo.IME_FLAG_NO_EXTRACT_UI;
- outAttrs.inputType = InputType.TYPE_NULL;
-
- return new BaseInputConnection (this, false);
- }
-
- //==============================================================================
- @Override
- protected void onSizeChanged (int w, int h, int oldw, int oldh)
- {
- if (host == 0)
- return;
-
- super.onSizeChanged (w, h, oldw, oldh);
- viewSizeChanged (host);
- }
-
- @Override
- protected void onLayout (boolean changed, int left, int top, int right, int bottom)
- {
- for (int i = getChildCount(); --i >= 0;)
- requestTransparentRegion (getChildAt (i));
- }
-
- private native void viewSizeChanged (long host);
-
- @Override
- public void onFocusChange (View v, boolean hasFocus)
- {
- if (host == 0)
- return;
-
- if (v == this)
- focusChanged (host, hasFocus);
- }
-
- private native void focusChanged (long host, boolean hasFocus);
-
- public void setViewName (String newName) {}
-
- public void setSystemUiVisibilityCompat (int visibility)
- {
- Method systemUIVisibilityMethod = null;
- try
- {
- systemUIVisibilityMethod = this.getClass().getMethod ("setSystemUiVisibility", int.class);
- }
- catch (SecurityException e) { return; }
- catch (NoSuchMethodException e) { return; }
- if (systemUIVisibilityMethod == null) return;
-
- try
- {
- systemUIVisibilityMethod.invoke (this, visibility);
- }
- catch (java.lang.IllegalArgumentException e) {}
- catch (java.lang.IllegalAccessException e) {}
- catch (java.lang.reflect.InvocationTargetException e) {}
- }
-
- public boolean isVisible() { return getVisibility() == VISIBLE; }
- public void setVisible (boolean b) { setVisibility (b ? VISIBLE : INVISIBLE); }
-
- public boolean containsPoint (int x, int y)
- {
- return true; //xxx needs to check overlapping views
- }
-
- //==============================================================================
- private native void handleAppPaused (long host);
- private native void handleAppResumed (long host);
-
- @Override
- public void appPaused()
- {
- if (host == 0)
- return;
-
- handleAppPaused (host);
- }
-
- @Override
- public void appResumed()
- {
- if (host == 0)
- return;
-
- // Ensure that navigation/status bar visibility is correctly restored.
- handleAppResumed (host);
- }
- }
-
- //==============================================================================
- public static class NativeSurfaceView extends SurfaceView
- implements SurfaceHolder.Callback
- {
- private long nativeContext = 0;
- private boolean forVideo;
-
- NativeSurfaceView (Context context, long nativeContextPtr, boolean createdForVideo)
- {
- super (context);
- nativeContext = nativeContextPtr;
- forVideo = createdForVideo;
- }
-
- public Surface getNativeSurface()
- {
- Surface retval = null;
-
- SurfaceHolder holder = getHolder();
- if (holder != null)
- retval = holder.getSurface();
-
- return retval;
- }
-
- //==============================================================================
- @Override
- public void surfaceChanged (SurfaceHolder holder, int format, int width, int height)
- {
- if (forVideo)
- surfaceChangedNativeVideo (nativeContext, holder, format, width, height);
- else
- surfaceChangedNative (nativeContext, holder, format, width, height);
- }
-
- @Override
- public void surfaceCreated (SurfaceHolder holder)
- {
- if (forVideo)
- surfaceCreatedNativeVideo (nativeContext, holder);
- else
- surfaceCreatedNative (nativeContext, holder);
- }
-
- @Override
- public void surfaceDestroyed (SurfaceHolder holder)
- {
- if (forVideo)
- surfaceDestroyedNativeVideo (nativeContext, holder);
- else
- surfaceDestroyedNative (nativeContext, holder);
- }
-
- @Override
- protected void dispatchDraw (Canvas canvas)
- {
- super.dispatchDraw (canvas);
-
- if (forVideo)
- dispatchDrawNativeVideo (nativeContext, canvas);
- else
- dispatchDrawNative (nativeContext, canvas);
- }
-
- //==============================================================================
- @Override
- protected void onAttachedToWindow()
- {
- super.onAttachedToWindow();
- getHolder().addCallback (this);
- }
-
- @Override
- protected void onDetachedFromWindow()
- {
- super.onDetachedFromWindow();
- getHolder().removeCallback (this);
- }
-
- //==============================================================================
- private native void dispatchDrawNative (long nativeContextPtr, Canvas canvas);
- private native void surfaceCreatedNative (long nativeContextptr, SurfaceHolder holder);
- private native void surfaceDestroyedNative (long nativeContextptr, SurfaceHolder holder);
- private native void surfaceChangedNative (long nativeContextptr, SurfaceHolder holder,
- int format, int width, int height);
-
- private native void dispatchDrawNativeVideo (long nativeContextPtr, Canvas canvas);
- private native void surfaceCreatedNativeVideo (long nativeContextptr, SurfaceHolder holder);
- private native void surfaceDestroyedNativeVideo (long nativeContextptr, SurfaceHolder holder);
- private native void surfaceChangedNativeVideo (long nativeContextptr, SurfaceHolder holder,
- int format, int width, int height);
- }
-
- public NativeSurfaceView createNativeSurfaceView (long nativeSurfacePtr, boolean forVideo)
- {
- return new NativeSurfaceView (this, nativeSurfacePtr, forVideo);
- }
-
- //==============================================================================
- public final int[] renderGlyph (char glyph1, char glyph2, Paint paint, android.graphics.Matrix matrix, Rect bounds)
- {
- Path p = new Path();
-
- char[] str = { glyph1, glyph2 };
- paint.getTextPath (str, 0, (glyph2 != 0 ? 2 : 1), 0.0f, 0.0f, p);
-
- RectF boundsF = new RectF();
- p.computeBounds (boundsF, true);
- matrix.mapRect (boundsF);
-
- boundsF.roundOut (bounds);
- bounds.left--;
- bounds.right++;
-
- final int w = bounds.width();
- final int h = Math.max (1, bounds.height());
-
- Bitmap bm = Bitmap.createBitmap (w, h, Bitmap.Config.ARGB_8888);
-
- Canvas c = new Canvas (bm);
- matrix.postTranslate (-bounds.left, -bounds.top);
- c.setMatrix (matrix);
- c.drawPath (p, paint);
-
- final int sizeNeeded = w * h;
- if (cachedRenderArray.length < sizeNeeded)
- cachedRenderArray = new int [sizeNeeded];
-
- bm.getPixels (cachedRenderArray, 0, w, 0, 0, w, h);
- bm.recycle();
- return cachedRenderArray;
- }
-
- private int[] cachedRenderArray = new int [256];
-
- //==============================================================================
- public static class NativeInvocationHandler implements InvocationHandler
- {
- public NativeInvocationHandler (Activity activityToUse, long nativeContextRef)
- {
- activity = activityToUse;
- nativeContext = nativeContextRef;
- }
-
- public void nativeContextDeleted()
- {
- nativeContext = 0;
- }
-
- @Override
- public void finalize()
- {
- activity.runOnUiThread (new Runnable()
- {
- @Override
- public void run()
- {
- if (nativeContext != 0)
- dispatchFinalize (nativeContext);
- }
- });
- }
-
- @Override
- public Object invoke (Object proxy, Method method, Object[] args) throws Throwable
- {
- return dispatchInvoke (nativeContext, proxy, method, args);
- }
-
- //==============================================================================
- Activity activity;
- private long nativeContext = 0;
-
- private native void dispatchFinalize (long nativeContextRef);
- private native Object dispatchInvoke (long nativeContextRef, Object proxy, Method method, Object[] args);
- }
-
- public InvocationHandler createInvocationHandler (long nativeContextRef)
- {
- return new NativeInvocationHandler (this, nativeContextRef);
- }
-
- public void invocationHandlerContextDeleted (InvocationHandler handler)
- {
- ((NativeInvocationHandler) handler).nativeContextDeleted();
- }
-
- //==============================================================================
- public static class HTTPStream
- {
- public HTTPStream (String address, boolean isPostToUse, byte[] postDataToUse,
- String headersToUse, int timeOutMsToUse,
- int[] statusCodeToUse, StringBuffer responseHeadersToUse,
- int numRedirectsToFollowToUse, String httpRequestCmdToUse) throws IOException
- {
- isPost = isPostToUse;
- postData = postDataToUse;
- headers = headersToUse;
- timeOutMs = timeOutMsToUse;
- statusCode = statusCodeToUse;
- responseHeaders = responseHeadersToUse;
- totalLength = -1;
- numRedirectsToFollow = numRedirectsToFollowToUse;
- httpRequestCmd = httpRequestCmdToUse;
-
- connection = createConnection (address, isPost, postData, headers, timeOutMs, httpRequestCmd);
- }
-
- private final HttpURLConnection createConnection (String address, boolean isPost, byte[] postData,
- String headers, int timeOutMs, String httpRequestCmdToUse) throws IOException
- {
- HttpURLConnection newConnection = (HttpURLConnection) (new URL(address).openConnection());
-
- try
- {
- newConnection.setInstanceFollowRedirects (false);
- newConnection.setConnectTimeout (timeOutMs);
- newConnection.setReadTimeout (timeOutMs);
-
- // headers - if not empty, this string is appended onto the headers that are used for the request. It must therefore be a valid set of HTML header directives, separated by newlines.
- // So convert headers string to an array, with an element for each line
- String headerLines[] = headers.split("\\n");
-
- // Set request headers
- for (int i = 0; i < headerLines.length; ++i)
- {
- int pos = headerLines[i].indexOf (":");
-
- if (pos > 0 && pos < headerLines[i].length())
- {
- String field = headerLines[i].substring (0, pos);
- String value = headerLines[i].substring (pos + 1);
-
- if (value.length() > 0)
- newConnection.setRequestProperty (field, value);
- }
- }
-
- newConnection.setRequestMethod (httpRequestCmd);
-
- if (isPost)
- {
- newConnection.setDoOutput (true);
-
- if (postData != null)
- {
- OutputStream out = newConnection.getOutputStream();
- out.write(postData);
- out.flush();
- }
- }
-
- return newConnection;
- }
- catch (Throwable e)
- {
- newConnection.disconnect();
- throw new IOException ("Connection error");
- }
- }
-
- private final InputStream getCancellableStream (final boolean isInput) throws ExecutionException
- {
- synchronized (createFutureLock)
- {
- if (hasBeenCancelled.get())
- return null;
-
- streamFuture = executor.submit (new Callable()
- {
- @Override
- public BufferedInputStream call() throws IOException
- {
- return new BufferedInputStream (isInput ? connection.getInputStream()
- : connection.getErrorStream());
- }
- });
- }
-
- try
- {
- return streamFuture.get();
- }
- catch (InterruptedException e)
- {
- return null;
- }
- catch (CancellationException e)
- {
- return null;
- }
- }
-
- public final boolean connect()
- {
- boolean result = false;
- int numFollowedRedirects = 0;
-
- while (true)
- {
- result = doConnect();
-
- if (! result)
- return false;
-
- if (++numFollowedRedirects > numRedirectsToFollow)
- break;
-
- int status = statusCode[0];
-
- if (status == 301 || status == 302 || status == 303 || status == 307)
- {
- // Assumes only one occurrence of "Location"
- int pos1 = responseHeaders.indexOf ("Location:") + 10;
- int pos2 = responseHeaders.indexOf ("\n", pos1);
-
- if (pos2 > pos1)
- {
- String currentLocation = connection.getURL().toString();
- String newLocation = responseHeaders.substring (pos1, pos2);
-
- try
- {
- // Handle newLocation whether it's absolute or relative
- URL baseUrl = new URL (currentLocation);
- URL newUrl = new URL (baseUrl, newLocation);
- String transformedNewLocation = newUrl.toString();
-
- if (transformedNewLocation != currentLocation)
- {
- // Clear responseHeaders before next iteration
- responseHeaders.delete (0, responseHeaders.length());
-
- synchronized (createStreamLock)
- {
- if (hasBeenCancelled.get())
- return false;
-
- connection.disconnect();
-
- try
- {
- connection = createConnection (transformedNewLocation, isPost,
- postData, headers, timeOutMs,
- httpRequestCmd);
- }
- catch (Throwable e)
- {
- return false;
- }
- }
- }
- else
- {
- break;
- }
- }
- catch (Throwable e)
- {
- return false;
- }
- }
- else
- {
- break;
- }
- }
- else
- {
- break;
- }
- }
-
- return result;
- }
-
- private final boolean doConnect()
- {
- synchronized (createStreamLock)
- {
- if (hasBeenCancelled.get())
- return false;
-
- try
- {
- try
- {
- inputStream = getCancellableStream (true);
- }
- catch (ExecutionException e)
- {
- if (connection.getResponseCode() < 400)
- {
- statusCode[0] = connection.getResponseCode();
- connection.disconnect();
- return false;
- }
- }
- finally
- {
- statusCode[0] = connection.getResponseCode();
- }
-
- try
- {
- if (statusCode[0] >= 400)
- inputStream = getCancellableStream (false);
- else
- inputStream = getCancellableStream (true);
- }
- catch (ExecutionException e)
- {}
-
- for (java.util.Map.Entry> entry : connection.getHeaderFields().entrySet())
- {
- if (entry.getKey() != null && entry.getValue() != null)
- {
- responseHeaders.append(entry.getKey() + ": "
- + android.text.TextUtils.join(",", entry.getValue()) + "\n");
-
- if (entry.getKey().compareTo ("Content-Length") == 0)
- totalLength = Integer.decode (entry.getValue().get (0));
- }
- }
-
- return true;
- }
- catch (IOException e)
- {
- return false;
- }
- }
- }
-
- static class DisconnectionRunnable implements Runnable
- {
- public DisconnectionRunnable (HttpURLConnection theConnection,
- InputStream theInputStream,
- ReentrantLock theCreateStreamLock,
- Object theCreateFutureLock,
- Future theStreamFuture)
- {
- connectionToDisconnect = theConnection;
- inputStream = theInputStream;
- createStreamLock = theCreateStreamLock;
- createFutureLock = theCreateFutureLock;
- streamFuture = theStreamFuture;
- }
-
- public void run()
- {
- try
- {
- if (! createStreamLock.tryLock())
- {
- synchronized (createFutureLock)
- {
- if (streamFuture != null)
- streamFuture.cancel (true);
- }
-
- createStreamLock.lock();
- }
-
- if (connectionToDisconnect != null)
- connectionToDisconnect.disconnect();
-
- if (inputStream != null)
- inputStream.close();
- }
- catch (IOException e)
- {}
- finally
- {
- createStreamLock.unlock();
- }
- }
-
- private HttpURLConnection connectionToDisconnect;
- private InputStream inputStream;
- private ReentrantLock createStreamLock;
- private Object createFutureLock;
- Future streamFuture;
- }
-
- public final void release()
- {
- DisconnectionRunnable disconnectionRunnable = new DisconnectionRunnable (connection,
- inputStream,
- createStreamLock,
- createFutureLock,
- streamFuture);
-
- synchronized (createStreamLock)
- {
- hasBeenCancelled.set (true);
-
- connection = null;
- }
-
- Thread disconnectionThread = new Thread(disconnectionRunnable);
- disconnectionThread.start();
- }
-
- public final int read (byte[] buffer, int numBytes)
- {
- int num = 0;
-
- try
- {
- synchronized (createStreamLock)
- {
- if (inputStream != null)
- num = inputStream.read (buffer, 0, numBytes);
- }
- }
- catch (IOException e)
- {}
-
- if (num > 0)
- position += num;
-
- return num;
- }
-
- public final long getPosition() { return position; }
- public final long getTotalLength() { return totalLength; }
- public final boolean isExhausted() { return false; }
- public final boolean setPosition (long newPos) { return false; }
-
- private boolean isPost;
- private byte[] postData;
- private String headers;
- private int timeOutMs;
- String httpRequestCmd;
- private HttpURLConnection connection;
- private int[] statusCode;
- private StringBuffer responseHeaders;
- private int totalLength;
- private int numRedirectsToFollow;
- private InputStream inputStream;
- private long position;
- private final ReentrantLock createStreamLock = new ReentrantLock();
- private final Object createFutureLock = new Object();
- private AtomicBoolean hasBeenCancelled = new AtomicBoolean();
-
- private final ExecutorService executor = Executors.newCachedThreadPool (Executors.defaultThreadFactory());
- Future streamFuture;
- }
-
- public static final HTTPStream createHTTPStream (String address, boolean isPost, byte[] postData,
- String headers, int timeOutMs, int[] statusCode,
- StringBuffer responseHeaders, int numRedirectsToFollow,
- String httpRequestCmd)
- {
- // timeout parameter of zero for HttpUrlConnection is a blocking connect (negative value for juce::URL)
- if (timeOutMs < 0)
- timeOutMs = 0;
- else if (timeOutMs == 0)
- timeOutMs = 30000;
-
- for (;;)
- {
- try
- {
- HTTPStream httpStream = new HTTPStream (address, isPost, postData, headers,
- timeOutMs, statusCode, responseHeaders,
- numRedirectsToFollow, httpRequestCmd);
-
- return httpStream;
- }
- catch (Throwable e) {}
-
- return null;
- }
- }
-
- public final void launchURL (String url)
- {
- startActivity (new Intent (Intent.ACTION_VIEW, Uri.parse (url)));
- }
-
- private native boolean webViewPageLoadStarted (long host, WebView view, String url);
- private native void webViewPageLoadFinished (long host, WebView view, String url);
-$$JuceAndroidWebViewNativeCode$$ // If you get an error here, you need to re-save your project with the Projucer!
- private native void webViewReceivedSslError (long host, WebView view, SslErrorHandler handler, SslError error);
- private native void webViewCloseWindowRequest (long host, WebView view);
- private native void webViewCreateWindowRequest (long host, WebView view);
-
- //==============================================================================
- public class JuceWebViewClient extends WebViewClient
- {
- public JuceWebViewClient (long hostToUse)
- {
- host = hostToUse;
- }
-
- public void hostDeleted()
- {
- synchronized (hostLock)
- {
- host = 0;
- }
- }
-
- @Override
- public void onPageFinished (WebView view, String url)
- {
- if (host == 0)
- return;
-
- webViewPageLoadFinished (host, view, url);
- }
-
- @Override
- public void onReceivedSslError (WebView view, SslErrorHandler handler, SslError error)
- {
- if (host == 0)
- return;
-
- webViewReceivedSslError (host, view, handler, error);
- }
- $$JuceAndroidWebViewCode$$ // If you get an error here, you need to re-save your project with the Projucer!
-
- private long host;
- private final Object hostLock = new Object();
- }
-
- public class JuceWebChromeClient extends WebChromeClient
- {
- public JuceWebChromeClient (long hostToUse)
- {
- host = hostToUse;
- }
-
- @Override
- public void onCloseWindow (WebView window)
- {
- webViewCloseWindowRequest (host, window);
- }
-
- @Override
- public boolean onCreateWindow (WebView view, boolean isDialog,
- boolean isUserGesture, Message resultMsg)
- {
- webViewCreateWindowRequest (host, view);
- return false;
- }
-
- private long host;
- private final Object hostLock = new Object();
- }
-
- $$JuceAndroidCameraCode$$ // If you get an error here, you need to re-save your project with the Projucer!
- $$JuceAndroidVideoCode$$ // If you get an error here, you need to re-save your project with the Projucer!
-
- //==============================================================================
- public static final String getLocaleValue (boolean isRegion)
- {
- java.util.Locale locale = java.util.Locale.getDefault();
-
- return isRegion ? locale.getCountry()
- : locale.getLanguage();
- }
-
- private static final String getFileLocation (String type)
- {
- return Environment.getExternalStoragePublicDirectory (type).getAbsolutePath();
- }
-
- public static final String getDocumentsFolder()
- {
- if (getAndroidSDKVersion() >= 19)
- return getFileLocation ("Documents");
-
- return Environment.getDataDirectory().getAbsolutePath();
- }
-
- public static final String getPicturesFolder() { return getFileLocation (Environment.DIRECTORY_PICTURES); }
- public static final String getMusicFolder() { return getFileLocation (Environment.DIRECTORY_MUSIC); }
- public static final String getMoviesFolder() { return getFileLocation (Environment.DIRECTORY_MOVIES); }
- public static final String getDownloadsFolder() { return getFileLocation (Environment.DIRECTORY_DOWNLOADS); }
-
- //==============================================================================
- @Override
- protected void onActivityResult (int requestCode, int resultCode, Intent data)
- {
- appActivityResult (requestCode, resultCode, data);
- }
-
- @Override
- protected void onNewIntent (Intent intent)
- {
- super.onNewIntent(intent);
- setIntent(intent);
-
- appNewIntent (intent);
- }
-
- //==============================================================================
- public final Typeface getTypeFaceFromAsset (String assetName)
- {
- try
- {
- return Typeface.createFromAsset (this.getResources().getAssets(), assetName);
- }
- catch (Throwable e) {}
-
- return null;
- }
-
- final protected static char[] hexArray = "0123456789ABCDEF".toCharArray();
-
- public static String bytesToHex (byte[] bytes)
- {
- char[] hexChars = new char[bytes.length * 2];
-
- for (int j = 0; j < bytes.length; ++j)
- {
- int v = bytes[j] & 0xff;
- hexChars[j * 2] = hexArray[v >>> 4];
- hexChars[j * 2 + 1] = hexArray[v & 0x0f];
- }
-
- return new String (hexChars);
- }
-
- final private java.util.Map dataCache = new java.util.HashMap();
-
- synchronized private final File getDataCacheFile (byte[] data)
- {
- try
- {
- java.security.MessageDigest digest = java.security.MessageDigest.getInstance ("MD5");
- digest.update (data);
-
- String key = bytesToHex (digest.digest());
-
- if (dataCache.containsKey (key))
- return (File) dataCache.get (key);
-
- File f = new File (this.getCacheDir(), "bindata_" + key);
- f.delete();
- FileOutputStream os = new FileOutputStream (f);
- os.write (data, 0, data.length);
- dataCache.put (key, f);
- return f;
- }
- catch (Throwable e) {}
-
- return null;
- }
-
- private final void clearDataCache()
- {
- java.util.Iterator it = dataCache.values().iterator();
-
- while (it.hasNext())
- {
- File f = (File) it.next();
- f.delete();
- }
- }
-
- public final Typeface getTypeFaceFromByteArray (byte[] data)
- {
- try
- {
- File f = getDataCacheFile (data);
-
- if (f != null)
- return Typeface.createFromFile (f);
- }
- catch (Exception e)
- {
- Log.e ("JUCE", e.toString());
- }
-
- return null;
- }
-
- public static final int getAndroidSDKVersion()
- {
- return android.os.Build.VERSION.SDK_INT;
- }
-
- public final String audioManagerGetProperty (String property)
- {
- Object obj = getSystemService (AUDIO_SERVICE);
- if (obj == null)
- return null;
-
- java.lang.reflect.Method method;
-
- try
- {
- method = obj.getClass().getMethod ("getProperty", String.class);
- }
- catch (SecurityException e) { return null; }
- catch (NoSuchMethodException e) { return null; }
-
- if (method == null)
- return null;
-
- try
- {
- return (String) method.invoke (obj, property);
- }
- catch (java.lang.IllegalArgumentException e) {}
- catch (java.lang.IllegalAccessException e) {}
- catch (java.lang.reflect.InvocationTargetException e) {}
-
- return null;
- }
-
- public final boolean hasSystemFeature (String property)
- {
- return getPackageManager().hasSystemFeature (property);
- }
-}
diff --git a/modules/juce_core/native/java/JuceFirebaseInstanceIdService.java b/modules/juce_core/native/java/JuceFirebaseInstanceIdService.java
deleted file mode 100644
index 1c9017bd9b..0000000000
--- a/modules/juce_core/native/java/JuceFirebaseInstanceIdService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.juce;
-
-import com.google.firebase.iid.*;
-
-public final class JuceFirebaseInstanceIdService extends FirebaseInstanceIdService
-{
- private native void firebaseInstanceIdTokenRefreshed (String token);
-
- @Override
- public void onTokenRefresh()
- {
- String token = FirebaseInstanceId.getInstance().getToken();
-
- firebaseInstanceIdTokenRefreshed (token);
- }
-}
diff --git a/modules/juce_core/native/java/JuceFirebaseMessagingService.java b/modules/juce_core/native/java/JuceFirebaseMessagingService.java
deleted file mode 100644
index 28e9e9f3e5..0000000000
--- a/modules/juce_core/native/java/JuceFirebaseMessagingService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.juce;
-
-import com.google.firebase.messaging.*;
-
-public final class JuceFirebaseMessagingService extends FirebaseMessagingService
-{
- private native void firebaseRemoteMessageReceived (RemoteMessage message);
- private native void firebaseRemoteMessagesDeleted();
- private native void firebaseRemoteMessageSent (String messageId);
- private native void firebaseRemoteMessageSendError (String messageId, String error);
-
- @Override
- public void onMessageReceived (RemoteMessage message)
- {
- firebaseRemoteMessageReceived (message);
- }
-
- @Override
- public void onDeletedMessages()
- {
- firebaseRemoteMessagesDeleted();
- }
-
- @Override
- public void onMessageSent (String messageId)
- {
- firebaseRemoteMessageSent (messageId);
- }
-
- @Override
- public void onSendError (String messageId, Exception e)
- {
- firebaseRemoteMessageSendError (messageId, e.toString());
- }
-}
diff --git a/modules/juce_core/native/java/README.txt b/modules/juce_core/native/java/README.txt
new file mode 100644
index 0000000000..88be61c18a
--- /dev/null
+++ b/modules/juce_core/native/java/README.txt
@@ -0,0 +1,19 @@
+The java code in the module's native/java subfolders were used to generate dex byte-code in various places in the JUCE framework. These are the steps required to re-generate the dex byte-code from any java source code inside the native/java subfolders:
+
+1. Create a new JUCE android project with the minimal sdk version which is required for the java source code you wish to compile.
+2. Move the the .java files that you wish to create source code for, into the module's native/javacore/app folder. Remember that .java files need to be in nested sub-folders which resemble their package, i.e. a Java class com.roli.juce.HelloWorld.java should be in the module's native/javacore/app/com/roli/juce folder.
+3. Build your project with AS and run. The app will now use the source code in the folder creates in step 2 - so you can debug your java code this way.
+4. Once everything is working, rebuild your app in release mode.
+5. Go to your app's Builds/Android folder. Inside there you will find app/build/intermediates/classes/release_/release. Inside of that folder, you will find all your java byte-code compiled classes. Remove any classes that you are not interested in (typically you'll find Java.class, JuceApp.class and JuceSharingContentProvider.class which you will probably want to remove).
+6. Inside of app/build/intermediates/classes/release_/release execute the following dx command:
+
+ /build-tools//dx --dex --verbose --min-sdk-version= --output /tmp/JavaDexByteCode.dex .
+
+
+ Replace with the minimal sdk version you used in step 1.
+
+7. gzip the output:
+
+gzip /tmp/JavaDexByteCode.dex
+
+8. The output /tmp/JavaDexByteCode.dex.gz is now the byte code that can be included into JUCE. You can use the Projucer's BinaryData generator functionality to get this into a convenient char array like form.
diff --git a/modules/juce_core/native/java/com/roli/juce/FragmentOverlay.java b/modules/juce_core/native/java/com/roli/juce/FragmentOverlay.java
new file mode 100644
index 0000000000..0e96761949
--- /dev/null
+++ b/modules/juce_core/native/java/com/roli/juce/FragmentOverlay.java
@@ -0,0 +1,58 @@
+package com.roli.juce;
+
+import android.app.DialogFragment;
+import android.content.Intent;
+import android.os.Bundle;
+
+public class FragmentOverlay extends DialogFragment
+{
+ @Override
+ public void onCreate (Bundle state)
+ {
+ super.onCreate (state);
+ cppThis = getArguments ().getLong ("cppThis");
+
+ if (cppThis != 0)
+ onCreateNative (cppThis, state);
+ }
+
+ @Override
+ public void onStart ()
+ {
+ super.onStart ();
+
+ if (cppThis != 0)
+ onStartNative (cppThis);
+ }
+
+ public void onRequestPermissionsResult (int requestCode,
+ String[] permissions,
+ int[] grantResults)
+ {
+ if (cppThis != 0)
+ onRequestPermissionsResultNative (cppThis, requestCode,
+ permissions, grantResults);
+ }
+
+ @Override
+ public void onActivityResult (int requestCode, int resultCode, Intent data)
+ {
+ if (cppThis != 0)
+ onActivityResultNative (cppThis, requestCode, resultCode, data);
+ }
+
+ public void close ()
+ {
+ cppThis = 0;
+ dismiss ();
+ }
+
+ //==============================================================================
+ private long cppThis = 0;
+
+ private native void onActivityResultNative (long myself, int requestCode, int resultCode, Intent data);
+ private native void onCreateNative (long myself, Bundle state);
+ private native void onStartNative (long myself);
+ private native void onRequestPermissionsResultNative (long myself, int requestCode,
+ String[] permissions, int[] grantResults);
+}
diff --git a/modules/juce_core/native/java/com/roli/juce/JuceHTTPStream.java b/modules/juce_core/native/java/com/roli/juce/JuceHTTPStream.java
new file mode 100644
index 0000000000..ee4302b5d1
--- /dev/null
+++ b/modules/juce_core/native/java/com/roli/juce/JuceHTTPStream.java
@@ -0,0 +1,407 @@
+package com.roli.juce;
+
+import java.lang.Runnable;
+import java.io.*;
+import java.net.URL;
+import java.net.HttpURLConnection;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.Future;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Callable;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.atomic.*;
+
+public class JuceHTTPStream
+{
+ public JuceHTTPStream(String address, boolean isPostToUse, byte[] postDataToUse,
+ String headersToUse, int timeOutMsToUse,
+ int[] statusCodeToUse, StringBuffer responseHeadersToUse,
+ int numRedirectsToFollowToUse, String httpRequestCmdToUse) throws IOException
+ {
+ isPost = isPostToUse;
+ postData = postDataToUse;
+ headers = headersToUse;
+ timeOutMs = timeOutMsToUse;
+ statusCode = statusCodeToUse;
+ responseHeaders = responseHeadersToUse;
+ totalLength = -1;
+ numRedirectsToFollow = numRedirectsToFollowToUse;
+ httpRequestCmd = httpRequestCmdToUse;
+
+ connection = createConnection(address, isPost, postData, headers, timeOutMs, httpRequestCmd);
+ }
+
+ public static final JuceHTTPStream createHTTPStream(String address, boolean isPost, byte[] postData,
+ String headers, int timeOutMs, int[] statusCode,
+ StringBuffer responseHeaders, int numRedirectsToFollow,
+ String httpRequestCmd)
+ {
+ // timeout parameter of zero for HttpUrlConnection is a blocking connect (negative value for juce::URL)
+ if (timeOutMs < 0)
+ timeOutMs = 0;
+ else if (timeOutMs == 0)
+ timeOutMs = 30000;
+
+ for (; ; )
+ {
+ try
+ {
+ JuceHTTPStream httpStream = new JuceHTTPStream(address, isPost, postData, headers,
+ timeOutMs, statusCode, responseHeaders,
+ numRedirectsToFollow, httpRequestCmd);
+
+ return httpStream;
+ } catch (Throwable e)
+ {
+ }
+
+ return null;
+ }
+ }
+
+ private final HttpURLConnection createConnection(String address, boolean isPost, byte[] postData,
+ String headers, int timeOutMs, String httpRequestCmdToUse) throws IOException
+ {
+ HttpURLConnection newConnection = (HttpURLConnection) (new URL(address).openConnection());
+
+ try
+ {
+ newConnection.setInstanceFollowRedirects(false);
+ newConnection.setConnectTimeout(timeOutMs);
+ newConnection.setReadTimeout(timeOutMs);
+
+ // headers - if not empty, this string is appended onto the headers that are used for the request. It must therefore be a valid set of HTML header directives, separated by newlines.
+ // So convert headers string to an array, with an element for each line
+ String headerLines[] = headers.split("\\n");
+
+ // Set request headers
+ for (int i = 0; i < headerLines.length; ++i)
+ {
+ int pos = headerLines[i].indexOf(":");
+
+ if (pos > 0 && pos < headerLines[i].length())
+ {
+ String field = headerLines[i].substring(0, pos);
+ String value = headerLines[i].substring(pos + 1);
+
+ if (value.length() > 0)
+ newConnection.setRequestProperty(field, value);
+ }
+ }
+
+ newConnection.setRequestMethod(httpRequestCmd);
+
+ if (isPost)
+ {
+ newConnection.setDoOutput(true);
+
+ if (postData != null)
+ {
+ OutputStream out = newConnection.getOutputStream();
+ out.write(postData);
+ out.flush();
+ }
+ }
+
+ return newConnection;
+ } catch (Throwable e)
+ {
+ newConnection.disconnect();
+ throw new IOException("Connection error");
+ }
+ }
+
+ private final InputStream getCancellableStream(final boolean isInput) throws ExecutionException
+ {
+ synchronized (createFutureLock)
+ {
+ if (hasBeenCancelled.get())
+ return null;
+
+ streamFuture = executor.submit(new Callable()
+ {
+ @Override
+ public BufferedInputStream call() throws IOException
+ {
+ return new BufferedInputStream(isInput ? connection.getInputStream()
+ : connection.getErrorStream());
+ }
+ });
+ }
+
+ try
+ {
+ return streamFuture.get();
+ } catch (InterruptedException e)
+ {
+ return null;
+ } catch (CancellationException e)
+ {
+ return null;
+ }
+ }
+
+ public final boolean connect()
+ {
+ boolean result = false;
+ int numFollowedRedirects = 0;
+
+ while (true)
+ {
+ result = doConnect();
+
+ if (!result)
+ return false;
+
+ if (++numFollowedRedirects > numRedirectsToFollow)
+ break;
+
+ int status = statusCode[0];
+
+ if (status == 301 || status == 302 || status == 303 || status == 307)
+ {
+ // Assumes only one occurrence of "Location"
+ int pos1 = responseHeaders.indexOf("Location:") + 10;
+ int pos2 = responseHeaders.indexOf("\n", pos1);
+
+ if (pos2 > pos1)
+ {
+ String currentLocation = connection.getURL().toString();
+ String newLocation = responseHeaders.substring(pos1, pos2);
+
+ try
+ {
+ // Handle newLocation whether it's absolute or relative
+ URL baseUrl = new URL(currentLocation);
+ URL newUrl = new URL(baseUrl, newLocation);
+ String transformedNewLocation = newUrl.toString();
+
+ if (transformedNewLocation != currentLocation)
+ {
+ // Clear responseHeaders before next iteration
+ responseHeaders.delete(0, responseHeaders.length());
+
+ synchronized (createStreamLock)
+ {
+ if (hasBeenCancelled.get())
+ return false;
+
+ connection.disconnect();
+
+ try
+ {
+ connection = createConnection(transformedNewLocation, isPost,
+ postData, headers, timeOutMs,
+ httpRequestCmd);
+ } catch (Throwable e)
+ {
+ return false;
+ }
+ }
+ } else
+ {
+ break;
+ }
+ } catch (Throwable e)
+ {
+ return false;
+ }
+ } else
+ {
+ break;
+ }
+ } else
+ {
+ break;
+ }
+ }
+
+ return result;
+ }
+
+ private final boolean doConnect()
+ {
+ synchronized (createStreamLock)
+ {
+ if (hasBeenCancelled.get())
+ return false;
+
+ try
+ {
+ try
+ {
+ inputStream = getCancellableStream(true);
+ } catch (ExecutionException e)
+ {
+ if (connection.getResponseCode() < 400)
+ {
+ statusCode[0] = connection.getResponseCode();
+ connection.disconnect();
+ return false;
+ }
+ } finally
+ {
+ statusCode[0] = connection.getResponseCode();
+ }
+
+ try
+ {
+ if (statusCode[0] >= 400)
+ inputStream = getCancellableStream(false);
+ else
+ inputStream = getCancellableStream(true);
+ } catch (ExecutionException e)
+ {
+ }
+
+ for (java.util.Map.Entry> entry : connection.getHeaderFields().entrySet())
+ {
+ if (entry.getKey() != null && entry.getValue() != null)
+ {
+ responseHeaders.append(entry.getKey() + ": "
+ + android.text.TextUtils.join(",", entry.getValue()) + "\n");
+
+ if (entry.getKey().compareTo("Content-Length") == 0)
+ totalLength = Integer.decode(entry.getValue().get(0));
+ }
+ }
+
+ return true;
+ } catch (IOException e)
+ {
+ return false;
+ }
+ }
+ }
+
+ static class DisconnectionRunnable implements Runnable
+ {
+ public DisconnectionRunnable(HttpURLConnection theConnection,
+ InputStream theInputStream,
+ ReentrantLock theCreateStreamLock,
+ Object theCreateFutureLock,
+ Future theStreamFuture)
+ {
+ connectionToDisconnect = theConnection;
+ inputStream = theInputStream;
+ createStreamLock = theCreateStreamLock;
+ createFutureLock = theCreateFutureLock;
+ streamFuture = theStreamFuture;
+ }
+
+ public void run()
+ {
+ try
+ {
+ if (!createStreamLock.tryLock())
+ {
+ synchronized (createFutureLock)
+ {
+ if (streamFuture != null)
+ streamFuture.cancel(true);
+ }
+
+ createStreamLock.lock();
+ }
+
+ if (connectionToDisconnect != null)
+ connectionToDisconnect.disconnect();
+
+ if (inputStream != null)
+ inputStream.close();
+ } catch (IOException e)
+ {
+ } finally
+ {
+ createStreamLock.unlock();
+ }
+ }
+
+ private HttpURLConnection connectionToDisconnect;
+ private InputStream inputStream;
+ private ReentrantLock createStreamLock;
+ private Object createFutureLock;
+ Future streamFuture;
+ }
+
+ public final void release()
+ {
+ DisconnectionRunnable disconnectionRunnable = new DisconnectionRunnable(connection,
+ inputStream,
+ createStreamLock,
+ createFutureLock,
+ streamFuture);
+
+ synchronized (createStreamLock)
+ {
+ hasBeenCancelled.set(true);
+
+ connection = null;
+ }
+
+ Thread disconnectionThread = new Thread(disconnectionRunnable);
+ disconnectionThread.start();
+ }
+
+ public final int read(byte[] buffer, int numBytes)
+ {
+ int num = 0;
+
+ try
+ {
+ synchronized (createStreamLock)
+ {
+ if (inputStream != null)
+ num = inputStream.read(buffer, 0, numBytes);
+ }
+ } catch (IOException e)
+ {
+ }
+
+ if (num > 0)
+ position += num;
+
+ return num;
+ }
+
+ public final long getPosition()
+ {
+ return position;
+ }
+
+ public final long getTotalLength()
+ {
+ return totalLength;
+ }
+
+ public final boolean isExhausted()
+ {
+ return false;
+ }
+
+ public final boolean setPosition(long newPos)
+ {
+ return false;
+ }
+
+ private boolean isPost;
+ private byte[] postData;
+ private String headers;
+ private int timeOutMs;
+ String httpRequestCmd;
+ private HttpURLConnection connection;
+ private int[] statusCode;
+ private StringBuffer responseHeaders;
+ private int totalLength;
+ private int numRedirectsToFollow;
+ private InputStream inputStream;
+ private long position;
+ private final ReentrantLock createStreamLock = new ReentrantLock();
+ private final Object createFutureLock = new Object();
+ private AtomicBoolean hasBeenCancelled = new AtomicBoolean();
+
+ private final ExecutorService executor = Executors.newCachedThreadPool(Executors.defaultThreadFactory());
+ Future streamFuture;
+}
\ No newline at end of file
diff --git a/modules/juce_core/native/javacore/app/com/roli/juce/JuceApp.java b/modules/juce_core/native/javacore/app/com/roli/juce/JuceApp.java
new file mode 100644
index 0000000000..bad3737895
--- /dev/null
+++ b/modules/juce_core/native/javacore/app/com/roli/juce/JuceApp.java
@@ -0,0 +1,15 @@
+package com.roli.juce;
+
+import com.roli.juce.Java;
+
+import android.app.Application;
+
+public class JuceApp extends Application
+{
+ @Override
+ public void onCreate ()
+ {
+ super.onCreate ();
+ Java.initialiseJUCE (this);
+ }
+}
diff --git a/modules/juce_core/native/javacore/init/com/roli/juce/Java.java b/modules/juce_core/native/javacore/init/com/roli/juce/Java.java
new file mode 100644
index 0000000000..a5622974bd
--- /dev/null
+++ b/modules/juce_core/native/javacore/init/com/roli/juce/Java.java
@@ -0,0 +1,13 @@
+package com.roli.juce;
+
+import android.content.Context;
+
+public class Java
+{
+ static
+ {
+ System.loadLibrary ("juce_jni");
+ }
+
+ public native static void initialiseJUCE (Context appContext);
+}
\ No newline at end of file
diff --git a/modules/juce_core/native/juce_android_Files.cpp b/modules/juce_core/native/juce_android_Files.cpp
index 180935429a..65f76164ad 100644
--- a/modules/juce_core/native/juce_android_Files.cpp
+++ b/modules/juce_core/native/juce_android_Files.cpp
@@ -23,7 +23,7 @@
namespace juce
{
-#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD) \
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
METHOD (constructor, "", "(Landroid/content/Context;Landroid/media/MediaScannerConnection$MediaScannerConnectionClient;)V") \
METHOD (connect, "connect", "()V") \
METHOD (disconnect, "disconnect", "()V") \
@@ -32,7 +32,7 @@ namespace juce
DECLARE_JNI_CLASS (MediaScannerConnection, "android/media/MediaScannerConnection")
#undef JNI_CLASS_MEMBERS
-#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD) \
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
METHOD (query, "query", "(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;") \
METHOD (openInputStream, "openInputStream", "(Landroid/net/Uri;)Ljava/io/InputStream;") \
METHOD (openOutputStream, "openOutputStream", "(Landroid/net/Uri;)Ljava/io/OutputStream;")
@@ -40,7 +40,7 @@ DECLARE_JNI_CLASS (MediaScannerConnection, "android/media/MediaScannerConnection
DECLARE_JNI_CLASS (ContentResolver, "android/content/ContentResolver")
#undef JNI_CLASS_MEMBERS
-#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD) \
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
METHOD (moveToFirst, "moveToFirst", "()Z") \
METHOD (getColumnIndex, "getColumnIndex", "(Ljava/lang/String;)I") \
METHOD (getString, "getString", "(I)Ljava/lang/String;") \
@@ -49,14 +49,15 @@ DECLARE_JNI_CLASS (ContentResolver, "android/content/ContentResolver")
DECLARE_JNI_CLASS (AndroidCursor, "android/database/Cursor")
#undef JNI_CLASS_MEMBERS
-#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD) \
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
STATICMETHOD (getExternalStorageDirectory, "getExternalStorageDirectory", "()Ljava/io/File;") \
STATICMETHOD (getExternalStoragePublicDirectory, "getExternalStoragePublicDirectory", "(Ljava/lang/String;)Ljava/io/File;") \
+ STATICMETHOD (getDataDirectory, "getDataDirectory", "()Ljava/io/File;")
DECLARE_JNI_CLASS (AndroidEnvironment, "android/os/Environment")
#undef JNI_CLASS_MEMBERS
-#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD) \
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
METHOD (close, "close", "()V") \
METHOD (flush, "flush", "()V") \
METHOD (write, "write", "([BII)V")
@@ -64,6 +65,55 @@ DECLARE_JNI_CLASS (AndroidEnvironment, "android/os/Environment")
DECLARE_JNI_CLASS (AndroidOutputStream, "java/io/OutputStream")
#undef JNI_CLASS_MEMBERS
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
+ FIELD (publicSourceDir, "publicSourceDir", "Ljava/lang/String;") \
+ FIELD (dataDir, "dataDir", "Ljava/lang/String;")
+
+DECLARE_JNI_CLASS (AndroidApplicationInfo, "android/content/pm/ApplicationInfo")
+#undef JNI_CLASS_MEMBERS
+
+//==============================================================================
+static File juceFile (LocalRef obj)
+{
+ auto* env = getEnv();
+
+ if (env->IsInstanceOf (obj.get(), JavaFile) != 0)
+ return File (juceString (LocalRef ((jstring) env->CallObjectMethod (obj.get(),
+ JavaFile.getAbsolutePath))));
+
+ return {};
+}
+
+static File getWellKnownFolder (const char* folderId)
+{
+ auto* env = getEnv();
+ auto fieldId = env->GetStaticFieldID (AndroidEnvironment, folderId, "Ljava/lang/String;");
+
+ if (fieldId == 0)
+ {
+ // unknown field in environment
+ jassertfalse;
+ return {};
+ }
+
+ LocalRef fieldValue (env->GetStaticObjectField (AndroidEnvironment, fieldId));
+
+ if (fieldValue == nullptr)
+ return {};
+
+ LocalRef downloadFolder (env->CallStaticObjectMethod (AndroidEnvironment,
+ AndroidEnvironment.getExternalStoragePublicDirectory,
+ fieldValue.get()));
+
+ return (downloadFolder ? juceFile (downloadFolder) : File());
+}
+
+static LocalRef urlToUri (const URL& url)
+{
+ return LocalRef (getEnv()->CallStaticObjectMethod (AndroidUri, AndroidUri.parse,
+ javaString (url.toString (true)).get()));
+}
+
//==============================================================================
struct AndroidContentUriResolver
{
@@ -74,7 +124,7 @@ public:
jassert (url.getScheme() == "content");
auto* env = getEnv();
- LocalRef contentResolver (android.activity.callObjectMethod (JuceAppActivity.getContentResolver));
+ LocalRef contentResolver (env->CallObjectMethod (getAppContext().get(), AndroidContext.getContentResolver));
if (contentResolver)
return LocalRef ((env->CallObjectMethod (contentResolver.get(),
@@ -116,7 +166,7 @@ public:
else if (type.equalsIgnoreCase ("downloads"))
{
auto subDownloadPath = url.getSubPath().fromFirstOccurrenceOf ("tree/downloads", false, false);
- return File (getWellKnownFolder ("Download").getFullPathName() + "/" + subDownloadPath);
+ return File (getWellKnownFolder ("DIRECTORY_DOWNLOADS").getFullPathName() + "/" + subDownloadPath);
}
else
{
@@ -142,7 +192,7 @@ public:
{
auto uri = urlToUri (url);
auto* env = getEnv();
- LocalRef contentResolver (android.activity.callObjectMethod (JuceAppActivity.getContentResolver));
+ LocalRef contentResolver (env->CallObjectMethod (getAppContext().get(), AndroidContext.getContentResolver));
if (contentResolver == 0)
return {};
@@ -166,7 +216,7 @@ private:
{
auto uri = urlToUri (url);
auto* env = getEnv();
- LocalRef contentResolver (android.activity.callObjectMethod (JuceAppActivity.getContentResolver));
+ LocalRef contentResolver (env->CallObjectMethod (getAppContext().get(), AndroidContext.getContentResolver));
if (contentResolver)
{
@@ -217,17 +267,6 @@ private:
return {};
}
- //==============================================================================
- static File getWellKnownFolder (const String& folderId)
- {
- auto* env = getEnv();
- LocalRef downloadFolder (env->CallStaticObjectMethod (AndroidEnvironment,
- AndroidEnvironment.getExternalStoragePublicDirectory,
- javaString (folderId).get()));
-
- return (downloadFolder ? juceFile (downloadFolder) : File());
- }
-
//==============================================================================
static File getStorageDevicePath (const String& storageId)
{
@@ -254,15 +293,15 @@ private:
{
Array results;
- if (getSDKVersion() >= 19)
+ if (getAndroidSDKVersion() >= 19)
{
auto* env = getEnv();
- static jmethodID m = (env->GetMethodID (JuceAppActivity, "getExternalFilesDirs",
+ static jmethodID m = (env->GetMethodID (AndroidContext, "getExternalFilesDirs",
"(Ljava/lang/String;)[Ljava/io/File;"));
if (m == 0)
return {};
- auto paths = convertFileArray (LocalRef (android.activity.callObjectMethod (m, nullptr)));
+ auto paths = convertFileArray (LocalRef (env->CallObjectMethod (getAppContext().get(), m, nullptr)));
for (auto path : paths)
results.add (getMountPointForFile (path));
@@ -348,33 +387,6 @@ private:
return files;
}
- static File juceFile (LocalRef obj)
- {
- auto* env = getEnv();
-
- if (env->IsInstanceOf (obj.get(), JavaFile) != 0)
- return File (juceString (LocalRef ((jstring) env->CallObjectMethod (obj.get(),
- JavaFile.getAbsolutePath))));
-
- return {};
- }
-
- //==============================================================================
- static int getSDKVersion()
- {
- static int sdkVersion
- = getEnv()->CallStaticIntMethod (JuceAppActivity,
- JuceAppActivity.getAndroidSDKVersion);
-
- return sdkVersion;
- }
-
- static LocalRef urlToUri (const URL& url)
- {
- return LocalRef (getEnv()->CallStaticObjectMethod (AndroidUri, AndroidUri.parse,
- javaString (url.toString (true)).get()));
- }
-
//==============================================================================
static String getStringUsingDataColumn (const String& columnNameToUse, JNIEnv* env,
const LocalRef& uri,
@@ -525,9 +537,24 @@ String File::getVersion() const
return {};
}
-static File getSpecialFile (jmethodID type)
+static File getDocumentsDirectory()
{
- return File (juceString (LocalRef ((jstring) getEnv()->CallStaticObjectMethod (JuceAppActivity, type))));
+ auto* env = getEnv();
+
+ if (getAndroidSDKVersion() >= 19)
+ return getWellKnownFolder ("DIRECTORY_DOCUMENTS");
+
+ return juceFile (LocalRef (env->CallStaticObjectMethod (AndroidEnvironment, AndroidEnvironment.getDataDirectory)));
+}
+
+static File getAppDataDir (bool dataDir)
+{
+ auto* env = getEnv();
+
+ LocalRef applicationInfo (env->CallObjectMethod (getAppContext().get(), AndroidContext.getApplicationInfo));
+ LocalRef jString (env->GetObjectField (applicationInfo.get(), dataDir ? AndroidApplicationInfo.dataDir : AndroidApplicationInfo.publicSourceDir));
+
+ return {juceString ((jstring) jString.get())};
}
File File::getSpecialLocation (const SpecialLocationType type)
@@ -538,20 +565,41 @@ File File::getSpecialLocation (const SpecialLocationType type)
case userApplicationDataDirectory:
case userDesktopDirectory:
case commonApplicationDataDirectory:
- return File (android.appDataDir);
+ {
+ static File appDataDir = getAppDataDir (true);
+ return appDataDir;
+ }
case userDocumentsDirectory:
- case commonDocumentsDirectory: return getSpecialFile (JuceAppActivity.getDocumentsFolder);
- case userPicturesDirectory: return getSpecialFile (JuceAppActivity.getPicturesFolder);
- case userMusicDirectory: return getSpecialFile (JuceAppActivity.getMusicFolder);
- case userMoviesDirectory: return getSpecialFile (JuceAppActivity.getMoviesFolder);
+ case commonDocumentsDirectory:
+ {
+ static auto docsDir = getDocumentsDirectory();
+ return docsDir;
+ }
+
+ case userPicturesDirectory:
+ {
+ static auto picturesDir = getWellKnownFolder ("DIRECTORY_PICTURES");
+ return picturesDir;
+ }
+
+ case userMusicDirectory:
+ {
+ static auto musicDir = getWellKnownFolder ("DIRECTORY_MUSIC");
+ return musicDir;
+ }
+ case userMoviesDirectory:
+ {
+ static auto moviesDir = getWellKnownFolder ("DIRECTORY_MOVIES");
+ return moviesDir;
+ }
case globalApplicationsDirectory:
return File ("/system/app");
case tempDirectory:
{
- File tmp = File (android.appDataDir).getChildFile (".temp");
+ File tmp = getSpecialLocation (commonApplicationDataDirectory).getChildFile (".temp");
tmp.createDirectory();
return File (tmp.getFullPathName());
}
@@ -560,7 +608,7 @@ File File::getSpecialLocation (const SpecialLocationType type)
case currentExecutableFile:
case currentApplicationFile:
case hostApplicationPath:
- return juce_getExecutableFile();
+ return getAppDataDir (false);
default:
jassertfalse; // unknown type?
@@ -581,8 +629,13 @@ bool File::moveToTrash() const
JUCE_API bool JUCE_CALLTYPE Process::openDocument (const String& fileName, const String&)
{
- const LocalRef t (javaString (fileName));
- android.activity.callVoidMethod (JuceAppActivity.launchURL, t.get());
+ URL targetURL (File {fileName});
+ auto* env = getEnv();
+
+ const LocalRef action (javaString ("android.intent.action.VIEW"));
+ LocalRef intent (env->NewObject (AndroidIntent, AndroidIntent.constructWithUri, action.get(), urlToUri (targetURL).get()));
+
+ env->CallVoidMethod (getCurrentActivity(), AndroidContext.startActivity, intent.get());
return true;
}
@@ -595,10 +648,10 @@ class SingleMediaScanner : public MediaScannerConnectionClient
{
public:
SingleMediaScanner (const String& filename)
- : msc (getEnv()->NewObject (MediaScannerConnection,
- MediaScannerConnection.constructor,
- android.activity.get(),
- CreateJavaInterface (this, "android/media/MediaScannerConnection$MediaScannerConnectionClient").get())),
+ : msc (LocalRef (getEnv()->NewObject (MediaScannerConnection,
+ MediaScannerConnection.constructor,
+ getAppContext().get(),
+ CreateJavaInterface (this, "android/media/MediaScannerConnection$MediaScannerConnectionClient").get()))),
file (filename)
{
getEnv()->CallVoidMethod (msc.get(), MediaScannerConnection.connect);
diff --git a/modules/juce_core/native/juce_android_JNIHelpers.cpp b/modules/juce_core/native/juce_android_JNIHelpers.cpp
new file mode 100644
index 0000000000..cda9a67379
--- /dev/null
+++ b/modules/juce_core/native/juce_android_JNIHelpers.cpp
@@ -0,0 +1,687 @@
+/*
+ ==============================================================================
+
+ This file is part of the JUCE library.
+ Copyright (c) 2017 - ROLI Ltd.
+
+ JUCE is an open source library subject to commercial or open-source
+ licensing.
+
+ The code included in this file is provided under the terms of the ISC license
+ http://www.isc.org/downloads/software-support-policy/isc-license. Permission
+ To use, copy, modify, and/or distribute this software for any purpose with or
+ without fee is hereby granted provided that the above copyright notice and
+ this permission notice appear in all copies.
+
+ JUCE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER
+ EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE
+ DISCLAIMED.
+
+ ==============================================================================
+ */
+
+namespace juce
+{
+
+//==============================================================================
+static const uint8 invocationHandleByteCode[] = {
+31,139,8,8,170,94,229,91,0,3,105,110,118,111,99,97,116,105,111,110,95,104,97,110,100,108,101,114,46,100,101,120,0,109,
+148,75,107,19,81,20,199,207,189,119,38,169,181,109,98,218,138,72,23,81,20,68,193,169,218,130,144,42,130,162,53,140,15,
+104,200,66,187,232,52,185,181,147,78,103,98,58,141,33,184,168,197,47,224,66,168,187,186,241,83,168,184,16,247,162,31,193,
+69,151,174,220,40,234,255,62,154,4,237,192,239,62,206,57,115,30,115,239,153,186,236,12,79,95,154,165,159,187,91,95,227,
+217,197,247,87,42,31,231,191,156,157,58,241,253,199,220,201,79,75,175,118,58,14,81,147,136,58,213,153,2,217,231,131,32,
+154,32,35,63,164,246,0,102,244,13,48,48,129,33,139,121,138,153,125,5,131,131,119,82,204,203,156,168,1,214,65,10,186,224,
+53,120,7,62,131,61,144,131,237,57,112,30,92,4,183,192,93,176,4,154,160,11,182,193,11,97,252,171,216,46,200,144,137,59,
+100,243,26,6,35,0,46,9,166,116,131,155,89,113,159,27,125,214,214,116,216,174,23,185,241,89,208,181,8,173,99,240,48,106,
+247,99,182,198,156,149,231,245,204,232,136,246,203,173,189,65,189,61,7,209,31,60,167,48,239,26,119,90,183,35,84,190,66,
+175,201,230,218,204,43,201,81,172,30,76,131,25,66,180,190,133,169,81,107,139,164,243,112,123,25,154,253,194,53,232,17,
+231,2,74,190,140,106,212,190,57,205,201,97,99,168,207,209,223,71,61,147,202,182,57,104,59,74,11,45,212,255,56,251,60,251,
+50,251,166,157,81,81,71,80,83,129,206,252,238,133,239,101,162,242,72,237,217,186,246,251,171,106,51,248,242,162,183,218,
+183,207,204,133,113,152,94,37,86,38,215,47,251,190,79,142,175,198,211,126,45,89,247,90,73,20,122,141,205,154,244,202,24,
+110,199,237,164,22,164,97,18,207,7,113,61,146,173,18,29,247,235,65,212,14,215,188,32,142,147,84,235,188,202,106,43,121,
+178,81,162,130,223,8,218,129,23,5,241,35,239,222,114,67,214,210,18,77,14,200,180,93,176,28,201,18,162,245,197,45,185,18,
+193,214,59,48,218,255,102,119,100,186,154,212,75,196,170,196,171,101,26,127,120,64,84,183,22,201,160,69,249,122,184,209,
+12,210,218,234,205,48,14,162,176,43,105,108,95,162,130,173,73,26,90,217,215,100,66,35,25,141,145,66,91,94,79,226,84,118,
+82,114,219,65,180,41,137,115,54,62,197,142,57,196,132,186,86,207,182,156,95,156,111,115,98,10,182,43,4,123,43,24,219,19,
+185,127,206,70,247,159,237,77,62,208,159,98,160,71,157,129,62,117,169,223,171,25,234,247,171,200,155,181,62,231,162,121,
+231,169,178,41,26,185,186,207,44,111,228,234,142,243,162,137,171,250,219,41,246,239,56,217,181,190,251,214,167,250,127,
+252,5,76,239,47,69,120,4,0,0};
+
+//==============================================================================
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
+ STATICMETHOD (newProxyInstance, "newProxyInstance", "(Ljava/lang/ClassLoader;[Ljava/lang/Class;Ljava/lang/reflect/InvocationHandler;)Ljava/lang/Object;") \
+
+ DECLARE_JNI_CLASS (JavaProxy, "java/lang/reflect/Proxy")
+#undef JNI_CLASS_MEMBERS
+
+//==============================================================================
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
+ METHOD (constructor, "", "(J)V") \
+ METHOD (clear, "clear", "()V") \
+ CALLBACK (juce_invokeImplementer, "dispatchInvoke", "(JLjava/lang/Object;Ljava/lang/reflect/Method;[Ljava/lang/Object;)Ljava/lang/Object;") \
+ CALLBACK (juce_dispatchDelete, "dispatchFinalize", "(J)V")
+
+ DECLARE_JNI_CLASS_WITH_BYTECODE (JuceInvocationHandler, "com/roli/juce/JuceInvocationHandler", 10, invocationHandleByteCode, sizeof (invocationHandleByteCode))
+#undef JNI_CLASS_MEMBERS
+
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
+ METHOD (findClass, "findClass", "(Ljava/lang/String;)Ljava/lang/Class;") \
+ STATICMETHOD (getSystemClassLoader, "getSystemClassLoader", "()Ljava/lang/ClassLoader;")
+
+DECLARE_JNI_CLASS (JavaClassLoader, "java/lang/ClassLoader")
+#undef JNI_CLASS_MEMBERS
+
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
+ METHOD (constructor, "", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/ClassLoader;)V")
+
+DECLARE_JNI_CLASS (AndroidDexClassLoader, "dalvik/system/DexClassLoader")
+#undef JNI_CLASS_MEMBERS
+
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
+ METHOD (constructor, "", "(Ljava/nio/ByteBuffer;Ljava/lang/ClassLoader;)V")
+
+DECLARE_JNI_CLASS_WITH_MIN_SDK (AndroidInMemoryDexClassLoader, "dalvik/system/InMemoryDexClassLoader", 26)
+#undef JNI_CLASS_MEMBERS
+
+//==============================================================================
+struct SystemJavaClassComparator
+{
+ static int compareElements (JNIClassBase* first, JNIClassBase* second)
+ {
+ auto isSysClassA = isSystemClass (first);
+ auto isSysClassB = isSystemClass (second);
+
+ if ((! isSysClassA) && (! isSysClassB))
+ {
+ return DefaultElementComparator::compareElements (first != nullptr ? first->byteCode != nullptr : false,
+ second != nullptr ? second->byteCode != nullptr : false);
+ }
+
+ return DefaultElementComparator::compareElements (isSystemClass (first),
+ isSystemClass (second));
+ }
+
+ static bool isSystemClass (JNIClassBase* cls)
+ {
+ if (cls == nullptr)
+ return false;
+
+ String path (cls->getClassPath());
+
+ return path.startsWith ("java/")
+ || path.startsWith ("android/")
+ || path.startsWith ("dalvik/");
+ }
+};
+
+//==============================================================================
+JNIClassBase::JNIClassBase (const char* cp, int classMinSDK, const void* bc, size_t n)
+ : classPath (cp), byteCode (bc), byteCodeSize (n), minSDK (classMinSDK), classRef (0)
+{
+ SystemJavaClassComparator comparator;
+
+ getClasses().addSorted (comparator, this);
+}
+
+JNIClassBase::~JNIClassBase()
+{
+ getClasses().removeFirstMatchingValue (this);
+}
+
+Array& JNIClassBase::getClasses()
+{
+ static Array classes;
+ return classes;
+}
+
+// Get code cache directory without yet having a context object
+static File getCodeCacheDirectory()
+{
+ int pid = getpid();
+ File cmdline("/proc/" + String(pid) + "/cmdline");
+
+ auto bundleId = cmdline.loadFileAsString().trimStart().trimEnd();
+
+ if (bundleId.isEmpty())
+ return {};
+
+ return File("/data/data/" + bundleId + "/code_cache");
+}
+
+void JNIClassBase::initialise (JNIEnv* env)
+{
+ auto sdkVersion = getAndroidSDKVersion();
+
+ if (sdkVersion >= minSDK)
+ {
+ LocalRef classNameAndPackage (javaString (String (classPath).replaceCharacter (L'/', L'.')));
+ static Array byteCodeLoaders;
+
+ if (! SystemJavaClassComparator::isSystemClass(this))
+ {
+ LocalRef defaultClassLoader (env->CallStaticObjectMethod (JavaClassLoader, JavaClassLoader.getSystemClassLoader));
+ tryLoadingClassWithClassLoader (env, defaultClassLoader.get());
+
+ if (classRef == 0)
+ {
+ for (auto& byteCodeLoader : byteCodeLoaders)
+ {
+ tryLoadingClassWithClassLoader (env, byteCodeLoader.get());
+
+ if (classRef != 0)
+ break;
+ }
+
+ // fallback by trying to load the class from bytecode
+ if (byteCode != nullptr)
+ {
+ LocalRef byteCodeClassLoader;
+
+ MemoryOutputStream uncompressedByteCode;
+
+ {
+ MemoryInputStream rawGZipData (byteCode, byteCodeSize, false);
+ GZIPDecompressorInputStream gzipStream (&rawGZipData, false, GZIPDecompressorInputStream::gzipFormat);
+ uncompressedByteCode.writeFromInputStream (gzipStream, -1);
+ }
+
+ if (sdkVersion >= 26)
+ {
+ LocalRef byteArray (env->NewByteArray ((jsize) uncompressedByteCode.getDataSize()));
+ jboolean isCopy;
+ auto* dst = env->GetByteArrayElements (byteArray.get(), &isCopy);
+ memcpy (dst, uncompressedByteCode.getData(), uncompressedByteCode.getDataSize());
+ env->ReleaseByteArrayElements (byteArray.get(), dst, 0);
+
+ LocalRef byteBuffer (env->CallStaticObjectMethod (JavaByteBuffer, JavaByteBuffer.wrap, byteArray.get()));
+
+ byteCodeClassLoader = LocalRef (env->NewObject (AndroidInMemoryDexClassLoader,
+ AndroidInMemoryDexClassLoader.constructor,
+ byteBuffer.get(), defaultClassLoader.get()));
+ }
+ else if (uncompressedByteCode.getDataSize() >= 32)
+ {
+ auto codeCacheDir = getCodeCacheDirectory();
+
+ // The dex file has an embedded 20-byte long SHA-1 signature at offset 12
+ auto fileName = String::toHexString ((char*)uncompressedByteCode.getData() + 12, 20, 0) + ".dex";
+ auto dexFile = codeCacheDir.getChildFile (fileName);
+ auto optimizedDirectory = codeCacheDir.getChildFile ("optimized_cache");
+ optimizedDirectory.createDirectory();
+
+ if (dexFile.replaceWithData (uncompressedByteCode.getData(), uncompressedByteCode.getDataSize()))
+ {
+ byteCodeClassLoader = LocalRef (env->NewObject (AndroidDexClassLoader,
+ AndroidDexClassLoader.constructor,
+ javaString (dexFile.getFullPathName()).get(),
+ javaString (optimizedDirectory.getFullPathName()).get(),
+ nullptr,
+ defaultClassLoader.get()));
+ }
+ else
+ {
+ // can't write to cache folder
+ jassertfalse;
+ }
+ }
+
+ if (byteCodeClassLoader != nullptr)
+ {
+ tryLoadingClassWithClassLoader (env, byteCodeClassLoader.get());
+ byteCodeLoaders.add (GlobalRef(byteCodeClassLoader));
+ }
+ }
+ }
+ }
+
+ if (classRef == 0)
+ classRef = (jclass) env->NewGlobalRef (LocalRef (env->FindClass (classPath)));
+
+ jassert (classRef != 0);
+ initialiseFields (env);
+ }
+}
+
+void JNIClassBase::tryLoadingClassWithClassLoader (JNIEnv* env, jobject classLoader)
+{
+ LocalRef classNameAndPackage (javaString (String (classPath).replaceCharacter (L'/', L'.')));
+
+ // Android SDK <= 19 has a bug where the class loader might throw an exception but still return
+ // a non-nullptr. So don't assign the result of this call to a jobject just yet...
+ auto classObj = env->CallObjectMethod (classLoader, JavaClassLoader.findClass, classNameAndPackage.get());
+
+ if (jthrowable exception = env->ExceptionOccurred ())
+ {
+ env->ExceptionClear();
+ classObj = 0;
+ }
+
+ // later versions of Android don't throw at all, so re-check the object
+ if (classObj != nullptr)
+ classRef = (jclass) env->NewGlobalRef (LocalRef (classObj));
+}
+
+void JNIClassBase::release (JNIEnv* env)
+{
+ if (classRef != 0)
+ env->DeleteGlobalRef (classRef);
+}
+
+void JNIClassBase::initialiseAllClasses (JNIEnv* env)
+{
+ const Array& classes = getClasses();
+ for (int i = classes.size(); --i >= 0;)
+ classes.getUnchecked(i)->initialise (env);
+}
+
+void JNIClassBase::releaseAllClasses (JNIEnv* env)
+{
+ const Array& classes = getClasses();
+ for (int i = classes.size(); --i >= 0;)
+ classes.getUnchecked(i)->release (env);
+}
+
+jmethodID JNIClassBase::resolveMethod (JNIEnv* env, const char* methodName, const char* params)
+{
+ jmethodID m = env->GetMethodID (classRef, methodName, params);
+ jassert (m != 0);
+ return m;
+}
+
+jmethodID JNIClassBase::resolveStaticMethod (JNIEnv* env, const char* methodName, const char* params)
+{
+ jmethodID m = env->GetStaticMethodID (classRef, methodName, params);
+ jassert (m != 0);
+ return m;
+}
+
+jfieldID JNIClassBase::resolveField (JNIEnv* env, const char* fieldName, const char* signature)
+{
+ jfieldID f = env->GetFieldID (classRef, fieldName, signature);
+ jassert (f != 0);
+ return f;
+}
+
+jfieldID JNIClassBase::resolveStaticField (JNIEnv* env, const char* fieldName, const char* signature)
+{
+ jfieldID f = env->GetStaticFieldID (classRef, fieldName, signature);
+ jassert (f != 0);
+ return f;
+}
+
+void JNIClassBase::resolveCallbacks (JNIEnv* env, const Array& nativeCallbacks)
+{
+ if (nativeCallbacks.size() > 0)
+ env->RegisterNatives (classRef, nativeCallbacks.begin(), (jint) nativeCallbacks.size());
+}
+
+//==============================================================================
+LocalRef CreateJavaInterface (AndroidInterfaceImplementer* implementer,
+ const StringArray& interfaceNames,
+ LocalRef subclass)
+{
+ auto* env = getEnv();
+
+ implementer->javaSubClass = GlobalRef (subclass);
+
+ // you need to override at least one interface
+ jassert (interfaceNames.size() > 0);
+
+ auto classArray = LocalRef (env->NewObjectArray (interfaceNames.size(), JavaClass, nullptr));
+ LocalRef classLoader;
+
+ for (auto i = 0; i < interfaceNames.size(); ++i)
+ {
+ auto aClass = LocalRef (env->FindClass (interfaceNames[i].toRawUTF8()));
+
+ if (aClass != nullptr)
+ {
+ if (i == 0)
+ classLoader = LocalRef (env->CallObjectMethod (aClass, JavaClass.getClassLoader));
+
+ env->SetObjectArrayElement ((jobjectArray) classArray.get(), i, aClass);
+ }
+ else
+ {
+ // interface class not found
+ jassertfalse;
+ }
+ }
+
+ auto invocationHandler = LocalRef (env->NewObject (JuceInvocationHandler, JuceInvocationHandler.constructor,
+ reinterpret_cast (implementer)));
+
+ // CreateJavaInterface() is expected to be called just once for a given implementer
+ jassert (implementer->invocationHandler == nullptr);
+
+ implementer->invocationHandler = GlobalRef (invocationHandler);
+
+ return LocalRef (env->CallStaticObjectMethod (JavaProxy, JavaProxy.newProxyInstance,
+ classLoader.get(), classArray.get(),
+ invocationHandler.get()));
+}
+
+LocalRef CreateJavaInterface (AndroidInterfaceImplementer* implementer,
+ const StringArray& interfaceNames)
+{
+ return CreateJavaInterface (implementer, interfaceNames,
+ LocalRef (getEnv()->NewObject (JavaObject,
+ JavaObject.constructor)));
+}
+
+LocalRef CreateJavaInterface (AndroidInterfaceImplementer* implementer,
+ const String& interfaceName)
+{
+ return CreateJavaInterface (implementer, StringArray (interfaceName));
+}
+
+AndroidInterfaceImplementer::~AndroidInterfaceImplementer()
+{
+ clear();
+}
+
+void AndroidInterfaceImplementer::clear()
+{
+ if (invocationHandler != nullptr)
+ getEnv()->CallVoidMethod (invocationHandler,
+ JuceInvocationHandler.clear);
+}
+
+jobject AndroidInterfaceImplementer::invoke (jobject /*proxy*/, jobject method, jobjectArray args)
+{
+ auto* env = getEnv();
+ return env->CallObjectMethod (method, JavaMethod.invoke, javaSubClass.get(), args);
+}
+
+jobject juce_invokeImplementer (JNIEnv*, jobject /*object*/, jlong host, jobject proxy,
+ jobject method, jobjectArray args)
+{
+ if (auto* myself = reinterpret_cast (host))
+ return myself->invoke (proxy, method, args);
+
+ return nullptr;
+}
+
+void juce_dispatchDelete (JNIEnv*, jobject /*object*/, jlong host)
+{
+ if (auto* myself = reinterpret_cast (host))
+ delete myself;
+}
+
+//==============================================================================
+jobject ActivityLifecycleCallbacks::invoke (jobject proxy, jobject method, jobjectArray args)
+{
+ auto* env = getEnv();
+
+ auto methodName = juceString ((jstring) env->CallObjectMethod (method, JavaMethod.getName));
+
+ auto activity = env->GetArrayLength (args) > 0 ? env->GetObjectArrayElement (args, 0) : (jobject) nullptr;
+ auto bundle = env->GetArrayLength (args) > 1 ? env->GetObjectArrayElement (args, 1) : (jobject) nullptr;
+
+ if (methodName == "onActivityCreated") { onActivityCreated (activity, bundle); return nullptr; }
+ else if (methodName == "onActivityDestroyed") { onActivityDestroyed (activity); return nullptr; }
+ else if (methodName == "onActivityPaused") { onActivityPaused (activity); return nullptr; }
+ else if (methodName == "onActivityResumed") { onActivityResumed (activity); return nullptr; }
+ else if (methodName == "onActivitySaveInstanceState") { onActivitySaveInstanceState (activity, bundle); return nullptr; }
+ else if (methodName == "onActivityStarted") { onActivityStarted (activity); return nullptr; }
+ else if (methodName == "onActivityStopped") { onActivityStopped (activity); return nullptr; }
+
+ return AndroidInterfaceImplementer::invoke (proxy, method, args);
+}
+
+//==============================================================================
+int getAndroidSDKVersion()
+{
+ // this is used so often that we need to cache this
+ static int sdkVersion = []
+ {
+ // don't use any jni helpers as they might not have been initialised yet
+ // when this method is used
+ auto* env = getEnv();
+
+ auto buildVersion = env->FindClass ("android/os/Build$VERSION");
+ jassert (buildVersion != 0);
+
+ auto sdkVersionField = env->GetStaticFieldID (buildVersion, "SDK_INT", "I");
+ jassert (sdkVersionField != 0);
+
+ return env->GetStaticIntField (buildVersion, sdkVersionField);
+ }();
+
+ return sdkVersion;
+}
+
+bool isPermissionDeclaredInManifest (const String& requestedPermission)
+{
+ auto* env = getEnv();
+
+ LocalRef pkgManager (env->CallObjectMethod (getAppContext().get(), AndroidContext.getPackageManager));
+ LocalRef pkgName (env->CallObjectMethod (getAppContext().get(), AndroidContext.getPackageName));
+ LocalRef pkgInfo (env->CallObjectMethod (pkgManager.get(), AndroidPackageManager.getPackageInfo,
+ pkgName.get(), 0x00001000 /* PERMISSIONS */));
+
+ LocalRef permissions ((jobjectArray) env->GetObjectField (pkgInfo.get(), AndroidPackageInfo.requestedPermissions));
+ int n = env->GetArrayLength (permissions);
+
+ for (int i = 0; i < n; ++i)
+ {
+ LocalRef jstr ((jstring) env->GetObjectArrayElement (permissions, i));
+ String permissionId (juceString (jstr));
+
+ if (permissionId == requestedPermission)
+ return true;
+ }
+
+ return false;
+}
+
+//==============================================================================
+// This byte-code is generated from native/java/com/roli/juce/FragmentOverlay.java with min sdk version 16
+// See juce_core/native/java/README.txt on how to generate this byte-code.
+static const uint8 javaFragmentOverlay[] =
+{31,139,8,8,197,105,229,91,0,3,70,114,97,103,109,101,110,116,79,118,101,114,108,97,121,46,100,101,120,0,133,149,93,136,
+28,69,16,199,171,231,243,62,39,235,93,60,206,243,244,214,136,73,4,201,156,104,32,186,107,184,36,34,236,58,248,145,11,251,
+112,241,101,216,29,215,137,123,51,155,153,217,35,1,65,61,2,201,131,8,10,126,97,2,17,84,16,204,91,30,228,240,73,130,95,40,
+104,124,9,137,47,9,248,230,23,8,65,52,130,255,234,238,201,133,35,226,178,191,169,234,234,238,170,234,154,158,238,78,116,
+100,100,254,129,157,116,170,242,197,47,171,219,126,253,250,218,79,107,167,30,234,189,251,229,123,127,239,158,219,187,86,
+124,127,193,33,234,19,209,145,214,131,19,164,127,187,96,187,151,148,125,4,108,22,74,214,33,241,167,179,120,84,32,63,213,
+237,186,65,244,130,69,244,12,228,121,147,232,34,248,29,252,1,174,130,191,192,63,224,118,140,217,9,154,224,121,240,34,88,
+5,39,192,171,224,117,240,14,56,13,62,0,31,129,51,224,51,240,21,56,15,46,128,203,224,55,240,39,112,108,162,105,48,15,30,6,
+77,240,44,56,1,94,3,167,193,25,176,6,62,7,223,2,164,73,72,135,176,76,114,193,16,24,214,107,29,5,147,188,102,0,247,114,
+125,199,48,216,214,109,210,99,92,173,143,105,253,21,140,25,215,250,219,208,61,173,191,15,125,147,214,63,54,85,221,88,255,
+4,250,45,90,63,7,125,66,235,223,200,88,130,166,136,243,52,100,12,3,217,221,169,219,91,116,30,51,196,227,84,63,203,91,181,
+156,38,53,255,54,41,77,154,149,210,161,59,164,84,126,108,172,120,78,74,139,170,82,186,116,151,158,191,69,74,155,238,38,
+181,102,65,164,163,40,157,127,67,142,146,38,44,108,251,193,86,53,236,87,120,44,103,190,84,229,10,148,253,151,116,127,217,
+147,84,28,140,243,80,71,75,190,131,43,182,90,255,34,54,220,20,130,221,15,55,187,208,187,152,161,38,135,197,49,241,134,
+251,225,138,51,12,95,30,241,76,94,255,207,152,195,107,74,171,130,14,192,163,11,235,24,205,136,41,74,170,38,170,60,74,75,
+11,240,184,112,163,71,87,182,251,11,136,251,180,39,223,163,138,127,245,127,226,187,50,254,184,140,207,181,229,189,195,19,
+249,253,165,21,206,231,166,113,230,55,145,37,60,93,55,71,239,57,210,82,233,195,178,46,66,83,238,55,238,45,117,30,97,72,
+221,210,99,156,122,156,196,197,110,218,252,88,22,118,151,163,164,120,114,37,202,122,225,209,29,135,194,149,144,68,131,68,
+147,140,102,64,34,160,217,32,76,58,89,26,119,252,176,223,247,31,141,195,94,218,45,103,213,104,250,122,111,59,77,10,152,
+252,134,20,53,154,188,222,147,230,254,222,65,210,233,69,53,154,11,218,233,178,159,165,189,216,63,52,104,71,254,134,240,
+53,154,8,56,3,191,23,38,93,127,177,200,226,164,91,35,209,34,171,213,104,4,252,12,2,50,90,77,178,91,77,54,176,128,197,108,
+53,217,12,14,54,104,242,224,77,92,216,237,94,154,71,228,182,251,253,3,207,197,57,89,157,176,8,201,237,196,249,114,156,
+231,52,214,141,138,61,89,119,192,169,228,228,162,21,164,73,23,230,44,76,138,253,81,62,232,193,92,73,147,61,237,34,94,137,
+139,163,202,68,83,27,45,79,132,104,69,52,148,38,251,178,40,44,34,242,74,77,247,204,164,201,254,232,240,32,202,139,167,
+162,140,67,199,105,146,107,111,213,255,238,211,179,221,52,89,44,194,172,160,113,173,104,251,104,127,125,2,141,102,202,
+201,190,180,19,209,72,38,231,75,221,206,11,78,201,42,184,0,46,185,158,113,95,141,118,64,62,94,167,237,230,214,109,211,
+174,119,252,77,26,19,219,93,175,126,238,248,18,85,205,173,247,204,194,246,22,190,57,215,123,4,22,18,54,62,111,235,229,
+151,172,31,45,123,21,39,201,13,216,226,154,101,138,147,182,33,190,3,39,29,72,103,124,195,55,207,178,188,19,120,63,150,
+247,130,73,235,119,67,185,103,249,126,224,179,163,188,35,28,90,191,39,68,85,181,249,174,16,21,117,46,240,249,106,84,149,
+127,190,63,76,61,134,207,21,62,160,68,121,230,84,148,206,247,211,191,48,134,254,198,216,6,0,0};
+
+//==============================================================================
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
+ METHOD (construct, "", "()V") \
+ METHOD (close, "close", "()V") \
+ CALLBACK (FragmentOverlay::onActivityResultNative, "onActivityResultNative", "(JIILandroid/content/Intent;)V") \
+ CALLBACK (FragmentOverlay::onCreateNative, "onCreateNative", "(JLandroid/os/Bundle;)V") \
+ CALLBACK (FragmentOverlay::onStartNative, "onStartNative", "(J)V") \
+ CALLBACK (FragmentOverlay::onRequestPermissionsResultNative, "onRequestPermissionsResultNative", "(JI[Ljava/lang/String;[I)V")
+
+ DECLARE_JNI_CLASS_WITH_BYTECODE (JuceFragmentOverlay, "com/roli/juce/FragmentOverlay", 16, javaFragmentOverlay, sizeof(javaFragmentOverlay))
+#undef JNI_CLASS_MEMBERS
+
+#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \
+ METHOD (show, "show", "(Landroid/app/FragmentManager;Ljava/lang/String;)V")
+
+ DECLARE_JNI_CLASS (AndroidDialogFragment, "android/app/DialogFragment")
+#undef JNI_CLASS_MEMBERS
+
+//==============================================================================
+FragmentOverlay::FragmentOverlay()
+ : native (LocalRef (getEnv()->NewObject (JuceFragmentOverlay, JuceFragmentOverlay.construct)))
+{}
+
+FragmentOverlay::~FragmentOverlay()
+{
+ auto* env = getEnv();
+
+ env->CallVoidMethod (native.get(), JuceFragmentOverlay.close);
+}
+
+void FragmentOverlay::open()
+{
+ auto* env = getEnv();
+
+ LocalRef bundle (env->NewObject (AndroidBundle, AndroidBundle.constructor));
+ env->CallVoidMethod (bundle.get(), AndroidBundle.putLong, javaString ("cppThis").get(), (jlong) this);
+ env->CallVoidMethod (native.get(), AndroidFragment.setArguments, bundle.get());
+
+ LocalRef fm (env->CallObjectMethod (getCurrentActivity().get(), AndroidActivity.getFragmentManager));
+ env->CallVoidMethod (native.get(), AndroidDialogFragment.show, fm.get(), javaString ("FragmentOverlay").get());
+}
+
+void FragmentOverlay::onActivityResultNative (JNIEnv* env, jobject, jlong host,
+ jint requestCode, jint resultCode, jobject data)
+{
+ if (auto* myself = reinterpret_cast (host))
+ myself->onActivityResult (requestCode, resultCode, LocalRef (env->NewLocalRef (data)));
+}
+
+void FragmentOverlay::onCreateNative (JNIEnv* env, jobject, jlong host, jobject bundle)
+{
+ if (auto* myself = reinterpret_cast (host))
+ myself->onCreated (LocalRef (env->NewLocalRef (bundle)));
+}
+
+void FragmentOverlay::onStartNative (JNIEnv*, jobject, jlong host)
+{
+ if (auto* myself = reinterpret_cast (host))
+ myself->onStart();
+}
+
+void FragmentOverlay::onRequestPermissionsResultNative (JNIEnv* env, jobject, jlong host, jint requestCode,
+ jobjectArray jPermissions, jintArray jGrantResults)
+{
+ if (auto* myself = reinterpret_cast (host))
+ {
+ Array grantResults;
+ int n = (jGrantResults != nullptr ? env->GetArrayLength (jGrantResults) : 0);
+
+ if (n > 0)
+ {
+ auto* data = env->GetIntArrayElements (jGrantResults, 0);
+
+ for (int i = 0; i < n; ++i)
+ grantResults.add (data[i]);
+
+ env->ReleaseIntArrayElements (jGrantResults, data, 0);
+ }
+
+ myself->onRequestPermissionsResult (requestCode,
+ javaStringArrayToJuce (LocalRef (jPermissions)),
+ grantResults);
+ }
+}
+
+jobject FragmentOverlay::getNativeHandle()
+{
+ return native.get();
+}
+
+//==============================================================================
+class ActivityLauncher : public FragmentOverlay
+{
+public:
+ ActivityLauncher (const LocalRef& intentToUse,
+ int requestCodeToUse,
+ std::function)> && callbackToUse)
+ : intent (intentToUse), requestCode (requestCodeToUse), callback (std::move (callbackToUse))
+ {}
+
+ void onStart() override
+ {
+ getEnv()->CallVoidMethod (getNativeHandle(), AndroidFragment.startActivityForResult,
+ intent.get(), requestCode);
+ }
+
+ void onActivityResult (int activityRequestCode, int resultCode, LocalRef data) override
+ {
+ if (callback)
+ callback (activityRequestCode, resultCode, std::move (data));
+
+ getEnv()->CallVoidMethod (getNativeHandle(), JuceFragmentOverlay.close);
+ delete this;
+ }
+
+private:
+ GlobalRef intent;
+ int requestCode;
+ std::function)> callback;
+};
+
+void startAndroidActivityForResult (const LocalRef& intent, int requestCode,
+ std::function)> && callback)
+{
+ auto* activityLauncher = new ActivityLauncher (intent, requestCode, std::move (callback));
+ activityLauncher->open();
+}
+
+//==============================================================================
+bool androidHasSystemFeature (const String& property)
+{
+ LocalRef appContext (getAppContext());
+
+ if (appContext != nullptr)
+ {
+ auto* env = getEnv();
+
+ LocalRef packageManager (env->CallObjectMethod (appContext.get(), AndroidContext.getPackageManager));
+
+ if (packageManager != nullptr)
+ return env->CallBooleanMethod (packageManager.get(),
+ AndroidPackageManager.hasSystemFeature,
+ javaString (property).get()) != 0;
+ }
+
+ // unable to get app's context
+ jassertfalse;
+ return false;
+}
+
+String audioManagerGetProperty (const String& property)
+{
+ if (getAndroidSDKVersion() >= 17)
+ {
+ auto* env = getEnv();
+ LocalRef audioManager (env->CallObjectMethod (getAppContext().get(), AndroidContext.getSystemService,
+ javaString ("audio").get()));
+
+ if (audioManager != nullptr)
+ {
+ LocalRef