Item auth_params
This commit is contained in:
@@ -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
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -204,6 +204,7 @@ angular.module('app')
|
||||
this.createNewNote();
|
||||
return;
|
||||
}
|
||||
|
||||
this.selectedNote = note;
|
||||
note.conflict_of = null; // clear conflict
|
||||
this.selectionMade()(note);
|
||||
|
||||
Reference in New Issue
Block a user