extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-05 05:29:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix PGP Encryption backup:

Browse Source 
- Rename the backup file, still will check the previous backup file though
- Close backup dialog from mailvelope after the backup process is finished
This commit is contained in:
Hadi Nategh 2016-06-21 12:54:36 +02:00
parent 29739f6b82
commit 14935780ce
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
api/js/jsapi/app_base.js
View File

@ -1310,10 +1310,10 @@ var AppJS = (function(){ "use strict"; return Class.extend(
backup: function(_backup) backup: function(_backup)
{ {
return new Promise(function(_resolve,_reject){ return new Promise(function(_resolve,_reject){
// Store backup sync packet into .PK_PGP file in user directory // Store backup sync packet into .PGP-Key-Backup file in user directory
jQuery.ajax({ jQuery.ajax({
method:'PUT', method:'PUT',
url: egw.webserverUrl+'/webdav.php/home/'+egw.user('account_lid')+'/.PGP-Keychain', url: egw.webserverUrl+'/webdav.php/home/'+egw.user('account_lid')+'/.PGP-Key-Backup',
contentType: 'application/json', contentType: 'application/json',
data: JSON.stringify(_backup), data: JSON.stringify(_backup),
success:function(){ success:function(){
@ -1338,14 +1338,32 @@ var AppJS = (function(){ "use strict"; return Class.extend(
var resolve = _resolve; var resolve = _resolve;
var reject = _reject; var reject = _reject;
jQuery.ajax({ jQuery.ajax({
url:egw.webserverUrl+'/webdav.php/home/'+egw.user('account_lid')+'/.PGP-Keychain', url:egw.webserverUrl+'/webdav.php/home/'+egw.user('account_lid')+'/.PGP-Key-Backup',
method: 'GET', method: 'GET',
success: function(_backup){ success: function(_backup){
resolve(JSON.parse(_backup)); resolve(JSON.parse(_backup));
egw.message('Your key has been restored successfully.'); egw.message('Your key has been restored successfully.');
}, },
error: function(_err){ error: function(_err){
reject(_err); //Try with old back file name
if (_err.status == 404)
{
jQuery.ajax({
method:'GET',
url: egw.webserverUrl+'/webdav.php/home/'+egw.user('account_lid')+'/.PK_PGP',
success: function(_backup){
resolve(JSON.parse(_backup));
egw.message('Your key has been restored successfully.');
},
error: function(_err){
_reject(_err);
}
});
}
else
{
_reject(_err);
}
} }
}); });
}); });
@ -1420,6 +1438,10 @@ var AppJS = (function(){ "use strict"; return Class.extend(
_keyring.createKeyBackupContainer(selector, options).then(function(_popupId){ _keyring.createKeyBackupContainer(selector, options).then(function(_popupId){
var $backup_selector = jQuery('iframe[src^="chrome-extension"],iframe[src^="about:blank?mvelo"]'); var $backup_selector = jQuery('iframe[src^="chrome-extension"],iframe[src^="about:blank?mvelo"]');
$backup_selector.css({position:'absolute', "z-index":1}); $backup_selector.css({position:'absolute', "z-index":1});
_popupId.isReady().then(function(result){
egw.message('Your key has been backedup into .PGP-Key-Backup successfully.');
jQuery(selector).empty();
});
resolve(_popupId); resolve(_popupId);
}, },
function(_err){ function(_err){