Merge pull request #14472 from owncloud/feature/wipencryptionapp

encryption 2.0 app

1 files changed, 0 insertions, 23 deletions

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index e63c3cad52e..68e9315954f 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -120,28 +120,6 @@
 			}
 		},
 
-		displayEncryptionWarning: function() {
-
-			if (!OC.Notification.isHidden()) {
-				return;
-			}
-
-			var encryptedFiles = $('#encryptedFiles').val();
-			var initStatus = $('#encryptionInitStatus').val();
-			if (initStatus === '0') { // enc not initialized, but should be
-				OC.Notification.show(t('files', 'Encryption App is enabled but your keys are not initialized, please log-out and log-in again'));
-				return;
-			}
-			if (initStatus === '1') { // encryption tried to init but failed
-				OC.Notification.show(t('files', 'Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.'));
-				return;
-			}
-			if (encryptedFiles === '1') {
-				OC.Notification.show(t('files', 'Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.'));
-				return;
-			}
-		},
-
 		/**
 		 * Returns the download URL of the given file(s)
 		 * @param filename string or array of file names to download
@@ -220,7 +198,6 @@
 		 */
 		initialize: function() {
 			Files.getMimeIcon.cache = {};
-			Files.displayEncryptionWarning();
 			Files.bindKeyboardShortcuts(document, $);
 
 			// TODO: move file list related code (upload) to OCA.Files.FileList