public/obsidian-livesync
1
0
Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2026-08-28 14:27:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Complete Commonlib rc.6 integration and setup workflows

Browse Source
This commit is contained in:
vorotamoroz
2026-07-21 15:00:28 +00:00
parent e005f9eb13
commit 1ef8c88139
150 changed files with 31041 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/features/SetupManager.ts
+5 -6
View File
@@ -43,6 +43,7 @@ import {
applySettingsAndFetchOnActivation,
applySettingsWithScheduledInitialisation,
} from "@/serviceFeatures/setupObsidian/setupActivationLifecycle.ts";
import { isP2PMainRemote } from "@/common/remoteConfiguration.ts";
function copySettingsForRemoteProfileUpdate(settings: ObsidianLiveSyncSettings): ObsidianLiveSyncSettings {
return {
@@ -368,10 +369,7 @@ export class SetupManager extends AbstractModule {
userMode = UserMode.ExistingUser;
} else if (userModeResult === "compatible-existing-user") {
extra();
const applied = await this.applySettingAndScheduleFetchOnActivation(
newConf,
UserMode.ExistingUser
);
const applied = await this.applySettingAndScheduleFetchOnActivation(newConf, UserMode.ExistingUser);
if (applied) this._log("Settings from wizard applied.", LOG_LEVEL_NOTICE);
return applied;
} else if (userModeResult === "cancelled") {
@@ -382,8 +380,9 @@ export class SetupManager extends AbstractModule {
}
const component = userMode === UserMode.NewUser ? OutroNewUser : OutroExistingUser;
const confirm = await this.dialogManager.openWithExplicitCancel<
OutroNewUserResultType | OutroExistingUserResultType
>(component);
OutroNewUserResultType | OutroExistingUserResultType,
{ isP2P: boolean }
>(component, { isP2P: isP2PMainRemote(newConf) });
if (confirm === "cancelled") {
this._log("User cancelled applying settings from wizard..", LOG_LEVEL_NOTICE);
return false;