Fixed: Use default values if extra-keys or extra-keys-style termux.pr…

…operties values are empty
termux · Aug 23, 2021 · fbb9114 · fbb9114
1 parent 2a74d43
commit fbb9114
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java b/termux-shared/src/main/java/com/termux/shared/settings/properties/SharedProperties.java
@@ -553,6 +553,17 @@ public static <T> T getDefaultIfNull(@androidx.annotation.Nullable T object, @an
         return (object == null) ? def : object;
     }
 
+    /**
+     * Get the {@link String} object itself if it is not {@code null} or empty, otherwise default.
+     *
+     * @param object The {@link String} to check.
+     * @param def The default {@link String}.
+     * @return Returns {@code object} if it is not {@code null}, otherwise returns {@code def}.
+     */
+    public static String getDefaultIfNullOrEmpty(@androidx.annotation.Nullable String object, @androidx.annotation.Nullable String def) {
+        return (object == null || object.isEmpty()) ? def : object;
+    }
+
     /**
      * Covert the {@link String} value to lowercase.
      *

diff --git a/...ux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java b/...ux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
@@ -423,7 +423,7 @@ public static String getDefaultWorkingDirectoryInternalPropertyValueFromValue(St
      * @return Returns the internal value for value.
      */
     public static String getExtraKeysInternalPropertyValueFromValue(String value) {
-        return SharedProperties.getDefaultIfNull(value, TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS);
+        return SharedProperties.getDefaultIfNullOrEmpty(value, TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS);
     }
 
     /**
@@ -433,7 +433,7 @@ public static String getExtraKeysInternalPropertyValueFromValue(String value) {
      * @return Returns the internal value for value.
      */
     public static String getExtraKeysStyleInternalPropertyValueFromValue(String value) {
-        return SharedProperties.getDefaultIfNull(value, TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS_STYLE);
+        return SharedProperties.getDefaultIfNullOrEmpty(value, TermuxPropertyConstants.DEFAULT_IVALUE_EXTRA_KEYS_STYLE);
     }
 
     /**