From 7dea2ad1de6ec778472611c76a5833cfb848b378 Mon Sep 17 00:00:00 2001
From: fhuya <fhuya@google.com>
Date: Fri, 6 Mar 2020 17:22:04 -0800
Subject: Trim the whitespace around the plugins names.
---
platform/android/java/app/config.gradle | 2 +-
.../lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
(limited to 'platform/android/java')
diff --git a/platform/android/java/app/config.gradle b/platform/android/java/app/config.gradle
index 3fb26326c0..eaaefcbccb 100644
--- a/platform/android/java/app/config.gradle
+++ b/platform/android/java/app/config.gradle
@@ -42,7 +42,7 @@ ext.getGodotPluginsBinaries = { ->
String pluginsList = project.property("custom_template_plugins")
if (pluginsList != null && !pluginsList.trim().isEmpty()) {
for (String plugin : pluginsList.split(",")) {
- binDeps += plugin + "*.aar"
+ binDeps += plugin.trim() + "*.aar"
}
}
}
diff --git a/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java b/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java
index 3562920182..b6d949b7bf 100644
--- a/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java
+++ b/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java
@@ -139,7 +139,10 @@ public final class GodotPluginRegistry {
return;
}
- enabledPluginsSet = new HashSet<>(Arrays.asList(enabledPluginsList));
+ enabledPluginsSet = new HashSet<>();
+ for (String enabledPlugin : enabledPluginsList) {
+ enabledPluginsSet.add(enabledPlugin.trim());
+ }
} else {
enabledPluginsSet = null;
}
@@ -148,7 +151,7 @@ public final class GodotPluginRegistry {
for (String metaDataName : metaData.keySet()) {
// Parse the meta-data looking for entry with the Godot plugin name prefix.
if (metaDataName.startsWith(GODOT_PLUGIN_V1_NAME_PREFIX)) {
- String pluginName = metaDataName.substring(godotPluginV1NamePrefixLength);
+ String pluginName = metaDataName.substring(godotPluginV1NamePrefixLength).trim();
if (enabledPluginsSet != null && !enabledPluginsSet.contains(pluginName)) {
Log.w(TAG, "Plugin " + pluginName + " is listed in the dependencies but is not enabled.");
continue;
--
cgit v1.2.3