From 3e26732693abd7bcfd9b67d539da0c4c11aab6a4 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Fri, 5 May 2023 10:47:49 +0100
Subject: [PATCH] bringing Android app loader closer to main version, also
 safer loader.js code

---
 android.html | 14 +++++++++-----
 loader.js    | 12 +++++++++---
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/android.html b/android.html
index 3c78f486c..c7f10e1be 100644
--- a/android.html
+++ b/android.html
@@ -133,14 +133,18 @@
         <p>Using <a href="https://espruino.com/" target="_blank">Espruino</a>, Icons from <a href="https://icons8.com/" target="_blank">icons8.com</a></p>
 
         <h3>Utilities</h3>
-        <p><button class="btn tooltip" id="settime" data-tooltip="Set the Bangle's time to your Browser's time">Set Bangle.js Time</button>
+        <p>
+           <button class="btn tooltip" id="settime" data-tooltip="Set the Bangle's time to your Browser's time">Set Bangle.js Time</button>
            <button class="btn tooltip" id="removeall" data-tooltip="Delete everything, leave it blank">Remove all Apps</button>
            <button class="btn tooltip" id="reinstallall" data-tooltip="Re-install every app, leave all data">Reinstall apps</button>
            <button class="btn tooltip" id="installdefault" data-tooltip="Delete everything, install default apps">Install default apps</button>
            <button class="btn tooltip" id="installfavourite" data-tooltip="Delete everything, install your favourites">Install favourite apps</button>
-           <button class="btn tooltip" id="newGithubIssue" data-tooltip="Create a new issue on GitHub">New issue on GitHub</button></p>
-        <p><button class="btn tooltip" id="downloadallapps" data-tooltip="Download all Bangle.js files to a ZIP file">Backup</button>
-           <button class="btn tooltip" id="uploadallapps" data-tooltip="Restore Bangle.js from a ZIP file">Restore</button></p>
+        </p><p>
+           <button class="btn tooltip" id="newGithubIssue" data-tooltip="Create a new issue on GitHub">New issue on GitHub</button>
+           <button class="btn tooltip" id="downloadallapps" data-tooltip="Download all Bangle.js files to a ZIP file">Backup</button>
+           <button class="btn tooltip" id="uploadallapps" data-tooltip="Restore Bangle.js from a ZIP file">Restore</button>
+           <button class="btn tooltip" id="defaultbanglesettings" data-tooltip="Reset your Bangle's settings to the defaults">Reset Settings</button>
+        </p>
         <h3>Settings</h3>
         <div class="form-group">
           <label class="form-switch">
@@ -167,7 +171,7 @@
               <input type="checkbox" id="settings-minify">
               <i class="form-icon"></i> Minify apps before upload (⚠️DANGER⚠️: Not recommended. Uploads smaller, faster apps but this <b>will</b> break many apps)
             </label>
-            <button class="btn" id="defaultsettings">Reset to default settings</button>
+            <button class="btn" id="defaultsettings">Reset to default App Loader settings</button>
           </details>
         </div>
         <div id="more-deviceinfo" style="display:none">
diff --git a/loader.js b/loader.js
index 956a103fc..257c29825 100644
--- a/loader.js
+++ b/loader.js
@@ -204,8 +204,11 @@ window.addEventListener('load', (event) => {
     });
   });
 
+  var el;
+
   // Button to install all default apps in one go
-  document.getElementById("reinstallall").addEventListener("click",event=>{
+  el = document.getElementById("reinstallall");
+  if (el) el.addEventListener("click",event=>{
     var promise =  showPrompt("Reinstall","Really re-install all apps?").then(() => {
       Comms.reset().then(_ =>
         getInstalledApps()
@@ -231,8 +234,10 @@ window.addEventListener('load', (event) => {
     });
   });
 
+  
   // Button to install all default apps in one go
-  document.getElementById("installdefault").addEventListener("click", event=>{
+  el = document.getElementById("installdefault");
+  if (el) el.addEventListener("click", event=>{
     getInstalledApps().then(() => {
       if (device.id == "BANGLEJS")
         return httpGet("defaultapps_banglejs1.json");
@@ -248,7 +253,8 @@ window.addEventListener('load', (event) => {
   });
 
   // Button to reset the Bangle's settings
-  document.getElementById("defaultbanglesettings").addEventListener("click", event=>{
+  el = document.getElementById("defaultbanglesettings");
+  if (el) el.addEventListener("click", event=>{
     showPrompt("Reset Settings","Really reset Bangle.js settings?").then(() => {
       Comms.write("\x10require('Storage').erase('setting.json');load()\n");
       showToast("Settings reset!", "success");