diff options
Diffstat (limited to 'js/app')
| -rw-r--r-- | js/app/directives/iconpicker.js | 8 | ||||
| -rw-r--r-- | js/app/services/credentialservice.js | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/js/app/directives/iconpicker.js b/js/app/directives/iconpicker.js index 210dfacb..e6a78f7d 100644 --- a/js/app/directives/iconpicker.js +++ b/js/app/directives/iconpicker.js @@ -137,12 +137,8 @@ scope.credential.icon.type = data.substring(data.lastIndexOf(":")+1,data.lastIndexOf(";")); scope.credential.icon.content = data.substring(data.lastIndexOf(",")+1, data.length); }else{ - $http.get(scope.selectedIcon.url).then(function(result) { - var base64Data = window.btoa(result.data); - var mimeType = 'svg+xml'; - scope.credential.icon.type = mimeType; - scope.credential.icon.content = base64Data; - }); + scope.credential.icon.type = 'svg+xml'; + scope.credential.icon.content = scope.selectedIcon.data; } $('#iconPicker').dialog('close'); }; diff --git a/js/app/services/credentialservice.js b/js/app/services/credentialservice.js index e8bc2a41..c30756d6 100644 --- a/js/app/services/credentialservice.js +++ b/js/app/services/credentialservice.js @@ -138,12 +138,13 @@ var fieldValue = angular.copy(credential[field]); var field_decrypted_value; try { - if(fieldValue!==null){ + if(fieldValue!==null && fieldValue!=="null" && fieldValue!==""){ field_decrypted_value = EncryptService.decryptString(fieldValue, key); }else{ field_decrypted_value=null; } } catch (e) { + console.error('Error decrypting credential:', credential); throw e; } try { @@ -216,7 +217,7 @@ this.parent.plain_credential = service.decryptCredential(credential, this.parent.old_password); var tmp = angular.copy(this.parent.plain_credential); - if (tmp.hasOwnProperty('shared_key') && tmp.shared_key !== null && !skipSharingKey) { + if (tmp.hasOwnProperty('shared_key') && tmp.shared_key !== null && tmp.shared_key !== '' && !skipSharingKey) { var shared_key = EncryptService.decryptString(angular.copy(tmp.shared_key)).trim(); tmp.shared_key = EncryptService.encryptString(angular.copy(shared_key), this.parent.new_password); tmp.set_share_key = true; |