🛠️ fix late initialization of android sdk dir

crossmob · Sep 21, 2022 · 04655b7 · 04655b7
1 parent 246248e
commit 04655b7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/cmbuild b/cmbuild
diff --git a/cmmanager b/cmmanager
diff --git a/cmutils/cmutils-tools/src/main/java/org/crossmobile/utils/ParamList.java b/cmutils/cmutils-tools/src/main/java/org/crossmobile/utils/ParamList.java
@@ -6,6 +6,8 @@
 
 package org.crossmobile.utils;
 
+import org.crossmobile.prefs.Prefs;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -27,6 +29,10 @@ public void updateFromProperties(File file) {
         if (file.isFile())
             try {
                 props.load(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8));
+                String sdkDir = Prefs.getAndroidSDKLocation();
+                String givenSdkDir = props.getProperty("sdk.dir", "");
+                if (!sdkDir.trim().isEmpty() && new File(sdkDir).isDirectory() && (givenSdkDir.trim().isEmpty() || !new File(givenSdkDir).isDirectory()))
+                    props.put("sdk.dir", Prefs.getAndroidSDKLocation());
             } catch (IOException ignored) {
             }
     }

diff --git a/cmutils/cmutils-tools/src/main/java/org/crossmobile/utils/ParamsCommon.java b/cmutils/cmutils-tools/src/main/java/org/crossmobile/utils/ParamsCommon.java
@@ -40,7 +40,7 @@ public enum ParamsCommon {
     KEY_ALIAS("androiddebugkey", true, LOCAL),
     KEY_STORE_PASSWORD("", true, LOCAL),
     KEY_ALIAS_PASSWORD("", true, LOCAL),
-    SDK_DIR(Prefs.getAndroidSDKLocation(), true, LOCAL),
+    SDK_DIR("", true, LOCAL),
 
     FILESHARINGENABLED("false"),
     CM_OBJC_SAFEMEMBERS("true"),