From 471c0ba700cbd2a9236b7d9768eb8adc3b17fbce Mon Sep 17 00:00:00 2001 From: Nathaniel Morihara Date: Thu, 20 May 2021 22:29:44 -0400 Subject: [PATCH] Exporting: Android Debug Keystore Warnings (cherry picked from commit 2cf19293ba10c4bc735afcfae54ef6242c538bde) --- platform/android/export/export.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 2500a7a1f0a..e4b210666f7 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -2100,6 +2100,13 @@ public: // Validate the rest of the configuration. String dk = p_preset->get("keystore/debug"); + String dk_user = p_preset->get("keystore/debug_user"); + String dk_password = p_preset->get("keystore/debug_password"); + + if ((dk.empty() || dk_user.empty() || dk_password.empty()) && (!dk.empty() || !dk_user.empty() || !dk_password.empty())) { + valid = false; + err += TTR("Either Debug Keystore, Debug User AND Debug Password settings must be configured OR none of them.") + "\n"; + } if (!FileAccess::exists(dk)) { dk = EditorSettings::get_singleton()->get("export/android/debug_keystore"); @@ -2110,6 +2117,13 @@ public: } String rk = p_preset->get("keystore/release"); + String rk_user = p_preset->get("keystore/release_user"); + String rk_password = p_preset->get("keystore/release_password"); + + if ((rk.empty() || rk_user.empty() || rk_password.empty()) && (!rk.empty() || !rk_user.empty() || !rk_password.empty())) { + valid = false; + err += TTR("Either Release Keystore, Release User AND Release Password settings must be configured OR none of them.") + "\n"; + } if (!rk.empty() && !FileAccess::exists(rk)) { valid = false;