From 71a1da2cfedfe6a913d6df6ac2c6b035507392fc Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Sat, 20 Apr 2024 12:02:20 +0100
Subject: [PATCH] kbmulti: simplify default settings

---
 apps/kbmulti/lib.js      | 11 ++++++-----
 apps/kbmulti/settings.js | 10 ++++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/apps/kbmulti/lib.js b/apps/kbmulti/lib.js
index 04240b3e5..471544b92 100644
--- a/apps/kbmulti/lib.js
+++ b/apps/kbmulti/lib.js
@@ -5,11 +5,12 @@ exports.input = function(options) {
   var text = options.text;
   if ("string"!=typeof text) text="";
 
-  var settings = require('Storage').readJSON("kbmulti.settings.json", true) || {};
-  if (settings.firstLaunch===undefined) { settings.firstLaunch = true; }
-  if (settings.charTimeout===undefined) { settings.charTimeout = 500; }
-  if (settings.showHelpBtn===undefined) { settings.showHelpBtn = true; }
-  if (settings.autoLowercase===undefined) { settings.autoLowercase = true; }
+  var settings = Object.assign({
+    firstLaunch: true,
+    showHelpBtn: true,
+    charTimeout: 500,
+    autoLowercase: true,
+  }, require('Storage').readJSON("kbmulti.settings.json", true));
 
   var fontSize = "6x15";
   var Layout = require("Layout");
diff --git a/apps/kbmulti/settings.js b/apps/kbmulti/settings.js
index 57cca6519..7ec7fd0cf 100644
--- a/apps/kbmulti/settings.js
+++ b/apps/kbmulti/settings.js
@@ -1,9 +1,11 @@
 (function(back) {
     function settings() {
-      var settings = require('Storage').readJSON("kbmulti.settings.json", true) || {};
-      if (settings.showHelpBtn===undefined) { settings.showHelpBtn = true; }
-      if (settings.charTimeout===undefined) { settings.charTimeout = 500; }
-      if (settings.autoLowercase===undefined) { settings.autoLowercase = true; }
+      var settings = Object.assign({
+        showHelpBtn: true,
+        charTimeout: 500,
+        autoLowercase: true,
+      }, require('Storage').readJSON("kbmulti.settings.json", true));
+
       return settings;
     }