|
@@ -2029,6 +2029,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.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)) {
|
|
if (!FileAccess::exists(dk)) {
|
|
dk = EditorSettings::get_singleton()->get("export/android/debug_keystore");
|
|
dk = EditorSettings::get_singleton()->get("export/android/debug_keystore");
|
|
@@ -2039,6 +2046,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.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)) {
|
|
if (!rk.is_empty() && !FileAccess::exists(rk)) {
|
|
valid = false;
|
|
valid = false;
|