Merge pull request #2273 from iNavFlight/mmosca-fix-assistnow-error-handling

mmosca · web-flow · commit a19eb5028890 · 2024-12-05T13:28:03.000+01:00
Correct assistnow data loading error handling
diff --git a/js/ublox/UBLOX.js b/js/ublox/UBLOX.js
@@ -154,7 +154,11 @@ var ublox = (function () {
 
         if (successCallback != null) {
             req.onload = (event) => {
-                successCallback(req.response);
+                if(req.status == 200) {
+                    successCallback(req.response);
+                } else {
+                    failCallback(event);
+                }
             };
         }
 
@@ -164,13 +168,17 @@ var ublox = (function () {
             }
         }
           
-        req.send(null);
+        try {
+            req.send(null);
+        } catch(error) {
+            GUI.alert(i18n.getMessage("gpsAssistnowLoadDataError"));
+            console.log(i18n.getMessage("gpsAssistnowLoadDataError") + ':' + error.toString());
+        }
     }
 
 
     function loadError(event) {
         GUI.alert(i18n.getMessage("gpsAssistnowLoadDataError"));
-        console.log(i18n.getMessage("gpsAssistnowLoadDataError") + ':' + event.toString());
     }
 
     // For more info on assistnow, check:

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,11 @@ var ublox = (function () {`
`154`	`154`
`155`	`155`	`if (successCallback != null) {`
`156`	`156`	`req.onload = (event) => {`
`157`		`- successCallback(req.response);`
	`157`	`+ if(req.status == 200) {`
	`158`	`+ successCallback(req.response);`
	`159`	`+ } else {`
	`160`	`+ failCallback(event);`
	`161`	`+ }`
`158`	`162`	`};`
`159`	`163`	`}`
`160`	`164`
`@@ -164,13 +168,17 @@ var ublox = (function () {`
`164`	`168`	`}`
`165`	`169`	`}`
`166`	`170`
`167`		`- req.send(null);`
	`171`	`+ try {`
	`172`	`+ req.send(null);`
	`173`	`+ } catch(error) {`
	`174`	`+ GUI.alert(i18n.getMessage("gpsAssistnowLoadDataError"));`
	`175`	`+ console.log(i18n.getMessage("gpsAssistnowLoadDataError") + ':' + error.toString());`
	`176`	`+ }`
`168`	`177`	`}`
`169`	`178`
`170`	`179`
`171`	`180`	`function loadError(event) {`
`172`	`181`	`GUI.alert(i18n.getMessage("gpsAssistnowLoadDataError"));`
`173`		`- console.log(i18n.getMessage("gpsAssistnowLoadDataError") + ':' + event.toString());`
`174`	`182`	`}`
`175`	`183`
`176`	`184`	`// For more info on assistnow, check:`