From 415fec020e582c3e642e194cdb79a8fb93ef3372 Mon Sep 17 00:00:00 2001
From: Robert Strouse <rstrouse@truepointsolutions.com>
Date: Mon, 19 Jun 2023 13:00:23 -0700
Subject: [PATCH] Disable backup download during application update on mobile
 #47

---
 ConfigSettings.h              |   2 +-
 SomfyController.ino.esp32.bin | Bin 1069248 -> 1069248 bytes
 SomfyController.littlefs.bin  | Bin 1441792 -> 1441792 bytes
 data/appversion               |   2 +-
 data/index.html               |  10 +++---
 data/index.js                 |  64 +++++++++++++++++++++-------------
 data/main.css                 |   7 ++++
 7 files changed, 54 insertions(+), 31 deletions(-)

diff --git a/ConfigSettings.h b/ConfigSettings.h
index 568440a..da0ab82 100644
--- a/ConfigSettings.h
+++ b/ConfigSettings.h
@@ -3,7 +3,7 @@
 #ifndef configsettings_h
 #define configsettings_h
 
-#define FW_VERSION "v1.7.1"
+#define FW_VERSION "v1.7.2"
 enum DeviceStatus {
   DS_OK = 0,
   DS_ERROR = 1,
diff --git a/SomfyController.ino.esp32.bin b/SomfyController.ino.esp32.bin
index 607a82c98188ced7c6a8fdc9aa2127b4c6940eec..f6f28db2d1c135c5120e5fb2b010e3e9cbdd0817 100644
GIT binary patch
delta 156
zcmX@G(DA@R#|ax0tTy&0pN~<wy36-g;J(!-uKKa8oq2M5$0f7>=9^m7lD16`EM^SY
ztiY%u%V^Z>D%b8R#|XqsK+FupEI`Z(#B4y!4#XTl%n8I?K+FxqJV49~#C$-^zui?%
rAj(Kl|ICEmJ5r027=*XP_sgVb<m?araC+zY=LZX#1#dI#lko%quFyIw

delta 158
zcmX@G(DA@R#|azc8#gWee9M+eH0N{{x5MGnx|9AaeU_QB(k<Mx`~37*o2P$#%qKkY
zf!$^WMip5`!)8~xc2_w@AZ7w$W*}w(Vpbq#17da{<^W<&Am##MZXo6XVqPHT17iN|
tu5toVMv9k{1DCwc4LSb6c3$^_=RWSsl4hN;pS>ftRFMB~VR2rmAONsmJb3^B

diff --git a/SomfyController.littlefs.bin b/SomfyController.littlefs.bin
index b88c3a3cd665b516815bfbdf455f131bb2e9f97b..7f3fc62a5ff2926586a7fd7726e6842bbc597a5d 100644
GIT binary patch
delta 1688
zcmZuxe{2**6z;ay_S)|3Tq(3yis^t9u29;gRH>B0T`Qp#!3r2K(cs?Q-rd@}-Rs^S
zrFhsDwdfyK;9_4Csl-Zu*s2Ahn`qRk2}+`Y@P|!E(Hffw1^Jn1K_kxI0#)KBUv}or
z``&x=y|>%ewzaKo>+s9AjPfv^dQdp$o)_O|TgLA0+3WRho8m_&JD0~9!tc+vBy7I2
zDPHd?I%C+5IkW35toO~Nr10vA%5#M~#wfKUJ~GR~9!}6FcwhSy3lj8P)8;Fi;J^Md
za?P;Cow;=^Kgv+{cxCH-pT|u$^=v(2Bp>G&r)(%mu=7ltuWX#}tPM<=?7TX5*k$A%
ztNdhXTf51oo|Q)p_86aa;;YpOw%xS(%EtH)UYWRH*j{kj_c-kgMKVPSg@q!OB8?)Q
z!b*`rkx7w7!Rk&s+Ua1*;ZrACYrcxW;X)!)u6Mf7voFG>r_d~5kE0zK0a5Y?v=z(B
zfq4hbf$`^2DunA$I(&Z<Wx}j)k*t$%&}pk>EGa1oPS&F9`uS7nM20?c2F-CX<$KN+
zaQfK-d|+p*6j`shrJ(32CeNWva{CF28WH>&sV1_pUGfW>qLxM@qU!RCvR0}ok1EZg
zS}Q~-t!kR3ids~aNtsLbs*2=|Neux-7U@gz#%h9sr?Ey<)s|RIO{^g(wA3g{W9;$z
zHD><U7D@Ih%@Ja9*3n&1jBS#Fjj_kVqAHN}k}Q=;rJ5Mg9RE{Pv028hDqZcuYf|CR
zB$t-$5rQ7aQl2j&OGw4?@Qz~r_yKH7w${*EqTyN}C{5T7Z+Eg*IN3!tywQz$SlErT
z!S@|1Of%i!NH;El9}ePI*&9^ODT?1IbWb-v$fSgt1!w|Xq1PV5*OCi-#GwVGNa?h!
zcXfr!fb*EeaOw>_8)7ZoO32@XvM?>Hs#)@CffYufRd8!Fp3N+S>~>^_i!EG{b&G4`
zhWZU_S3=V$R{(zi#!%aXA8Or9^ANX6H4|0hRm2F96^%rq;jp68?nN~vBxsU{xD%I+
zloC>}5lRWr*$K7~RrDyKkSKdaFVO;mMp~3;!k0wD##$vFMfOSls7j+KGKoec*-t&i
z+X3^5JF02)z%BX|RU~0m@ra_AI>Fo?oCDPtxhxp|70pPLtkaSgF}cQgNxpj}f~%Xj
z0@kg`clzRo_G0YNL+|2W7-*QuS@7KdstQLAQxO|_@wP67O^2hsxDdu|Tqcb6;!5Dx
zu@=C6*kP`g_u;~X+mn5GqiGuK!w;J)BRX8~!wbx9em`CW!|!wR;m}Kng~oo``b4<l
z2RIgb`tkkd_LP<O!aVqp%ZBkL7QvtWcQUTt$|3k^02i21jG$eEI3L=Y=%i6<9t;fN
zVv|4ZJ00%IB+3KlBkW9Y4&rou(R(<XvD`F<u4)i}!9ZvTr)QaB(N9zi!ZSZ}x$xr<
zw$8mP;k>68{`=d!t1eu%;(7YbA)J;1sRMWh*iO@%Rj;Bg8`^J{odXy1IaaS8#xEqt
zZDjs2r+p;-;}QIu13J#*oK#J42Ss2e@l2-T_0Md1^%Zo6QRXg`SsGD7zLre^!7Gwg
z#4Bwtxz`p63-X;mjaQ0<>5pJVBHj{@7!2x@=Ws`w<!^db2w%o~twvm9Xkhpfo})Xi
z;5y9SqNj$(UkR^UcrUz_gEHXY1)TGd!)9jyUSo^nVOzTHEJq_~UxRZu=^#u8N$wyi
L9mLX0Qm_02awSAS

delta 832
zcmXAkT}YEr7{~W+b8hoJ@3WO3%MW@}lxfOdH9s)ZcUZJqNf&*16BenZpe_qEBN<s*
zpr)>Ppo~5&4Y$@T^aS0EF2pV>mAWYn5sQLCjmjlaooxqx9L}Hr@0{m2ofS@Jh3}F<
zm+gQ+{%HU6YFD2jm(Mg^t~y>Bkd7Q$=y7qP)NfRWvKmW3Qf%IJESNo!jW#uZ@VY|b
zC|xZ4Z0}8AYNpE{qvm%^b}@ZX3bct8Aw4#n)mRp#!zG%oVCIrzZTy>Qj@k2tA5=e9
z!!~QyEd=d($xDjcLUvp@tFg>WQG4S@!gidE7p=j!XAA8Y72dGTn!<>c*|XA2Pwq;{
zHifeq%dFJ=Dke3UwacbX*~BrF3>8Doh+t?Kkqj+E$IvsP7(A6tq}9x2<1?A;3~#Au
zwvuWtoAy{q-39EMAu%XSkY?P|NRrTDBa!%Wjp(U=g2+02T}A};tU{r{xia#Ru1=8`
zI+w#BQ2#rUXyvjy=Mn@umjE|fX*oh^1k~3yWHr}Tojy^NlULwqq4x&Bpu|(Rpquiy
z;U>54H@hsr_{FGiKH5}mMt>E=p<@t4`sogQRbtUy5GV{o28X4Cpru0(;5~=l5vW9?
z8<MfW4JCNS4Q9OWhK)Gsh6A|C1KV+5w4la%52PV_AOok;K}7#aUW+Rp$V6YBz+=`!
zNWm$skciG=FyL}Iug3{qNI}WYtAkn^I=!qMIy#314f@`a_2Hv5EkxsfFMF3&%;<Y0
z7*Q-|n!KBj#zs9vU?XMo{`5i=hawMpw2wnlXe?^+!BvjtKL(9Tv&R13l#a%DHpaFR
z0NOnUSCmxFAu<{F!#6WM_XXNDxUd8<xM3O2@_(7pvX$sXwoqPzMEZ0YY=8~lL5IDZ
pfm};AwDSL0E7<(Q7#lEb;YO`~;k?)(avh?wLsWH$>LD>=`9HKh87}|;

diff --git a/data/appversion b/data/appversion
index 081af9a..0a182f2 100644
--- a/data/appversion
+++ b/data/appversion
@@ -1 +1 @@
-1.7.1
\ No newline at end of file
+1.7.2
\ No newline at end of file
diff --git a/data/index.html b/data/index.html
index 1a84913..e947ec8 100644
--- a/data/index.html
+++ b/data/index.html
@@ -3,10 +3,10 @@
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta charset="UTF-8">
-    <link rel="stylesheet" href="main.css?v=1.7.1" type="text/css" />
-    <link rel="stylesheet" href="icons.css?v=1.7.1" type="text/css" />
+    <link rel="stylesheet" href="main.css?v=1.7.2" type="text/css" />
+    <link rel="stylesheet" href="icons.css?v=1.7.2" type="text/css" />
     <link rel="icon" type="image/png" href="favicon.png" />
-    <script type="text/javascript" src="index.js?v=1.7.1"></script>
+    <script type="text/javascript" src="index.js?v=1.7.2"></script>
 </head>
 <body>
     <div id="divContainer" class="container" style="user-select:none;position:relative;border-radius:27px;">
@@ -435,9 +435,9 @@
                     </form>
                 </div>
             </fieldset>
-            <fieldset id="fsUpdates" style="display:none">
+            <fieldset id="fsUpdates" style="display:none;">
                 <legend>Software/Firmware Updates</legend>
-                <form method="post" action="/general" style="margin-top:8px;">
+                <form method="post" action="/general" style="margin-top:8px;height:327px;">
                     <div style="font-size:17px;">
                         <span style="text-align:right;display:inline-block;color:#00bcd4;width:127px;margin-top:-27px;">Firmware:</span>
                         <span id="spanFwVersion" style="padding-left:4px;display:inline-block;text-align:left;width:120px;">v-.--</span>
diff --git a/data/index.js b/data/index.js
index 85c1386..aa36700 100644
--- a/data/index.js
+++ b/data/index.js
@@ -378,7 +378,7 @@ async function reopenSocket() {
     await initSockets();
 }
 class General {
-    appVersion = 'v1.7.1';
+    appVersion = 'v1.7.2';
     reloadApp = false;
     async init() {
         this.setAppVersion();
@@ -2038,6 +2038,10 @@ class MQTT {
 var mqtt = new MQTT();
 class Firmware {
     async init() { }
+    isMobile() {
+        let agt = navigator.userAgent.toLowerCase();
+        return /Android|iPhone|iPod|BlackBerry|BB|PlayBook|IEMobile|Windows Phone|Kindle|Silk|Opera Mini/i.test(navigator.userAgent)
+    };
     backup() {
         var link = document.createElement('a');
         link.href = '/backup';
@@ -2061,11 +2065,12 @@ class Firmware {
         html += `<div id="divInstText"></div>`;
         html += `<input id="fileName" type="file" name="updateFS" style="display:none;" onchange="document.getElementById('span-selected-file').innerText = this.files[0].name;"/>`;
         html += `<label for="fileName">`;
-        html += `<span id="span-selected-file" style="display:inline-block;min-width:257px;border-bottom:solid 2px white;font-size:14px;white-space:nowrap;overflow:hidden;max-width:320px;text-overflow:ellipsis;"></span>`;
+        html += `<span id="span-selected-file" style="display:inline-block;width:calc(100% - 47px);border-bottom:solid 2px white;font-size:14px;white-space:nowrap;overflow:hidden;max-width:320px;text-overflow:ellipsis;"></span>`;
         html += `<div id="btn-select-file" class="button-outline" style="font-size:.8em;padding:10px;"><i class="icss-upload" style="margin:0px;"></i></div>`;
         html += `</label>`;
         html += `<div class="progress-bar" id="progFileUpload" style="--progress:0%;margin-top:10px;display:none;"></div>`
         html += `<div class="button-container">`
+        html += `<button id="btnBackupCfg" type="button" style="display:none;width:auto;padding-left:20px;padding-right:20px;margin-right:4px;" onclick="firmware.backup();">Backup</button>`
         html += `<button id="btnUploadFile" type="button" style="width:auto;padding-left:20px;padding-right:20px;margin-right:4px;display:inline-block;" onclick="firmware.uploadFile('${service}', document.getElementById('divUploadFile'));">Upload File</button>`
         html += `<button id="btnClose" type="button" style="width:auto;padding-left:20px;padding-right:20px;display:inline-block;" onclick="document.getElementById('divUploadFile').remove();">Cancel</button></div>`;
         html += `</form><div>`;
@@ -2083,8 +2088,14 @@ class Firmware {
         general.reloadApp = true;
         let inst = div.querySelector('div[id=divInstText]');
         inst.innerHTML = '<div style="font-size:14px;">Select a binary file [SomfyController.littlefs.bin] containing the littlefs data for the application then press the Upload File button.</div>';
-        inst.innerHTML += '<hr/><div style="font-size:14px;margin-bottom:10px;">A backup file for your configuration will be downloaded to your browser.  If the application update process fails please restore this file using the restore button</div>';
+        if (this.isMobile()) {
+            inst.innerHTML += `<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>`;
+            inst.innerHTML += '<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
+            inst.innerHTML += '<hr/><div style="font-size:14px;margin-bottom:10px;">A backup file for your configuration will be downloaded to your browser.  If the application update process fails please restore this file using the restore button</div>';
         document.getElementById('fsUpdates').appendChild(div);
+        if(this.isMobile()) document.getElementById('btnBackupCfg').style.display = 'inline-block';
     };
     async uploadFile(service, el) {
         let field = el.querySelector('input[type="file"]');
@@ -2096,28 +2107,30 @@ class Firmware {
                     errorMessage(el, 'This file is not a valid littleFS file system.');
                     return;
                 }
-                // The first thing we need to do is backup the configuration. So lets do this
-                // in a promise.
-                await new Promise((resolve, reject) => {
-                    firmware.backup();
-                    try {
-                        // Next we need to download the current configuration data.
-                        getText('/shades.cfg', (err, cfg) => {
-                            if (err)
-                                reject(err);
-                            else {
-                                resolve();
-                                console.log(cfg);
-                            }
-                        });
-                    } catch (err) {
-                        reject(err);
+                if (!this.isMobile()) {
+                    // The first thing we need to do is backup the configuration. So lets do this
+                    // in a promise.
+                    await new Promise((resolve, reject) => {
+                        firmware.backup();
+                        try {
+                            // Next we need to download the current configuration data.
+                            getText('/shades.cfg', (err, cfg) => {
+                                if (err)
+                                    reject(err);
+                                else {
+                                    resolve();
+                                    console.log(cfg);
+                                }
+                            });
+                        } catch (err) {
+                            serviceError(el, err);
+                            reject(err);
+                            return;
+                        }
+                    }).catch((err) => {
                         serviceError(el, err);
-                        return;
-                    }
-                }).catch((err) => {
-                    serviceError(el, err);
-                });
+                    });
+                }
                 break;
             case '/updateFirmware':
                 if (filename.indexOf('.ino.') === -1 || !filename.endsWith('.bin')) {
@@ -2135,6 +2148,8 @@ class Firmware {
         let formData = new FormData();
         let btnUpload = el.querySelector('button[id="btnUploadFile"]');
         let btnCancel = el.querySelector('button[id="btnClose"]');
+        let btnBackup = el.querySelector('button[id="btnBackupCfg"]');
+        btnBackup.style.display = 'none';
         btnUpload.style.display = 'none';
         field.disabled = true;
         let btnSelectFile = el.querySelector('div[id="btn-select-file"]');
@@ -2153,6 +2168,7 @@ class Firmware {
         };
         xhr.onerror = function (err) {
             console.log(err);
+            serviceError(el, err);
         };
         xhr.onload = function () {
             console.log('File upload load called');
diff --git a/data/main.css b/data/main.css
index 0d0f74b..f944e0b 100644
--- a/data/main.css
+++ b/data/main.css
@@ -489,6 +489,13 @@ div.waitoverlay > .lds-roller {
 .somfyShade {
     text-align:center;
     padding-bottom:4px;
+    display:inline-table;
+    padding-left:4px;
+    padding-right:4px;
+}
+.somfyShade > div,
+.somfyShade > span {
+    display:table-cell;
 }
 .button-outline {
     background-color: #00bcd4;