remove encryption specific code from files app

diff --git a/apps/files/index.php b/apps/files/index.php
index 23830da695db5726d97b7d5b6f01bc874a30026b..ea0fd0ce2fec9944f10ade4e33a3cb56f9ecfc7a 100644 (file)
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -84,8 +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;
 
 $nav = new OCP\Template('files', 'appnavigation', '');
 
@@ -145,7 +143,6 @@ $tmpl->assign('isPublic', false);
 $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 9d2d563984e8f5b3a0c29d9ee0ddef1d4a38017d..68e9315954f4bb2a0fd7b89d2e6c60c5e90e04e2 100644 (file)
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -120,22 +120,6 @@
                        }
                },
 
-               displayEncryptionWarning: function() {
-
-                       if (!OC.Notification.isHidden()) {
-                               return;
-                       }
-
-                       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.'));
-                       }
-               },
-
                /**
                 * Returns the download URL of the given file(s)
                 * @param filename string or array of file names to download
@@ -214,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 84f3033ba9effdb420139848f24b68de97fa14e0..77f80bc346db80aa86ecc926a713e946fced9f1a 100644 (file)
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -12,7 +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="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']) ?>" />