Item auth_params

This commit is contained in:
Mo Bitar
2018-07-06 23:35:32 -05:00
parent 6fe08106ed
commit 7339c7c77f
9 changed files with 13 additions and 30 deletions

View File

@@ -75,12 +75,12 @@ angular.module('app')
syncManager.setKeyRequestHandler(async () => {
let offline = authManager.offline();
let version = offline ? passcodeManager.protocolVersion() : await authManager.protocolVersion();
let auth_params = offline ? passcodeManager.passcodeAuthParams() : await authManager.getAuthParams();
let keys = offline ? passcodeManager.keys() : await authManager.keys();
return {
keys: keys,
offline: offline,
version: version
auth_params: auth_params
}
});

View File

@@ -204,6 +204,7 @@ angular.module('app')
this.createNewNote();
return;
}
this.selectedNote = note;
note.conflict_of = null; // clear conflict
this.selectionMade()(note);