Browse Source

[BUG] v2.4.0.beta - Decrypted data is written to disk

Fixes #164
pull/190/head
meld-cp 2 years ago
parent
commit
109a6eda56
  1. 10
      src/features/feature-whole-note-encrypt/EncryptedMarkdownView.ts
  2. 4
      src/services/SessionPasswordService.ts

10
src/features/feature-whole-note-encrypt/EncryptedMarkdownView.ts

@ -132,7 +132,7 @@ export class EncryptedMarkdownView extends MarkdownView { @@ -132,7 +132,7 @@ export class EncryptedMarkdownView extends MarkdownView {
// return the encrypted data which should have just been updated in the save method
return JsonFileEncoding.encode( this.encryptedData );
}
// not saving, so return the unencrypted view data
return this.getUnencryptedViewData();
}
@ -157,7 +157,7 @@ export class EncryptedMarkdownView extends MarkdownView { @@ -157,7 +157,7 @@ export class EncryptedMarkdownView extends MarkdownView {
}
if ( JsonFileEncoding.isEncoded(data) ){
console.debug( 'View is being set with already encoded data, trying to decode' )
console.debug( 'View is being set with already encoded data, trying to decode', {data} );
if (this.passwordAndHint == null){
console.error('passwordAndHint == null');
return;
@ -182,7 +182,11 @@ export class EncryptedMarkdownView extends MarkdownView { @@ -182,7 +182,11 @@ export class EncryptedMarkdownView extends MarkdownView {
override async save(clear?: boolean | undefined): Promise<void> {
//console.debug('save', {clear, 'file.ext': this.file?.extension});
if ( this.isSavingInProgress ) {
console.debug('Saving was prevented because another save is in progress, Obsidian will try again later if the content changed.');
return;
}
this.isSavingInProgress = true;
try{

4
src/services/SessionPasswordService.ts

@ -63,7 +63,7 @@ export class SessionPasswordService{ @@ -63,7 +63,7 @@ export class SessionPasswordService{
}
public static setLevel( level: string ) {
console.debug( 'SessionPasswordService.setLevel', { level, allLevels: this.allLevels } );
//console.debug( 'SessionPasswordService.setLevel', { level, allLevels: this.allLevels } );
if ( SessionPasswordService.level == level ){
return;
}
@ -73,7 +73,7 @@ export class SessionPasswordService{ @@ -73,7 +73,7 @@ export class SessionPasswordService{
}
SessionPasswordService.level = SessionPasswordService.LevelFilename;
this.clear();
console.debug( 'SessionPasswordService.level', { level: SessionPasswordService.level } );
//console.debug( 'SessionPasswordService.level', { level: SessionPasswordService.level } );
}
public static updateExpiryTime() : void {

Loading…
Cancel
Save