Merge branch 'develop'

CHANGELOG.md

@@ -1,16 +1,25 @@
 # Changelog
 
+## [5.1.4] - 2024-05-21
+
+### Fixed
+
+* [native] fix(Drawer): Add icon for git profiles
+* fix: Improve locking logic
+* fix(BrowserController): Don't spam setIcon warnings
+* fix(Account): call onSyncFail if onSyncStart fails
+
 ## [5.1.3] - 2024-05-18
 
 ### Fixed
 
-[native] fix: set largeHeap to true on android + fix git settings
-fix: Improve locking logic
-fix(NextcloudBookmarks#getExistingBookmarks): Don't use search-by-url for javascript links
-fix: Make Diff#inspect() output more readable
-fix: Limit concurrency for reorderings
-fix: Improve bulkImport performance by chunking
-fix: Unhandled error "Receiving end does not exist"
+* [native] fix: set largeHeap to true on android + fix git settings
+* fix: Improve locking logic
+* fix(NextcloudBookmarks#getExistingBookmarks): Don't use search-by-url for javascript links
+* fix: Make Diff#inspect() output more readable
+* fix: Limit concurrency for reorderings
+* fix: Improve bulkImport performance by chunking
+* fix: Unhandled error "Receiving end does not exist"
 
 ## [5.1.2] - 2024-05-14
 

android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "org.handmadeideas.floccus"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 5001003
-        versionName "5.1.3"
+        versionCode 5001004
+        versionName "5.1.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

android/app/src/main/assets/capacitor.config.json

@@ -10,6 +10,9 @@
 			"launchAutoHide": false,
 			"androidScaleType": "CENTER_INSIDE",
 			"backgroundColor": "#ffffff"
+		},
+		"CapacitorHttp": {
+			"enabled": true
 		}
 	},
 	"cordova": {}

capacitor.config.json

@@ -10,6 +10,9 @@
         "launchAutoHide": false,
         "androidScaleType": "CENTER_INSIDE",
         "backgroundColor": "#ffffff"
+    },
+    "CapacitorHttp": {
+      "enabled": true
     }
   },
   "cordova": {}

ios/App/App/capacitor.config.json

@@ -10,6 +10,9 @@
 			"launchAutoHide": false,
 			"androidScaleType": "CENTER_INSIDE",
 			"backgroundColor": "#ffffff"
+		},
+		"CapacitorHttp": {
+			"enabled": true
 		}
 	},
 	"cordova": {}

manifest.chrome.json

@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "floccus bookmarks sync",
   "short_name": "floccus",
-  "version": "5.1.3.1",
+  "version": "5.1.4.2",
   "description": "__MSG_DescriptionExtension__",
   "icons": {
     "48": "icons/logo.png",

manifest.firefox.json

@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "floccus bookmarks sync",
   "short_name": "floccus",
-  "version": "5.1.3.1",
+  "version": "5.1.4.2",
   "description": "__MSG_DescriptionExtension__",
   "icons": {
     "48": "icons/logo.png",

manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "floccus bookmarks sync",
   "short_name": "floccus",
-  "version": "5.1.3.1",
+  "version": "5.1.4.2",
   "description": "__MSG_DescriptionExtension__",
   "icons": {
     "48": "icons/logo.png",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "floccus",
-  "version": "5.1.3",
+  "version": "5.1.4",
   "description": "Sync your bookmarks privately across browsers and devices",
   "scripts": {
     "build": "gulp",

src/lib/Account.ts

@@ -165,14 +165,21 @@ export default class Account {
         try {
           status = await this.server.onSyncStart(needLock)
         } catch (e) {
+          await this.server.onSyncFail()
           // Resource locked
           if (e.code === 37) {
+            Sentry.setContext('accountData', {
+              ...this.getData(),
+              username: 'SENSITIVEVALUEHIDDEN',
+              password: 'SENSITIVEVALUVALUEHIDDEN',
+              passphrase: 'SENSITIVEVALUVALUEHIDDEN'
+            })
             Sentry.captureException(e)
             // We got a resource locked error
             if (this.getData().lastSync < Date.now() - LOCK_TIMEOUT) {
               // but if we've been waiting for the lock for more than 2h
               // start again without locking the resource
-              status = await this.server.onSyncStart(false)
+              status = await this.server.onSyncStart(false, true)
             } else {
               await this.setData({
                 ...this.getData(),

src/lib/adapters/Git.ts

@@ -64,7 +64,7 @@ export default class GitAdapter extends CachingAdapter {
     this.cancelCallback && this.cancelCallback()
   }
 
-  async onSyncStart(needLock = true) {
+  async onSyncStart(needLock = true, forceLock = false) {
     Logger.log('onSyncStart: begin')
 
     const hash = await Crypto.sha256(JSON.stringify(this.server)) + Date.now()
@@ -152,8 +152,12 @@ export default class GitAdapter extends CachingAdapter {
     if (this.lockingInterval) {
       clearInterval(this.lockingInterval)
     }
-    if (needLock) {
+    if (forceLock) {
+      await this.setLock()
+    } else if (needLock) {
       await this.obtainLock()
+    }
+    if (needLock || forceLock) {
       this.lockingInterval = setInterval(() => this.setLock(), LOCK_INTERVAL) // Set lock every minute
     }
 

src/lib/adapters/GoogleDrive.ts

@@ -191,7 +191,7 @@ export default class GoogleDriveAdapter extends CachingAdapter {
     })
   }
 
-  async onSyncStart(needLock = true) {
+  async onSyncStart(needLock = true, forceLock = false) {
     Logger.log('onSyncStart: begin')
 
     if (Capacitor.getPlatform() === 'web') {
@@ -214,7 +214,9 @@ export default class GoogleDriveAdapter extends CachingAdapter {
     const file = fileList.files.filter(file => !file.trashed)[0]
     if (file) {
       this.fileId = file.id
-      if (needLock) {
+      if (forceLock) {
+        await this.setLock(this.fileId)
+      } else if (needLock) {
         const data = await this.getFileMetadata(file.id, 'appProperties')
         if (data.appProperties && data.appProperties.locked && (data.appProperties.locked === true || JSON.parse(data.appProperties.locked))) {
           const lockedDate = JSON.parse(data.appProperties.locked)
@@ -225,12 +227,6 @@ export default class GoogleDriveAdapter extends CachingAdapter {
             throw new ResourceLockedError()
           }
         }
-      }
-    }
-
-    if (file) {
-      this.fileId = file.id
-      if (needLock) {
         await this.setLock(this.fileId)
       }
 
@@ -266,7 +262,7 @@ export default class GoogleDriveAdapter extends CachingAdapter {
       if (this.lockingInterval) {
         clearInterval(this.lockingInterval)
       }
-      if (needLock) {
+      if (needLock || forceLock) {
         this.lockingInterval = setInterval(() => this.setLock(this.fileId), LOCK_INTERVAL) // Set lock every minute
       }
     } else {

src/lib/adapters/NextcloudBookmarks.ts

@@ -124,7 +124,7 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
     return output + (output[output.length - 1] !== '/' ? '/' : '')
   }
 
-  async onSyncStart(needLock = true): Promise<void> {
+  async onSyncStart(needLock = true, forceLock = false): Promise<void> {
     if (Capacitor.getPlatform() === 'web') {
       const browser = (await import('../browser-api')).default
       let hasPermissions
@@ -143,7 +143,8 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
     }
 
     // if needLock -- we always need it
-    if (!(await this.acquireLock())) {
+    const couldAcquireLock = await this.acquireLock()
+    if (!forceLock && !couldAcquireLock) {
       throw new ResourceLockedError()
     }
     this.lockingInterval = setInterval(() => !this.ended && this.acquireLock(), LOCK_INTERVAL)