From ee53ba5ed6e41cc997ed07b1f47305804d607afd Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 1 Apr 2015 17:46:09 +0200
Subject: [PATCH] remove encryption specific code from files app
---
apps/files/index.php | 3 ---
apps/files/js/files.js | 17 -----------------
apps/files/templates/index.php | 1 -
3 files changed, 21 deletions(-)
diff --git a/apps/files/index.php b/apps/files/index.php
index 23830da695d..ea0fd0ce2fe 100644
--- 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 9d2d563984e..68e9315954f 100644
--- 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 84f3033ba9e..77f80bc346d 100644
--- 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']) ?>" />
--
GitLab