diff options
| author | Nathaniel Morihara <nathanielmorihara@gmail.com> | 2021-05-20 22:29:44 -0400 |
|---|---|---|
| committer | Nathaniel Morihara <nathanielmorihara@gmail.com> | 2021-05-24 19:48:29 -0400 |
| commit | 2cf19293ba10c4bc735afcfae54ef6242c538bde (patch) | |
| tree | 0ff24df3e6a046e9f01c7ae6c8420ebd622588f4 /platform/android/export | |
| parent | af03e9c83018b47cb82da67e5f8e277b29b82d66 (diff) | |
Exporting: Android Debug Keystore Warnings
Diffstat (limited to 'platform/android/export')
| -rw-r--r-- | platform/android/export/export.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index ec2618a3d5..c94147640d 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -2029,6 +2029,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.is_empty() || dk_user.is_empty() || dk_password.is_empty()) && (!dk.is_empty() || !dk_user.is_empty() || !dk_password.is_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"); @@ -2039,6 +2046,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.is_empty() || rk_user.is_empty() || rk_password.is_empty()) && (!rk.is_empty() || !rk_user.is_empty() || !rk_password.is_empty())) { + valid = false; + err += TTR("Either Release Keystore, Release User AND Release Password settings must be configured OR none of them.") + "\n"; + } if (!rk.is_empty() && !FileAccess::exists(rk)) { valid = false; |