Merge branch 'develop'

floccusaddon · Dec 9, 2023 · 9ecef3f · 9ecef3f
2 parents b2ebc03 + f6575d2
commit 9ecef3f
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [5.0.2] - 2023-12-09
+
+### Fixed
+
+- Fix another XBEL parser bug
+- Fix HTML parser
+
 ## [5.0.1] - 2023-12-09
 
 ### Fixed

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "org.handmadeideas.floccus"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 5000001
-        versionName "5.0.1"
+        versionCode 5000002
+        versionName "5.0.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

diff --git a/manifest.chrome.json b/manifest.chrome.json
@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "floccus bookmarks sync",
   "short_name": "floccus",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "__MSG_DescriptionExtension__",
   "icons": {
     "48": "icons/logo.png",

diff --git a/manifest.firefox.json b/manifest.firefox.json
@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "floccus bookmarks sync",
   "short_name": "floccus",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "__MSG_DescriptionExtension__",
   "icons": {
     "48": "icons/logo.png",

diff --git a/manifest.json b/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "floccus bookmarks sync",
   "short_name": "floccus",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "__MSG_DescriptionExtension__",
   "icons": {
     "48": "icons/logo.png",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "floccus",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "Sync your bookmarks privately across browsers and devices",
   "scripts": {
     "build": "gulp",

diff --git a/src/lib/serializers/Html.ts b/src/lib/serializers/Html.ts
@@ -31,13 +31,8 @@ class HtmlSerializer implements Serializer {
 
   deserialize(html): Folder {
     const folders: Folder[] = parseByString(html)
-    if (folders.length === 1) {
-      folders[0].isRoot = true
-      return folders[0]
-    } else {
-      folders.forEach(f => f.parentId = '0')
-      return new Folder({id: '0', title: 'root', children: folders, location: ItemLocation.SERVER, isRoot: true})
-    }
+    folders.forEach(f => {f.parentId = '0'})
+    return new Folder({id: '0', title: 'root', children: folders, location: ItemLocation.SERVER, isRoot: true})
   }
 }
 
@@ -79,7 +74,7 @@ export const getRootFolder = (body: cheerio.Cheerio<cheerio.Element>) => {
 
 export const parseByString = (content: string) => {
   const $ = cheerio.load(content, {
-    decodeEntities: false
+    decodeEntities: true
   })
 
   const body = $('body')

diff --git a/src/lib/serializers/Xbel.ts b/src/lib/serializers/Xbel.ts
@@ -41,13 +41,13 @@ class XbelSerializer implements Serializer {
             id: parseInt(node[':@']['@_id']),
             parentId: folder.id,
             url: node[':@']['@_href'],
-            title: node.bookmark?.[0]?.title?.[0]?.['#text'] || '',
+            title: '' + (node.bookmark?.[0]?.title?.[0]?.['#text'] || ''), // cast to string
             location: ItemLocation.SERVER,
           })
         } else if (typeof node.folder !== 'undefined') {
           item = new Folder({
             id: parseInt(node[':@']?.['@_id']),
-            title: node.folder?.[0]?.title?.[0]?.['#text'] || '',
+            title: '' + (node.folder?.[0]?.title?.[0]?.['#text'] || ''), // cast to string
             parentId: folder.id,
             location: ItemLocation.SERVER,
           })

diff --git a/src/ui/components/OptionsGoogleDrive.vue b/src/ui/components/OptionsGoogleDrive.vue
@@ -82,7 +82,6 @@
       </v-card-title>
       <v-card-text>
         <v-switch
-          v-if="!isBrowser"
           :value="enabled"
           :aria-label="t('LabelAutosync')"
           :label="t('LabelAutosync')"
@@ -93,7 +92,6 @@
           :value="syncInterval"
           @input="$emit('update:syncInterval', $event)" />
         <OptionSyncStrategy
-          v-if="!isBrowser"
           :value="strategy"
           @input="$emit('update:strategy', $event)" />
         <OptionNestedSync

diff --git a/src/ui/components/OptionsNextcloudBookmarks.vue b/src/ui/components/OptionsNextcloudBookmarks.vue
@@ -73,7 +73,6 @@
       </v-card-title>
       <v-card-text>
         <v-switch
-          v-if="!isBrowser"
           :value="enabled"
           :aria-label="t('LabelAutosync')"
           :label="t('LabelAutosync')"
@@ -84,7 +83,6 @@
           :value="syncInterval"
           @input="$emit('update:syncInterval', $event)" />
         <OptionSyncStrategy
-          v-if="!isBrowser"
           :value="strategy"
           @input="$emit('update:strategy', $event)" />
         <OptionNestedSync

diff --git a/src/ui/components/OptionsWebdav.vue b/src/ui/components/OptionsWebdav.vue
@@ -82,7 +82,6 @@
       </v-card-title>
       <v-card-text>
         <v-switch
-          v-if="!isBrowser"
           :value="enabled"
           :aria-label="t('LabelAutosync')"
           :label="t('LabelAutosync')"
@@ -93,7 +92,6 @@
           :value="syncInterval"
           @input="$emit('update:syncInterval', $event)" />
         <OptionSyncStrategy
-          v-if="!isBrowser"
           :value="strategy"
           @input="$emit('update:strategy', $event)" />
         <OptionNestedSync

diff --git a/src/ui/views/NewAccount.vue b/src/ui/views/NewAccount.vue
@@ -246,7 +246,6 @@
               {{ t('LabelSyncbehaviorsetup') }}
             </div>
             <v-switch
-              v-if="isBrowser"
               v-model="enabled"
               :aria-label="t('LabelAutosync')"
               :label="t('LabelAutosync')"