Merge branch 'develop'

floccusaddon · Jan 2, 2024 · 0303854 · 0303854
2 parents 87d1e96 + 6782db6
commit 0303854
Show file tree

Hide file tree

Showing 29 changed files with 195 additions and 150 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [5.0.6] - 2023-12-31
+
+### Fixed
+* fix(background sync): Move back to manifest v2 for firefox
+* fix(Account#setData): re-init if localRoot is changed
+* fix(Options): Fix v-switch input
+* fix(Controller#scheduleSync): Allow syncing if account is disabled and scheduled
+
 ## [5.0.5] - 2023-12-20
 
 ### Fixed

diff --git a/_locales/gl/messages.json b/_locales/gl/messages.json
@@ -671,5 +671,11 @@
   },
   "LabelImportsuccessful": {
     "message": "Perfís importados correctamente"
+  },
+  "DescriptionSyncinprogress": {
+    "message": "Sincronización en curso."
+  },
+  "DescriptionSyncscheduled": {
+    "message": "Este perfil sincronizarase en breve. Estamos a agardar que outros dispositivos seus ou outros perfís deste dispositivo rematen de sincronizar."
   }
 }
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 5000005
-        versionName "5.0.5"
+        versionCode 5000006
+        versionName "5.0.6"
         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/html/background.html b/html/background.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Floccus</title>
+</head>
+<body>
+<script src="../../lib/chrome-promise.js"></script>
+<script src="../js/background-script.js"></script>
+</body>
+</html>
diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
@@ -177,7 +177,6 @@
 				504EC3011FED79650016851F /* Frameworks */,
 				504EC3021FED79650016851F /* Resources */,
 				9592DBEFFC6D2A0C8D5DEB22 /* [CP] Embed Pods Frameworks */,
-				BC2F32D02F5D33BF6B9D40A1 /* [CP] Copy Pods Resources */,
 				1899960C29CCBA1B00ABC3E8 /* Embed Foundation Extensions */,
 			);
 			buildRules = (
@@ -287,21 +286,6 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Floccus/Pods-Floccus-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		BC2F32D02F5D33BF6B9D40A1 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Floccus/Pods-Floccus-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -379,7 +363,7 @@
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 5.0.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.handmadeideas.floccus.new-bookmark";
@@ -413,7 +397,7 @@
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 5.0.2;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.handmadeideas.floccus.new-bookmark";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -550,7 +534,7 @@
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 5.0.0;
+				MARKETING_VERSION = 5.0.5;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = org.handmadeideas.floccus;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -579,7 +563,7 @@
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 5.0.0;
+				MARKETING_VERSION = 5.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = org.handmadeideas.floccus;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/ios/App/Floccus New Bookmark/Info.plist b/ios/App/Floccus New Bookmark/Info.plist
@@ -7,29 +7,27 @@
 		<key>NSExtensionAttributes</key>
 		<dict>
 			<key>NSExtensionActivationRule</key>
-			<string>TRUEPREDICATE</string>
+			<dict>
+				<key>NSExtensionActivationSupportsFileWithMaxCount</key>
+				<integer>5</integer>
+				<key>NSExtensionActivationSupportsImageWithMaxCount</key>
+				<integer>5</integer>
+				<key>NSExtensionActivationSupportsMovieWithMaxCount</key>
+				<integer>5</integer>
+				<key>NSExtensionActivationSupportsText</key>
+				<true/>
+				<key>NSExtensionActivationSupportsWebPageWithMaxCount</key>
+				<integer>1</integer>
+				<key>NSExtensionActivationSupportsWebURLWithMaxCount</key>
+				<integer>1</integer>
+				<key>NSExtensionActivationUsesStrictMatching</key>
+				<false/>
+			</dict>
 		</dict>
 		<key>NSExtensionMainStoryboard</key>
 		<string>MainInterface</string>
 		<key>NSExtensionPointIdentifier</key>
 		<string>com.apple.share-services</string>
 	</dict>
-	<key>NSExtensionActivationRule</key>
-	<dict>
-		<key>NSExtensionActivationSupportsFileWithMaxCount</key>
-		<integer>5</integer>
-		<key>NSExtensionActivationSupportsImageWithMaxCount</key>
-		<integer>5</integer>
-		<key>NSExtensionActivationSupportsMovieWithMaxCount</key>
-		<integer>5</integer>
-		<key>NSExtensionActivationSupportsText</key>
-		<true/>
-		<key>NSExtensionActivationSupportsWebPageWithMaxCount</key>
-		<integer>1</integer>
-		<key>NSExtensionActivationSupportsWebURLWithMaxCount</key>
-		<integer>1</integer>
-		<key>NSExtensionActivationUsesStrictMatching</key>
-		<false/>
-	</dict>
 </dict>
 </plist>
diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock
@@ -1,13 +1,11 @@
 PODS:
-  - ByteowlsCapacitorOauth2 (4.0.2):
+  - ByteowlsCapacitorOauth2 (5.0.0):
     - Capacitor
     - OAuthSwift (= 2.2.0)
   - Capacitor (5.5.1):
     - CapacitorCordova
   - CapacitorApp (5.0.6):
     - Capacitor
-  - CapacitorCommunityHttp (1.4.1):
-    - Capacitor
   - CapacitorCordova (5.5.1)
   - CapacitorDevice (5.0.6):
     - Capacitor
@@ -23,7 +21,6 @@ PODS:
     - Capacitor
   - CordovaPlugins (5.5.1):
     - CapacitorCordova
-  - CordovaPluginsResources (0.0.105)
   - OAuthSwift (2.2.0)
   - SendIntent (0.0.1):
     - Capacitor
@@ -32,7 +29,6 @@ DEPENDENCIES:
   - "ByteowlsCapacitorOauth2 (from `../../node_modules/@byteowls/capacitor-oauth2`)"
   - "Capacitor (from `../../node_modules/@capacitor/ios`)"
   - "CapacitorApp (from `../../node_modules/@capacitor/app`)"
-  - "CapacitorCommunityHttp (from `../../node_modules/@capacitor-community/http`)"
   - "CapacitorCordova (from `../../node_modules/@capacitor/ios`)"
   - "CapacitorDevice (from `../../node_modules/@capacitor/device`)"
   - "CapacitorFilesystem (from `../../node_modules/@capacitor/filesystem`)"
@@ -41,7 +37,6 @@ DEPENDENCIES:
   - "CapacitorShare (from `../../node_modules/@capacitor/share`)"
   - "CapacitorSplashScreen (from `../../node_modules/@capacitor/splash-screen`)"
   - CordovaPlugins (from `../capacitor-cordova-ios-plugins`)
-  - CordovaPluginsResources (from `../capacitor-cordova-ios-plugins`)
   - SendIntent (from `../../node_modules/send-intent`)
 
 SPEC REPOS:
@@ -55,8 +50,6 @@ EXTERNAL SOURCES:
     :path: "../../node_modules/@capacitor/ios"
   CapacitorApp:
     :path: "../../node_modules/@capacitor/app"
-  CapacitorCommunityHttp:
-    :path: "../../node_modules/@capacitor-community/http"
   CapacitorCordova:
     :path: "../../node_modules/@capacitor/ios"
   CapacitorDevice:
@@ -73,16 +66,13 @@ EXTERNAL SOURCES:
     :path: "../../node_modules/@capacitor/splash-screen"
   CordovaPlugins:
     :path: "../capacitor-cordova-ios-plugins"
-  CordovaPluginsResources:
-    :path: "../capacitor-cordova-ios-plugins"
   SendIntent:
     :path: "../../node_modules/send-intent"
 
 SPEC CHECKSUMS:
-  ByteowlsCapacitorOauth2: 86f9a61aa413119226b12aabc5d03f185e9e1d28
+  ByteowlsCapacitorOauth2: 9e7cdae2bf251463a6ad89493e27fb288bf694d7
   Capacitor: 9da0a2415e3b6098511f8b5ffdb578d91ee79f8f
   CapacitorApp: 024e1b1bea5f883d79f6330d309bc441c88ad04a
-  CapacitorCommunityHttp: 7be90668527ef14ee10d08135b0e00fac9cf8247
   CapacitorCordova: e128cc7688c070ca0bfa439898a5f609da8dbcfe
   CapacitorDevice: 2c968f98a1ec4d22357418c1521e7ddc46c675e6
   CapacitorFilesystem: af704badfbc69f6f8623d9ed313e5490e3723dcb
@@ -91,10 +81,9 @@ SPEC CHECKSUMS:
   CapacitorShare: cd41743331cb71d217c029de54b681cbd91e0fcc
   CapacitorSplashScreen: 5fa2ab5e46cf5cc530cf16a51c80c7a986579ccd
   CordovaPlugins: ed4ad4b471e30dae7a9f57ee30aed67e71f69a3d
-  CordovaPluginsResources: 1b3992e05cb6336d2850cd77dd5e3054f2f76f96
   OAuthSwift: 75efbb5bd9a4b2b71a37bd7e986bf3f55ddd54c6
   SendIntent: 0a17b6984c4f27e9dfa56513267ba2c044a5a6c8
 
-PODFILE CHECKSUM: 43c910b75a1189f19703b70db7029424c839ab8a
+PODFILE CHECKSUM: c782f610b4a22377261d553bd8de5783a1fee26b
 
 COCOAPODS: 1.12.0
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.5",
+  "version": "5.0.6",
   "description": "__MSG_DescriptionExtension__",
   "icons": {
     "48": "icons/logo.png",

diff --git a/manifest.firefox.json b/manifest.firefox.json
@@ -1,39 +1,36 @@
 {
-  "manifest_version": 3,
+  "manifest_version": 2,
   "name": "floccus bookmarks sync",
   "short_name": "floccus",
-  "version": "5.0.5",
+  "version": "5.0.6",
   "description": "__MSG_DescriptionExtension__",
   "icons": {
     "48": "icons/logo.png",
     "64": "icons/logo_64.png",
     "128": "icons/logo_128.png"
   },
 
-  "browser_specific_settings": {
+  "applications": {
     "gecko": {
       "id": "[email protected]",
-      "strict_min_version": "109.0"
+      "strict_min_version": "57.0"
     }
   },
 
   "default_locale": "en",
 
-  "permissions": ["alarms", "bookmarks", "storage", "unlimitedStorage", "tabs", "identity"],
-  "host_permissions": [
-    "*://*/*"
-  ],
-  "content_security_policy": {
-    "extension_pages": "script-src 'self'; object-src 'self';"
-  },
+  "permissions": ["https://*/", "http://*/", "alarms", "bookmarks", "storage", "unlimitedStorage", "tabs", "identity"],
+  "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self';",
 
   "options_ui": {
     "page": "dist/html/options.html",
-    "browser_style": false
+    "browser_style": false,
+    "chrome_style": false
   },
 
-  "action": {
+  "browser_action": {
     "browser_style": false,
+    "chrome_style": false,
     "default_icon": {
       "48": "icons/logo.png"
     },
@@ -42,6 +39,6 @@
   },
 
   "background": {
-    "scripts": ["dist/js/background-script.js"]
+    "page": "dist/html/background.html"
   }
 }
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.5",
+  "version": "5.0.6",
   "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.5",
+  "version": "5.0.6",
   "description": "Sync your bookmarks privately across browsers and devices",
   "scripts": {
     "build": "gulp",

diff --git a/src/lib/Controller.ts b/src/lib/Controller.ts
@@ -32,7 +32,7 @@ export default class Controller implements IController {
     if (this.worker) {
       return Promise.resolve(this.worker)
     }
-    if (navigator.serviceWorker?.controller) {
+    if (!navigator.userAgent.includes('Firefox') && navigator.serviceWorker?.controller) {
       return navigator.serviceWorker.ready.then((registration) => ({
         postMessage: (...args) => registration.active.postMessage(...args),
         addEventListener: (fn) => {

diff --git a/src/lib/Scanner.ts b/src/lib/Scanner.ts
@@ -1,6 +1,7 @@
 import * as Parallel from 'async-parallel'
 import Diff, { ActionType, CreateAction, RemoveAction } from './Diff'
 import { Bookmark, Folder, ItemLocation, ItemType, TItem } from './Tree'
+import Logger from './Logger'
 
 export default class Scanner {
   private oldTree: TItem
@@ -31,6 +32,7 @@ export default class Scanner {
   }
 
   async diffItem(oldItem:TItem, newItem:TItem):Promise<void> {
+    Logger.log('Calculating diff for ', oldItem, newItem)
     if (oldItem.type === 'folder' && newItem.type === 'folder') {
       return this.diffFolder(oldItem, newItem)
     } else if (oldItem.type === 'bookmark' && newItem.type === 'bookmark') {