diff --git a/src/lib b/src/lib index a1c644e..172e7ec 160000 --- a/src/lib +++ b/src/lib @@ -1 +1 @@ -Subproject commit a1c644e959820b5effcb6812c0a3d7998ae53be2 +Subproject commit 172e7ec61dbd2984f6c6e01eef497177bd0d9baf diff --git a/src/modules/essential/ModuleMigration.ts b/src/modules/essential/ModuleMigration.ts index 2623f32..e520221 100644 --- a/src/modules/essential/ModuleMigration.ts +++ b/src/modules/essential/ModuleMigration.ts @@ -104,7 +104,7 @@ export class ModuleMigration extends AbstractModule implements ICoreModule { return false; } - async checkIncompleteDocs(force: boolean = false): Promise { + async hasIncompleteDocs(force: boolean = false): Promise { const incompleteDocsChecked = (await this.core.kvDB.get("checkIncompleteDocs")) || false; if (incompleteDocsChecked && !force) { this._log("Incomplete docs check already done, skipping.", LOG_LEVEL_VERBOSE); @@ -219,7 +219,7 @@ export class ModuleMigration extends AbstractModule implements ICoreModule { return Promise.resolve(true); } - async checkCompromisedChunks(): Promise { + async hasCompromisedChunks(): Promise { Logger(`Checking for compromised chunks...`, LOG_LEVEL_VERBOSE); if (!this.settings.encrypt) { // If not encrypted, we do not need to check for compromised chunks. @@ -281,13 +281,13 @@ export class ModuleMigration extends AbstractModule implements ICoreModule { return false; } if (this.settings.isConfigured) { - if (await this.checkCompromisedChunks()) { + if (!(await this.hasCompromisedChunks())) { return false; } - if (await this.checkIncompleteDocs()) { + if (!(await this.hasIncompleteDocs())) { return false; } - if (await this.migrateUsingDoctor(false)) { + if (!(await this.migrateUsingDoctor(false))) { return false; } // await this.migrationCheck(); @@ -299,7 +299,7 @@ export class ModuleMigration extends AbstractModule implements ICoreModule { this._log($msg("moduleMigration.logSetupCancelled"), LOG_LEVEL_NOTICE); return false; } - if (await this.migrateUsingDoctor(true)) { + if (!(await this.migrateUsingDoctor(true))) { return false; } } @@ -310,7 +310,7 @@ export class ModuleMigration extends AbstractModule implements ICoreModule { await this.migrateUsingDoctor(false, reason, true); }); eventHub.onEvent(EVENT_REQUEST_RUN_FIX_INCOMPLETE, async () => { - await this.checkIncompleteDocs(true); + await this.hasIncompleteDocs(true); }); return Promise.resolve(true); } diff --git a/src/modules/features/SettingDialogue/PaneRemoteConfig.ts b/src/modules/features/SettingDialogue/PaneRemoteConfig.ts index a19a21d..a4b2266 100644 --- a/src/modules/features/SettingDialogue/PaneRemoteConfig.ts +++ b/src/modules/features/SettingDialogue/PaneRemoteConfig.ts @@ -199,12 +199,16 @@ export function paneRemoteConfig( ) { addResult($msg("obsidianLiveSyncSettingTab.okCorsOrigins")); } else { + const fixedValue = [ + ...new Set([ + ...ConfiguredOrigins.map((e) => e.trim()), + "app://obsidian.md", + "capacitor://localhost", + "http://localhost", + ]), + ].join(","); addResult($msg("obsidianLiveSyncSettingTab.errCorsOrigins")); - addConfigFixButton( - $msg("obsidianLiveSyncSettingTab.msgSetCorsOrigins"), - "cors/origins", - "app://obsidian.md,capacitor://localhost,http://localhost" - ); + addConfigFixButton($msg("obsidianLiveSyncSettingTab.msgSetCorsOrigins"), "cors/origins", fixedValue); isSuccessful = false; } addResult($msg("obsidianLiveSyncSettingTab.msgConnectionCheck"), ["ob-btn-config-head"]); diff --git a/styles.css b/styles.css index 62a0eb6..69354b4 100644 --- a/styles.css +++ b/styles.css @@ -385,6 +385,18 @@ span.ls-mark-cr::after { font-size: 80%; } +div.workspace-leaf-content[data-type=bases] .livesync-status { + top: calc(var(--bases-header-height) + var(--header-height)); + padding: 5px; + padding-right:18px; +} + +.is-mobile div.workspace-leaf-content[data-type=bases] .livesync-status { + top: calc(var(--bases-header-height) + var(--view-header-height)); + padding: 6px; + padding-right:18px; +} + .livesync-status div { opacity: 0.6; -webkit-filter: grayscale(100%); @@ -405,6 +417,7 @@ span.ls-mark-cr::after { filter: unset; } + .menu-setting-poweruser-disabled .sls-setting-poweruser { display: none; }