### Fixed

- The encryption algorithm now uses HKDF with a master key.
- `Fetch everything from the remote` now works correctly.
- Extra log messages during QR code decoding have been removed.

### Changed
- Some settings have been moved to the `Patches` pane:

### Behavioural and API Changes
- `DirectFileManipulatorV2` now requires new settings (as you may already know, E2EEAlgorithm).
- The database version has been increased to `12` from `10`.

src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.ts

@@ -16,11 +16,9 @@ import {
 import { delay, isObjectDifferent, sizeToHumanReadable } from "../../../lib/src/common/utils.ts";
 import { versionNumberString2Number } from "../../../lib/src/string_and_binary/convert.ts";
 import { Logger } from "../../../lib/src/common/logger.ts";
-import {
-    balanceChunkPurgedDBs,
-    checkSyncInfo,
-    purgeUnreferencedChunks,
-} from "../../../lib/src/pouchdb/utils_couchdb.ts";
+import { checkSyncInfo } from "@/lib/src/pouchdb/negotiation.ts";
+import { balanceChunkPurgedDBs } from "@/lib/src/pouchdb/chunks.ts";
+import { purgeUnreferencedChunks } from "@/lib/src/pouchdb/chunks.ts";
 import { testCrypt } from "../../../lib/src/encryption/e2ee_v2.ts";
 import ObsidianLiveSyncPlugin from "../../../main.ts";
 import { scheduleTask } from "../../../common/utils.ts";

src/modules/features/SettingDialogue/PanePatches.ts

@@ -1,4 +1,9 @@
-import { type HashAlgorithm, LOG_LEVEL_NOTICE } from "../../../lib/src/common/types.ts";
+import {
+    E2EEAlgorithmNames,
+    E2EEAlgorithms,
+    type HashAlgorithm,
+    LOG_LEVEL_NOTICE,
+} from "../../../lib/src/common/types.ts";
 import { Logger } from "../../../lib/src/common/logger.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
@@ -37,6 +42,19 @@ export function panePatches(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElemen
     void addPanel(paneEl, "Compatibility (Internal API Usage)").then((paneEl) => {
         new Setting(paneEl).autoWireToggle("watchInternalFileChanges", { invert: true });
     });
+    void addPanel(paneEl, "Compatibility (Remote Database)").then((paneEl) => {
+        new Setting(paneEl).autoWireDropDown("E2EEAlgorithm", {
+            options: E2EEAlgorithmNames,
+        });
+    });
+    new Setting(paneEl).autoWireToggle("useDynamicIterationCount", {
+        holdValue: true,
+        onUpdate: visibleOnly(
+            () =>
+                this.isConfiguredAs("E2EEAlgorithm", E2EEAlgorithms.ForceV1) ||
+                this.isConfiguredAs("E2EEAlgorithm", E2EEAlgorithms.V1)
+        ),
+    });
 
     void addPanel(paneEl, "Edge case addressing (Database)").then((paneEl) => {
         new Setting(paneEl)
@@ -79,4 +97,16 @@ export function panePatches(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElemen
     void addPanel(paneEl, "Compatibility (Trouble addressed)").then((paneEl) => {
         new Setting(paneEl).autoWireToggle("disableCheckingConfigMismatch");
     });
+
+    void addPanel(paneEl, "Remote Database Tweak (In sunset)").then((paneEl) => {
+        new Setting(paneEl).autoWireToggle("useEden").setClass("wizardHidden");
+        const onlyUsingEden = visibleOnly(() => this.isConfiguredAs("useEden", true));
+        new Setting(paneEl).autoWireNumeric("maxChunksInEden", { onUpdate: onlyUsingEden }).setClass("wizardHidden");
+        new Setting(paneEl)
+            .autoWireNumeric("maxTotalLengthInEden", { onUpdate: onlyUsingEden })
+            .setClass("wizardHidden");
+        new Setting(paneEl).autoWireNumeric("maxAgeInEden", { onUpdate: onlyUsingEden }).setClass("wizardHidden");
+
+        new Setting(paneEl).autoWireToggle("enableCompression").setClass("wizardHidden");
+    });
 }

src/modules/features/SettingDialogue/PanePowerUsers.ts

@@ -2,24 +2,12 @@ import { type ConfigPassphraseStore } from "../../../lib/src/common/types.ts";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import type { PageFunctions } from "./SettingPane.ts";
-import { visibleOnly } from "./SettingPane.ts";
+
 export function panePowerUsers(
     this: ObsidianLiveSyncSettingTab,
     paneEl: HTMLElement,
     { addPanel }: PageFunctions
 ): void {
-    void addPanel(paneEl, "Remote Database Tweak").then((paneEl) => {
-        new Setting(paneEl).autoWireToggle("useEden").setClass("wizardHidden");
-        const onlyUsingEden = visibleOnly(() => this.isConfiguredAs("useEden", true));
-        new Setting(paneEl).autoWireNumeric("maxChunksInEden", { onUpdate: onlyUsingEden }).setClass("wizardHidden");
-        new Setting(paneEl)
-            .autoWireNumeric("maxTotalLengthInEden", { onUpdate: onlyUsingEden })
-            .setClass("wizardHidden");
-        new Setting(paneEl).autoWireNumeric("maxAgeInEden", { onUpdate: onlyUsingEden }).setClass("wizardHidden");
-
-        new Setting(paneEl).autoWireToggle("enableCompression").setClass("wizardHidden");
-    });
-
     void addPanel(paneEl, "CouchDB Connection Tweak", undefined, this.onlyOnCouchDB).then((paneEl) => {
         paneEl.addClass("wizardHidden");
 

src/modules/features/SettingDialogue/PaneRemoteConfig.ts

@@ -579,12 +579,6 @@ The pane also can be launched by \`P2P Replicator\` command from the Command Pal
             holdValue: true,
             onUpdate: isEncryptEnabled,
         });
-        new Setting(paneEl)
-            .autoWireToggle("useDynamicIterationCount", {
-                holdValue: true,
-                onUpdate: isEncryptEnabled,
-            })
-            .setClass("wizardHidden");
     });
 
     void addPanel(paneEl, $msg("obsidianLiveSyncSettingTab.titleFetchSettings")).then((paneEl) => {