Resolved the conflict with the HomePage plugin: when popuping verify …

…password modal after startup, enter the right password, open a homepage.
qing3962 · Sep 22, 2023 · b7bbe3e · b7bbe3e
1 parent 824ca0e
commit b7bbe3e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/main.js b/main.js
@@ -654,6 +654,8 @@ var PasswordPlugin = class extends import_obsidian2.Plugin {
  this.isVerifyPasswordWaitting = false;
  this.isVerifyPasswordCorrect = false;
  this.lastUnlockOrOpenFileTime = null;
+ this.startupFile = [];
+ this.isLayoutReady = true;
  this.t = (x, vars) => {
  return this.i18n.t(x, vars);
  };
@@ -694,6 +696,9 @@ var PasswordPlugin = class extends import_obsidian2.Plugin {
  if (file != null) {
  this.autoLockCheck();
  if (this.settings.protectEnabled && !this.isVerifyPasswordCorrect && this.isProtectedFile(file)) {
+ if (this.isLayoutReady && this.isVerifyPasswordWaitting) {
+ this.startupFile.push(file);
+ }
  this.closeLeave(file);
  this.closePasswordProtection(file);
  }
@@ -823,6 +828,15 @@ var PasswordPlugin = class extends import_obsidian2.Plugin {
  (0, import_obsidian2.setIcon)(this.passwordRibbonBtn, "lock");
  this.passwordRibbonBtn.ariaLabel = this.t("open_password_protection");
  new import_obsidian2.Notice(this.t("password_protection_closed"));
+ if (this.isLayoutReady) {
+ this.isLayoutReady = false;
+ for (const file of this.startupFile) {
+ if (file != null) {
+ this.openLeave(file);
+ }
+ }
+ this.startupFile = [];
+ }
  }
  }).open();
  }

diff --git a/main.ts b/main.ts
@@ -31,6 +31,8 @@ export default class PasswordPlugin extends Plugin {
  isVerifyPasswordWaitting: boolean = false;
  isVerifyPasswordCorrect: boolean = false;
  lastUnlockOrOpenFileTime: moment.Moment | null = null;
+ startupFile: TFile[] = [];
+ isLayoutReady: boolean = true;
 
  passwordRibbonBtn: HTMLElement;
  i18n: I18n;
@@ -88,7 +90,10 @@ export default class PasswordPlugin extends Plugin {
  if (file != null) {
  this.autoLockCheck();
  if (this.settings.protectEnabled && !this.isVerifyPasswordCorrect && this.isProtectedFile(file)) {
- // firstly close the file, then show the password dialog
+ // firstly cache the file if startuping, close the file, then show the password dialog
+ if (this.isLayoutReady && this.isVerifyPasswordWaitting) {
+ this.startupFile.push(file);
+ }
  this.closeLeave(file);
  this.closePasswordProtection(file);
  }
@@ -240,6 +245,15 @@ export default class PasswordPlugin extends Plugin {
  setIcon(this.passwordRibbonBtn, "lock");
  this.passwordRibbonBtn.ariaLabel = this.t("open_password_protection");
  new Notice(this.t("password_protection_closed"));
+ if (this.isLayoutReady) {
+ this.isLayoutReady = false;
+ for (const file of this.startupFile) {
+ if (file != null) {
+ this.openLeave(file);
+ }
+ }
+ this.startupFile = [];
+ }
  }
  }).open();
  }