From f74293e8fb4eca823c5aaf75699008af9b8f42d3 Mon Sep 17 00:00:00 2001
From: Robert Vanden Eynde <robertvandeneynde@hotmail.com>
Date: Thu, 2 Aug 2018 00:38:54 +0200
Subject: [PATCH] Use extra-keys spelling and correct default setting

---
 .../main/java/com/termux/app/TermuxPreferences.java   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxPreferences.java b/app/src/main/java/com/termux/app/TermuxPreferences.java
index 0c030ca7..cfe9491a 100644
--- a/app/src/main/java/com/termux/app/TermuxPreferences.java
+++ b/app/src/main/java/com/termux/app/TermuxPreferences.java
@@ -45,6 +45,13 @@ final class TermuxPreferences {
 
     boolean mBackIsEscape;
     boolean mShowExtraKeys;
+    
+    /**
+     * If value is not in the range [min, max], set it to either min or max.
+     */
+    static int clamp(int value, int min, int max) {
+        return Math.min(Math.max(value, min), max);
+    }
 
     TermuxPreferences(Context context) {
         reloadFromProperties(context);
@@ -68,7 +75,7 @@ final class TermuxPreferences {
         } catch (NumberFormatException | ClassCastException e) {
             mFontSize = defaultFontSize;
         }
-        mFontSize = Math.max(MIN_FONTSIZE, Math.min(mFontSize, MAX_FONTSIZE));
+        mFontSize = clamp(mFontSize, MIN_FONTSIZE, MAX_FONTSIZE); 
     }
 
     boolean isShowExtraKeys() {
@@ -134,7 +141,7 @@ final class TermuxPreferences {
                     break;
             }
             
-            JSONArray arr = new JSONArray(props.getProperty("extrakeys", "[[\"ESC\",\"CTRL\",\"ALT\",\"TAB\",\"―\",\"/\",\"|\"]]"));
+            JSONArray arr = new JSONArray(props.getProperty("extra-keys", "[[\"ESC\",\"CTRL\",\"ALT\",\"TAB\",\"-\",\"/\",\"|\"]]"));
             mExtraKeys = new String[arr.length()][];
             for(int i = 0; i < arr.length(); i++) {
                 JSONArray line = arr.getJSONArray(i);