Fix #26

vshymanskyy · Aug 20, 2024 · f4705ed · f4705ed
1 parent ef64046
commit f4705ed
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/app.js b/src/app.js
@@ -141,12 +141,12 @@ async function prepareNewPort(type) {
             toastr.error('WebBluetooth is not available on iOS')
             return
         }
-        if (window.location.protocol === 'http:') {
+        if (!window.isSecureContext) {
             toastr.error('WebBluetooth cannot be accessed with unsecure connection')
             return
         }
         if (typeof navigator.bluetooth === 'undefined') {
-            toastr.error('Chrome browser is needed (or Edge, Opera, Chromium, etc.)')
+            toastr.error('Try Chrome, Edge, Opera, Brave', 'WebBluetooth is not supported')
             return
         }
         new_port = new WebBluetooth()
@@ -155,12 +155,12 @@ async function prepareNewPort(type) {
             toastr.error('WebSerial is not available on iOS')
             return
         }
-        if (window.location.protocol === 'http:') {
+        if (!window.isSecureContext) {
             toastr.error('WebSerial cannot be accessed with unsecure connection')
             return
         }
         if (typeof navigator.serial === 'undefined' && typeof navigator.usb === 'undefined') {
-            toastr.error('Chrome browser is needed (or Edge, Opera, Chromium, etc.)')
+            toastr.error('Try Chrome, Edge, Opera, Brave', 'WebSerial and WebUSB are not supported')
             return
         }
         if (typeof navigator.serial === 'undefined' || QID('force-serial-poly').checked) {

diff --git a/src/benchmark.html b/src/benchmark.html
@@ -134,12 +134,12 @@ <h2>ViperIDE Benchmark</h2>
             toastr.error('WebBluetooth is not available on iOS')
             return
         }
-        if (window.location.protocol === 'http:') {
+        if (!window.isSecureContext) {
             toastr.error('WebBluetooth cannot be accessed with unsecure connection')
             return
         }
         if (typeof navigator.bluetooth === 'undefined') {
-            toastr.error('Chrome browser is needed (or Edge, Opera, Chromium, etc.)')
+            toastr.error('Try Chrome, Edge, Opera, Brave', 'WebBluetooth is not supported')
             return
         }
         new_port = new WebBluetooth()
@@ -148,12 +148,12 @@ <h2>ViperIDE Benchmark</h2>
             toastr.error('WebSerial is not available on iOS')
             return
         }
-        if (window.location.protocol === 'http:') {
+        if (!window.isSecureContext) {
             toastr.error('WebSerial cannot be accessed with unsecure connection')
             return
         }
         if (typeof navigator.serial === 'undefined' && typeof navigator.usb === 'undefined') {
-            toastr.error('Chrome browser is needed (or Edge, Opera, Chromium, etc.)')
+            toastr.error('Try Chrome, Edge, Opera, Brave', 'WebSerial and WebUSB are not supported')
             return
         }
         if (typeof navigator.serial === 'undefined') {

diff --git a/src/bridge.html b/src/bridge.html
@@ -131,12 +131,12 @@ <h2>ViperIDE P2P Bridge</h2>
             toastr.error('WebBluetooth is not available on iOS')
             return
         }
-        if (window.location.protocol === 'http:') {
+        if (!window.isSecureContext) {
             toastr.error('WebBluetooth cannot be accessed with unsecure connection')
             return
         }
         if (typeof navigator.bluetooth === 'undefined') {
-            toastr.error('Chrome browser is needed (or Edge, Opera, Chromium, etc.)')
+            toastr.error('Try Chrome, Edge, Opera, Brave', 'WebBluetooth is not supported')
             return
         }
         new_port = new WebBluetooth()
@@ -145,12 +145,12 @@ <h2>ViperIDE P2P Bridge</h2>
             toastr.error('WebSerial is not available on iOS')
             return
         }
-        if (window.location.protocol === 'http:') {
+        if (!window.isSecureContext) {
             toastr.error('WebSerial cannot be accessed with unsecure connection')
             return
         }
         if (typeof navigator.serial === 'undefined' && typeof navigator.usb === 'undefined') {
-            toastr.error('Chrome browser is needed (or Edge, Opera, Chromium, etc.)')
+            toastr.error('Try Chrome, Edge, Opera, Brave', 'WebSerial and WebUSB are not supported')
             return
         }
         if (typeof navigator.serial === 'undefined') {