From b8bc306fa1fdcc9db93c4425cb1aa9492b92dae5 Mon Sep 17 00:00:00 2001
From: "S.V.I. Vilcrow" <svi@vilcrow.net>
Date: Wed, 18 Jan 2023 21:56:52 +0300
Subject: [PATCH] [Android export] Added validation of the project name when
 using $genname in the 'Unique Name' field.

---
 platform/android/export/export_plugin.cpp | 35 +++++++++++++++++++----
 platform/android/export/export_plugin.h   |  3 ++
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp
index bb1ad3d83b4..587caf81bfe 100644
--- a/platform/android/export/export_plugin.cpp
+++ b/platform/android/export/export_plugin.cpp
@@ -437,6 +437,14 @@ String EditorExportPlatformAndroid::get_project_name(const String &p_name) const
 
 String EditorExportPlatformAndroid::get_package_name(const String &p_package) const {
 	String pname = p_package;
+	String name = get_valid_basename();
+	pname = pname.replace("$genname", name);
+	return pname;
+}
+
+// Returns the project name without invalid characters
+// or the "noname" string if all characters are invalid.
+String EditorExportPlatformAndroid::get_valid_basename() const {
 	String basename = GLOBAL_GET("application/config/name");
 	basename = basename.to_lower();
 
@@ -452,13 +460,12 @@ String EditorExportPlatformAndroid::get_package_name(const String &p_package) co
 			first = false;
 		}
 	}
+
 	if (name.is_empty()) {
 		name = "noname";
 	}
 
-	pname = pname.replace("$genname", name);
-
-	return pname;
+	return name;
 }
 
 String EditorExportPlatformAndroid::get_assets_directory(const Ref<EditorExportPreset> &p_preset, int p_export_format) const {
@@ -466,7 +473,7 @@ String EditorExportPlatformAndroid::get_assets_directory(const Ref<EditorExportP
 }
 
 bool EditorExportPlatformAndroid::is_package_name_valid(const String &p_package, String *r_error) const {
-	String pname = p_package;
+	String pname = get_package_name(p_package);
 
 	if (pname.length() == 0) {
 		if (r_error) {
@@ -525,6 +532,24 @@ bool EditorExportPlatformAndroid::is_package_name_valid(const String &p_package,
 		return false;
 	}
 
+	if (p_package.find("$genname") >= 0 && !is_project_name_valid()) {
+		if (r_error) {
+			*r_error = TTR("The project name does not meet the requirement for the package name format. Please explicitly specify the package name.");
+		}
+		return false;
+	}
+
+	return true;
+}
+
+bool EditorExportPlatformAndroid::is_project_name_valid() const {
+	// Get the original project name and convert to lowercase.
+	String basename = GLOBAL_GET("application/config/name");
+	basename = basename.to_lower();
+	// Check if there are invalid characters.
+	if (basename != get_valid_basename()) {
+		return false;
+	}
 	return true;
 }
 
@@ -2286,7 +2311,7 @@ bool EditorExportPlatformAndroid::has_valid_project_configuration(const Ref<Edit
 	String pn = p_preset->get("package/unique_name");
 	String pn_err;
 
-	if (!is_package_name_valid(get_package_name(pn), &pn_err)) {
+	if (!is_package_name_valid(pn, &pn_err)) {
 		valid = false;
 		err += TTR("Invalid package name:") + " " + pn_err + "\n";
 	}
diff --git a/platform/android/export/export_plugin.h b/platform/android/export/export_plugin.h
index a6dfc9fcb3e..bff769fcbae 100644
--- a/platform/android/export/export_plugin.h
+++ b/platform/android/export/export_plugin.h
@@ -91,9 +91,12 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
 
 	String get_package_name(const String &p_package) const;
 
+	String get_valid_basename() const;
+
 	String get_assets_directory(const Ref<EditorExportPreset> &p_preset, int p_export_format) const;
 
 	bool is_package_name_valid(const String &p_package, String *r_error = nullptr) const;
+	bool is_project_name_valid() const;
 
 	static bool _should_compress_asset(const String &p_path, const Vector<uint8_t> &p_data);