Skip to content

TagSpaces is an offline, open source, document manager with tagging support

cordova fixes

sytolkdfb3e12e132c
diff --git a/package-lock.json b/package-lock.json
index e2ea66984..0a283a54e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
"@mui/x-date-pickers": "^5.0.20",
"@tagspaces/tagspaces-common": "4.1.18",
"@tagspaces/tagspaces-common-aws": "4.1.18",
- "@tagspaces/tagspaces-common-cordova": "4.1.18",
+ "@tagspaces/tagspaces-common-cordova": "4.1.19",
"@tagspaces/tagspaces-indexer": "4.1.18",
"@tagspaces/tagspaces-md": "4.1.14",
"aws-amplify": "^4.3.8",
@@ -197,7 +197,7 @@
"yarn": "please-use-npm"
},
"optionalDependencies": {
- "@tagspacespro/tagspacespro": "5.0.26"
+ "@tagspacespro/tagspacespro": "5.0.27"
}
},
"node_modules/@aashutoshrathi/word-wrap": {
@@ -13534,9 +13534,9 @@
}
},
"node_modules/@tagspaces/tagspaces-common-cordova": {
- "version": "4.1.18",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-cordova/-/tagspaces-common-cordova-4.1.18.tgz",
- "integrity": "sha512-2C3B047Jdbd9zULIc9UqqXUsbRqJq9sNaqdeEkjaNvtXGOmhdWdCNtMJhoOKWx4OGbQKwZXGMBnIu0JAaMgcFw==",
+ "version": "4.1.19",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-cordova/-/tagspaces-common-cordova-4.1.19.tgz",
+ "integrity": "sha512-j9O8jrB0rq6sN25h4exVMG1WnyvZYaK2rLILXDK2MIpnvqPHmEPeeVy73bvoS7EaFJ44Yt9DRrR/pAm2R1Z1gA==",
"dependencies": {
"@tagspaces/tagspaces-common": "^4.1.18"
}
@@ -13596,9 +13596,9 @@
}
},
"node_modules/@tagspacespro/tagspacespro": {
- "version": "5.0.26",
- "resolved": "https://npm.pkg.github.com/download/@tagspacespro/tagspacespro/5.0.26/b01b22acfecec5c26861a89d6a2a1294556cfbd4",
- "integrity": "sha512-yJMjKITjTSf1PEjsZeGoKhcrhzdKzm7u7IZjVmHjdrJKv1JzIMYnEz6PR6DQEBgAcE4HpuwcfrZStc8MGvpILw==",
+ "version": "5.0.27",
+ "resolved": "https://npm.pkg.github.com/download/@tagspacespro/tagspacespro/5.0.27/5caf77f721e21aa6c97205a4c8175099c5389c4d",
+ "integrity": "sha512-JSVf3lTpmCsZrQm3xCdBjjvDRQ5/kqFi41N5Lo62tFhykLAFdxeVAoMtnyJAnt/rB8nMkaNTLDNhHsS6/MYNDw==",
"license": "Proprietary",
"optional": true
},
@@ -59189,9 +59189,9 @@
}
},
"@tagspaces/tagspaces-common-cordova": {
- "version": "4.1.18",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-cordova/-/tagspaces-common-cordova-4.1.18.tgz",
- "integrity": "sha512-2C3B047Jdbd9zULIc9UqqXUsbRqJq9sNaqdeEkjaNvtXGOmhdWdCNtMJhoOKWx4OGbQKwZXGMBnIu0JAaMgcFw==",
+ "version": "4.1.19",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common-cordova/-/tagspaces-common-cordova-4.1.19.tgz",
+ "integrity": "sha512-j9O8jrB0rq6sN25h4exVMG1WnyvZYaK2rLILXDK2MIpnvqPHmEPeeVy73bvoS7EaFJ44Yt9DRrR/pAm2R1Z1gA==",
"requires": {
"@tagspaces/tagspaces-common": "^4.1.18"
}
@@ -59235,9 +59235,9 @@
}
},
"@tagspacespro/tagspacespro": {
- "version": "5.0.26",
- "resolved": "https://npm.pkg.github.com/download/@tagspacespro/tagspacespro/5.0.26/b01b22acfecec5c26861a89d6a2a1294556cfbd4",
- "integrity": "sha512-yJMjKITjTSf1PEjsZeGoKhcrhzdKzm7u7IZjVmHjdrJKv1JzIMYnEz6PR6DQEBgAcE4HpuwcfrZStc8MGvpILw==",
+ "version": "5.0.27",
+ "resolved": "https://npm.pkg.github.com/download/@tagspacespro/tagspacespro/5.0.27/5caf77f721e21aa6c97205a4c8175099c5389c4d",
+ "integrity": "sha512-JSVf3lTpmCsZrQm3xCdBjjvDRQ5/kqFi41N5Lo62tFhykLAFdxeVAoMtnyJAnt/rB8nMkaNTLDNhHsS6/MYNDw==",
"optional": true
},
"@teamsupercell/typings-for-css-modules-loader": {
diff --git a/package.json b/package.json
index 664a91b0d..d227438c8 100644
--- a/package.json
+++ b/package.json
@@ -159,7 +159,7 @@
"@mui/x-date-pickers": "^5.0.20",
"@tagspaces/tagspaces-common": "4.1.18",
"@tagspaces/tagspaces-common-aws": "4.1.18",
- "@tagspaces/tagspaces-common-cordova": "4.1.18",
+ "@tagspaces/tagspaces-common-cordova": "4.1.19",
"@tagspaces/tagspaces-indexer": "4.1.18",
"@tagspaces/tagspaces-md": "4.1.14",
"aws-amplify": "^4.3.8",
diff --git a/src/renderer/components/dialogs/settings/SettingsAdvanced.tsx b/src/renderer/components/dialogs/settings/SettingsAdvanced.tsx
index bb2b746f7..bd1369a2d 100644
--- a/src/renderer/components/dialogs/settings/SettingsAdvanced.tsx
+++ b/src/renderer/components/dialogs/settings/SettingsAdvanced.tsx
@@ -175,6 +175,7 @@ function SettingsAdvanced(props: Props) {
<ListItemText primary={t('enableWS')} />
<Switch
data-tid="settingsEnableWS"
+ disabled={!AppConfig.isElectron}
onClick={() => setEnableWS(!settings.enableWS)}
checked={settings.enableWS}
/>
diff --git a/src/renderer/reducers/settings-default.ts b/src/renderer/reducers/settings-default.ts
index 5bc2a58a1..6f9a6b709 100644
--- a/src/renderer/reducers/settings-default.ts
+++ b/src/renderer/reducers/settings-default.ts
@@ -43,7 +43,7 @@ export default {
contentHash: '',
isUpdateInProgress: false,
isUpdateAvailable: false,
- enableWS: true,
+ enableWS: AppConfig.isElectron,
warningOpeningFilesExternally: true,
tagDelimiter: ' ',
maxSearchResult: 1000,
diff --git a/src/renderer/services/utils-io.ts b/src/renderer/services/utils-io.ts
index 8e4697a49..3addff79c 100644
--- a/src/renderer/services/utils-io.ts
+++ b/src/renderer/services/utils-io.ts
@@ -549,7 +549,8 @@ export function createDirectoryIndex(
if (
enableWS &&
!PlatformIO.haveObjectStoreSupport() &&
- !PlatformIO.haveWebDavSupport()
+ !PlatformIO.haveWebDavSupport() &&
+ !AppConfig.isCordova
// PlatformIO.isWorkerAvailable()
) {
// Start indexing in worker if not in the object store mode