fix: Don't error in old Chrome versions if browser.permissions.contai…

…ns fails Signed-off-by: Marcel Klehr <[email protected]>
floccusaddon · May 11, 2024 · ac0367d · ac0367d
1 parent a87b0aa
commit ac0367d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/src/lib/adapters/Git.ts b/src/lib/adapters/Git.ts
@@ -72,7 +72,13 @@ export default class GitAdapter extends CachingAdapter {
 
     if (Capacitor.getPlatform() === 'web') {
       const browser = (await import('../browser-api')).default
-      if (!(await browser.permissions.contains({ origins: [this.server.url + '/'] }))) {
+      let hasPermissions
+      try {
+        hasPermissions = await browser.permissions.contains({ origins: [this.server.url + '/'] })
+      } catch (e) {
+        console.warn(e)
+      }
+      if (!hasPermissions) {
         throw new MissingPermissionsError()
       }
     }

diff --git a/src/lib/adapters/GoogleDrive.ts b/src/lib/adapters/GoogleDrive.ts
@@ -197,7 +197,13 @@ export default class GoogleDriveAdapter extends CachingAdapter {
     if (Capacitor.getPlatform() === 'web') {
       const browser = (await import('../browser-api')).default
       const origins = ['https://oauth2.googleapis.com/', 'https://www.googleapis.com/']
-      if (!(await browser.permissions.contains({ origins }))) {
+      let hasPermissions
+      try {
+        hasPermissions = await browser.permissions.contains({ origins })
+      } catch (e) {
+        console.warn(e)
+      }
+      if (!hasPermissions) {
         throw new MissingPermissionsError()
       }
     }

diff --git a/src/lib/adapters/WebDav.ts b/src/lib/adapters/WebDav.ts
@@ -238,7 +238,13 @@ export default class WebDavAdapter extends CachingAdapter {
 
     if (Capacitor.getPlatform() === 'web') {
       const browser = (await import('../browser-api')).default
-      if (!(await browser.permissions.contains({ origins: [this.server.url + '/'] }))) {
+      let hasPermissions
+      try {
+        hasPermissions = await browser.permissions.contains({ origins: [this.server.url + '/'] })
+      } catch (e) {
+        console.warn(e)
+      }
+      if (!hasPermissions) {
         throw new MissingPermissionsError()
       }
     }