change key password when user switches from client to server side encryption.

make use of the keymanager class in changekeypasscode()

1 files changed, 2 insertions, 4 deletions

diff --git a/apps/files_encryption/js/settings-personal.js b/apps/files_encryption/js/settings-personal.js
index fad077a8dd7..f335cf7f880 100644
--- a/apps/files_encryption/js/settings-personal.js
+++ b/apps/files_encryption/js/settings-personal.js
@@ -18,14 +18,12 @@ $(document).ready(function(){
 			}
 		} else if (server) {
 			if (prevmode == 'client') {
-		    OC.dialogs.form([{text:'login password', name:'newpasswd', type:'password'},{text:'Encryption password used on the client', name:'oldpasswd', type:'password'}],t('encryption', 'Please enter your passwords'), function(data) {
+		    OC.dialogs.form([{text:'login password', name:'newpasswd', type:'password'},{text:'Encryption password used on the client', name:'oldpasswd', type:'password'}],t('encryption', 'Change encryption password to login password'), function(data) {
 		   		$.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'server', newpasswd: data[0].value, oldpasswd: data[1].value }, function(result) {
 		   			if (result.status != 'success') {
-		   				console.log("change selection back to " + prevmode+'_encryption');
 		   				document.getElementById(prevmode+'_encryption').checked = true;
-		   			} else {
+		   				OC.dialogs.alert(t('encryption', 'Please check your passwords and try again'), t('encryption', 'Could not change encryption password to login password'))
 		   			}
-		   			
 		   		});
 		    });
 			} else {