From 3ccd26e75b20b9572c702632799dda47d293874a Mon Sep 17 00:00:00 2001 From: Marcos Zuriaga Date: Fri, 7 Oct 2016 00:54:57 +0200 Subject: [PATCH] Fix reencryption of history data --- js/app/controllers/share.js | 4 +++- js/app/services/credentialservice.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/js/app/controllers/share.js b/js/app/controllers/share.js index 15394ca9..f89a0b24 100644 --- a/js/app/controllers/share.js +++ b/js/app/controllers/share.js @@ -191,7 +191,9 @@ angular.module('passmanApp') CredentialService.reencryptCredential(_credential.credential_id, old_key, new_key).progress(function(data){ console.log(data); }).then(function(data){ - console.error('This is still not called..') + console.warn(data); + //@TODO Implement action on reencryption finished + console.error('This is still NOW called..') }); }) }; diff --git a/js/app/services/credentialservice.js b/js/app/services/credentialservice.js index 5225cbb7..2869280d 100644 --- a/js/app/services/credentialservice.js +++ b/js/app/services/credentialservice.js @@ -251,7 +251,7 @@ angular.module('passmanApp') } }).bind(this)); - if (!this.current + this.upload == this.total) { + if (this.current != (this.total / 2)) { setTimeout(revision_workload.bind(this), 1); } };