New feature:

- We can perform automatic conflict resolution for inactive files, and postpone only manual ones by `Postpone manual resolution of inactive files`.
- Now we can see the image in the document history dialogue.
  - We can see the difference of the image, in the document history dialogue.
	- And also we can highlight differences.

Improved:
- Hidden file sync has been stabilised.
- Now automatically reloads the conflict-resolution dialogue when new conflicted revisions have arrived.

Fixed:
- No longer periodic process runs after unloading the plug-in.
- Now the modification of binary files is surely stored in the storage.

src/ObsidianLiveSyncSettingTab.ts

@@ -1116,7 +1116,7 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
             );
 
         new Setting(containerSyncSettingEl)
-            .setName("Postpone resolution of unopened files")
+            .setName("Postpone resolution of inactive files")
             .setClass("wizardHidden")
             .addToggle((toggle) =>
                 toggle.setValue(this.plugin.settings.checkConflictOnlyOnOpen).onChange(async (value) => {
@@ -1124,6 +1124,15 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
                     await this.plugin.saveSettings();
                 })
             );
+        new Setting(containerSyncSettingEl)
+            .setName("Postpone manual resolution of inactive files")
+            .setClass("wizardHidden")
+            .addToggle((toggle) =>
+                toggle.setValue(this.plugin.settings.showMergeDialogOnlyOnActive).onChange(async (value) => {
+                    this.plugin.settings.showMergeDialogOnlyOnActive = value;
+                    await this.plugin.saveSettings();
+                })
+            );
         containerSyncSettingEl.createEl("h4", { text: "Compatibility" }).addClass("wizardHidden");
         new Setting(containerSyncSettingEl)
             .setName("Always resolve conflict manually")
@@ -1644,7 +1653,7 @@ ${stringifyYaml(pluginConfig)}`;
                                         if ((await this.plugin.localDatabase.putRaw(doc)).ok) {
                                             Logger(`Old ${docName} has been deleted`, LOG_LEVEL_NOTICE);
                                         }
-                                        await this.plugin.showIfConflicted(docName as FilePathWithPrefix);
+                                        await this.plugin.queueConflictCheck(docName as FilePathWithPrefix);
                                     } else {
                                         Logger(`Converting ${docName} Failed!`, LOG_LEVEL_NOTICE);
                                         Logger(ret, LOG_LEVEL_VERBOSE);