godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Exporting: Android Debug Keystore Warnings

Browse Source 
(cherry picked from commit 2cf19293ba)
This commit is contained in:
Nathaniel Morihara
2021-05-20 22:29:44 -04:00
committed by Rémi Verschelde
parent c82cb25a93
commit 471c0ba700
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
platform/android/export/export.cpp
View File

@@ -2100,6 +2100,13 @@ public:
// Validate the rest of the configuration. // Validate the rest of the configuration.
String dk = p_preset->get("keystore/debug"); 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)) { if (!FileAccess::exists(dk)) {
dk = EditorSettings::get_singleton()->get("export/android/debug_keystore"); dk = EditorSettings::get_singleton()->get("export/android/debug_keystore");
@@ -2110,6 +2117,13 @@ public:
} }
String rk = p_preset->get("keystore/release"); 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)) { if (!rk.empty() && !FileAccess::exists(rk)) {
valid = false; valid = false;