Merge pull request #1886 from floccusaddon/fix/orion

fix(Orion): Add an exception for Orion's permissions API

Author: marcelklehr

src/lib/adapters/Git.ts

@@ -15,6 +15,7 @@ import {
   SlashError
 } from '../../errors/Error'
 import Crypto from '../Crypto'
+import { isOrion } from '../isOrion'
 
 const LOCK_INTERVAL = 2 * 60 * 1000 // Lock every 2mins while syncing
 const LOCK_TIMEOUT = 15 * 60 * 1000 // Override lock 0.25h after last time lock has been set
@@ -71,7 +72,7 @@ export default class GitAdapter extends CachingAdapter {
     this.hash = await Crypto.sha256(JSON.stringify(this.server)) + Date.now()
     this.dir = '/' + this.hash + '/'
 
-    if (Capacitor.getPlatform() === 'web') {
+    if (Capacitor.getPlatform() === 'web' && !isOrion) {
       const browser = (await import('../browser-api')).default
       let hasPermissions, error = false
       try {

src/lib/adapters/GoogleDrive.ts

@@ -12,6 +12,7 @@ import {
 } from '../../errors/Error'
 import { OAuth2Client } from '@byteowls/capacitor-oauth2'
 import { Capacitor, CapacitorHttp as Http } from '@capacitor/core'
+import { isOrion } from '../isOrion'
 
 const OAuthConfig = {
   authorizationBaseUrl: 'https://accounts.google.com/o/oauth2/auth',
@@ -198,7 +199,7 @@ export default class GoogleDriveAdapter extends CachingAdapter {
   async onSyncStart(needLock = true, forceLock = false) {
     Logger.log('onSyncStart: begin')
 
-    if (Capacitor.getPlatform() === 'web') {
+    if (Capacitor.getPlatform() === 'web' && !isOrion) {
       const browser = (await import('../browser-api')).default
       const origins = ['https://oauth2.googleapis.com/', 'https://www.googleapis.com/']
       let hasPermissions, error = false

src/lib/adapters/NextcloudBookmarks.ts

@@ -31,6 +31,7 @@ import {
   UnknownFolderUpdateError,
   UnknownMoveTargetError, UpdateBookmarkError
 } from '../../errors/Error'
+import { isOrion } from '../isOrion'
 
 const PAGE_SIZE = 300
 const TIMEOUT = 300000
@@ -133,7 +134,7 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
   }
 
   async onSyncStart(needLock = true, forceLock = false): Promise<void> {
-    if (Capacitor.getPlatform() === 'web') {
+    if (Capacitor.getPlatform() === 'web' && !isOrion) {
       const browser = (await import('../browser-api')).default
       let hasPermissions, error = false
       try {

src/lib/adapters/WebDav.ts

@@ -15,6 +15,7 @@ import {
 import { CapacitorHttp as Http } from '@capacitor/core'
 import { Capacitor } from '@capacitor/core'
 import Html from '../serializers/Html'
+import { isOrion } from '../isOrion'
 
 const LOCK_INTERVAL = 2 * 60 * 1000 // Lock every 2mins while syncing
 const LOCK_TIMEOUT = 15 * 60 * 1000 // Override lock 0.25h after last time lock has been set
@@ -269,7 +270,7 @@ export default class WebDavAdapter extends CachingAdapter {
     Logger.log('onSyncStart: begin')
     this.ended = false
 
-    if (Capacitor.getPlatform() === 'web') {
+    if (Capacitor.getPlatform() === 'web' && !isOrion) {
       const browser = (await import('../browser-api')).default
       let hasPermissions, error = false
       try {

src/lib/isOrion.ts

@@ -0,0 +1 @@
+export const isOrion = 'userAgentData' in navigator && JSON.stringify(navigator.userAgentData).includes('Orion')