From 96b88ffa19bc6eeca30065ab9e14c0f370c34e3e Mon Sep 17 00:00:00 2001
From: Robert Strouse <rstrouse@truepointsolutions.com>
Date: Thu, 19 Oct 2023 15:59:45 -0700
Subject: [PATCH] Force backup prior to firmware install from Github

---
 SomfyController.littlefs.bin | Bin 1441792 -> 1441792 bytes
 data/index.js                |  27 +++++++++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/SomfyController.littlefs.bin b/SomfyController.littlefs.bin
index 91e25ceccadd1468203564b848f694c3dc94261f..522edf38e30bef65e180e0dd7c9424c5786b7a69 100644
GIT binary patch
delta 688
zcmZ9}O-NKx6bEo$zBj(nnfLB-oUgv-N!W)9j+>Oy9HLE&S}8~oGm+LJm5D4WDxL&W
z(TqKv=r5*~eF&9`i|A1cdqE2qkrpVq2$Td{RJdr7Eu=HKbMb?F5BHvP?zyJfY?{sE
zH~gNJOnzRnVX=1DS(waz5|vrUFMH0ttZqFOUyQz+p!Td}M0*2kv6EGc(U#Sk*SXlW
zSm1grAh8WBpUF&NE>^%)=4OSgh<TWoX-sFrjs>XdymI{P#f}r`NYgfa7@;!6IyDcJ
zQ7T2|83l1@l*%D)X<np9$w1<<rlb5hMPS?!gqyFZ7}JhWA(nIl@ie(%^k_1Up4P*-
zQc60GB{|<fZZ&vWFM#t$Q!t;V46H4>iU%pp1!IW(_;^rL?e+|9mei1xmltH{xlKE<
z-=Z+~nY7jZ-c2D1)@QGRzugqK+bnu7;cXqMsL$sDBBBfY`mMR_crUFeaK^ZnHLJ^*
z9pUFK`$Zw<&+zu^0DZ&sB~8u6xc3<$V?3$5@Z~;LVs(&S+@0b0@*6FLM4cX7cg*Hv
zZVBa$v}rBrm_<$Nt0m?{2$Lp1z#P(jn2L~6R2wZbDvX-sg<X5G@JKJiTo(~`chMds
zmbeFJQUsB^XixRg4oMFGA3}s`(eOhQ;b(+=a9T7sn);~%C6-ofTm6(&aMhp#crn0Z
zoOnu&IDC&>w*8Rm-TsZ7B9|sNPakVfwzYPm`iKZ%dAnDJ)u#t-{?J*)7UT59osETK
SDTh){amw+foRVS3ANvR1;_I{k

delta 365
zcmXBOKS%;`6bEomJyW~%_p&?xAgK}5P<U-MR5wV_AT0$pq%GD~2T@~5fd-|N7d?Wo
zE5fBk2>J~z2W>6Y5)_RNEs@n8J!$wXU%v0lD-<$?LZ-1ROCKeNO`mLzj+u)`#uFPd
zEZHf29*^Xgb4@ipv9@OjakZ-aXG_VZ`o1}rYiB!}QqmNG*olKUiAY?egSd%@cu6Ob
zNEh)DKVe)`Ai06-`_PB!H|E8a1oYy9?vwB|0e*~E-~{KV{XYI(0iS^E5C*w=05gI+
zB-m_0!nY{1W2&D;u$2YI9}M^vu_e=5G{oFET!lP;slkANKiiPQ@)=0DYC;TaHL9B?
z=%O=BOZa6%3U4n!#``On#q2q__+1^wJ*br-h>x%S7@umuv&bS;Z=bXu2oN5<flH5}
XGwE6jYp$XNMXS4L1&UTr-IBFGXg_oO

diff --git a/data/index.js b/data/index.js
index 9de084d..f549c6a 100644
--- a/data/index.js
+++ b/data/index.js
@@ -4128,12 +4128,25 @@ class Firmware {
         }
 
     }
-    installGitRelease(div) {
+    async installGitRelease(div) {
+        if (!this.isMobile()) {
+            console.log('Starting backup');
+            try {
+                await firmware.backup();
+                console.log('Backup Complete');
+            }
+            catch (err) {
+                ui.serviceError(el, err);
+                return;
+            }
+        }
+
         let obj = ui.fromElement(div);
         console.log(obj);
         putJSONSync(`/downloadFirmware?ver=${obj.version}`, {}, (err, ver) => {
             if (err) ui.serviceError(err);
             else {
+                general.reloadApp = true;
                 // Change the display and allow the percentage to be shown when the socket emits the progress.
                 let html = `<div>Installing ${ver.name}</div><div style="font-size:.7em;margin-top:4px;">Please wait as the files are downloaded and installed.</div>`;
                 html += `<div class="progress-bar" id="progFirmwareDownload" style="--progress:0%;margin-top:10px;text-align:center;"></div>`;
@@ -4144,7 +4157,6 @@ class Firmware {
                 html += `<button id="btnCancelUpdate" type="button" style="width:40%;padding-left:20px;padding-right:20px;display:inline-block;" onclick="firmware.cancelInstallGit(document.getElementById('divGitInstall'));">Cancel</button>`;
                 html += `</div>`;
                 div.innerHTML = html;
-
             }
         });
     }
@@ -4173,9 +4185,20 @@ class Firmware {
                 }
                 html += `<label for="selVersion">Select a version</label>`;
                 html += '</select></div>';
+                if (this.isMobile()) {
+                    html += `<div style="width:100%;color:red;text-align:center;font-weight:bold;"><span style="margin-top:7px;width:100%;background:yellow;padding:3px;display:inline-block;border-radius:5px;background:white;">WARNING<span></div>`;
+                    html += '<hr/><div style="font-size:14px;margin-bottom:10px;">This browser does not support automatic backups.  It is highly recommended that you back up your configuration using the backup button before proceeding.</div>';
+                }
+                else {
+                    html += '<hr/><div style="font-size:14px;margin-bottom:10px;">A backup file for your configuration will be downloaded to your browser.  If the firmware update process fails please restore this file using the restore button after going through the onboarding process.</div>'
+                }
                 html += `<hr></hr><div class="button-container" style="text-align:center;">`;
+                if (this.isMobile()) {
+                    html += `<button id="btnBackupCfg" type="button" style="display:inline-block;width:calc(80% + 7px);padding-left:20px;padding-right:20px;margin-right:4px;" onclick="firmware.backup();">Backup</button>`;
+                }
                 html += `<button id="btnUpdate" type="button" style="width:40%;padding-left:20px;padding-right:20px;display:inline-block;margin-right:7px;" onclick="firmware.installGitRelease(document.getElementById('divGitInstall'));">Update</button>`;
                 html += `<button id="btnClose" type="button" style="width:40%;padding-left:20px;padding-right:20px;display:inline-block;" onclick="document.getElementById('divGitInstall').remove();">Cancel</button>`;
+
                 html += `</div></div>`;
 
                 div.innerHTML = html;