Merge pull request #14472 from owncloud/feature/wipencryptionapp

encryption 2.0 app

3 files changed, 0 insertions, 33 deletions

diff --git a/apps/files/index.php b/apps/files/index.php
index cfc5b931e13..ea0fd0ce2fe 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -84,12 +84,6 @@ $config = \OC::$server->getConfig();
 // mostly for the home storage's free space
 $dirInfo = \OC\Files\Filesystem::getFileInfo('/', false);
 $storageInfo=OC_Helper::getStorageInfo('/', $dirInfo);
-// if the encryption app is disabled, than everything is fine (INIT_SUCCESSFUL status code)
-$encryptionInitStatus = 2;
-if (OC_App::isEnabled('files_encryption')) {
-	$session = new \OCA\Files_Encryption\Session(new \OC\Files\View('/'));
-	$encryptionInitStatus = $session->getInitialized();
-}
 
 $nav = new OCP\Template('files', 'appnavigation', '');
 
@@ -146,11 +140,9 @@ OCP\Util::addscript('files', 'keyboardshortcuts');
 $tmpl = new OCP\Template('files', 'index', 'user');
 $tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']);
 $tmpl->assign('isPublic', false);
-$tmpl->assign("encryptedFiles", \OCP\Util::encryptedFiles());
 $tmpl->assign("mailNotificationEnabled", $config->getAppValue('core', 'shareapi_allow_mail_notification', 'no'));
 $tmpl->assign("mailPublicNotificationEnabled", $config->getAppValue('core', 'shareapi_allow_public_notification', 'no'));
 $tmpl->assign("allowShareWithLink", $config->getAppValue('core', 'shareapi_allow_links', 'yes'));
-$tmpl->assign("encryptionInitStatus", $encryptionInitStatus);
 $tmpl->assign('appNavigation', $nav);
 $tmpl->assign('appContents', $contentItems);
 
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
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 222a996aae3..77f80bc346d 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -12,8 +12,6 @@
 <input type="hidden" name="filesApp" id="filesApp" value="1" />
 <input type="hidden" name="usedSpacePercent" id="usedSpacePercent" value="<?php p($_['usedSpacePercent']); ?>" />
 <?php if (!$_['isPublic']) :?>
-<input type="hidden" name="encryptedFiles" id="encryptedFiles" value="<?php $_['encryptedFiles'] ? p('1') : p('0'); ?>" />
-<input type="hidden" name="encryptedInitStatus" id="encryptionInitStatus" value="<?php p($_['encryptionInitStatus']) ?>" />
 <input type="hidden" name="mailNotificationEnabled" id="mailNotificationEnabled" value="<?php p($_['mailNotificationEnabled']) ?>" />
 <input type="hidden" name="mailPublicNotificationEnabled" id="mailPublicNotificationEnabled" value="<?php p($_['mailPublicNotificationEnabled']) ?>" />
 <input type="hidden" name="allowShareWithLink" id="allowShareWithLink" value="<?php p($_['allowShareWithLink']) ?>" />