diff options
| author | Fredia Huya-Kouadio <fhuyakou@gmail.com> | 2021-02-26 12:28:19 -0800 |
|---|---|---|
| committer | Fredia Huya-Kouadio <fhuyakou@gmail.com> | 2021-02-26 12:31:12 -0800 |
| commit | 6f0ca6c9f7ae08974ba321043383725ca8dee0c6 (patch) | |
| tree | 6be878d10ae6265ca6f8aa55d704e7a875b8d9d7 | |
| parent | 7b685a1558aaa7e014d358c2db8be83aef5d8b8f (diff) | |
Fix invalid missing template error when the Android build template is not installed.
| -rw-r--r-- | platform/android/export/export.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 088bb35f62..bca4a39bdd 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -2003,6 +2003,7 @@ public: String template_err; bool dvalid = false; bool rvalid = false; + bool has_export_templates = false; if (p_preset->get("custom_template/debug") != "") { dvalid = FileAccess::exists(p_preset->get("custom_template/debug")); @@ -2010,7 +2011,7 @@ public: template_err += TTR("Custom debug template not found.") + "\n"; } } else { - dvalid = exists_export_template("android_debug.apk", &template_err); + has_export_templates |= exists_export_template("android_debug.apk", &template_err); } if (p_preset->get("custom_template/release") != "") { @@ -2019,22 +2020,24 @@ public: template_err += TTR("Custom release template not found.") + "\n"; } } else { - rvalid = exists_export_template("android_release.apk", &template_err); + has_export_templates |= exists_export_template("android_release.apk", &template_err); } - valid = dvalid || rvalid; + r_missing_templates = !has_export_templates; + valid = dvalid || rvalid || has_export_templates; if (!valid) { err += template_err; } } else { - valid = exists_export_template("android_source.zip", &err); + r_missing_templates = !exists_export_template("android_source.zip", &err); - if (!FileAccess::exists("res://android/build/build.gradle")) { + bool installed_android_build_template = FileAccess::exists("res://android/build/build.gradle"); + if (!installed_android_build_template) { err += TTR("Android build template not installed in the project. Install it from the Project menu.") + "\n"; - valid = false; } + + valid = installed_android_build_template && !r_missing_templates; } - r_missing_templates = !valid; // Validate the rest of the configuration. |