8 files changed, 24 insertions, 1 deletions
diff --git a/core/Command/Config/System/SetConfig.php b/core/Command/Config/System/SetConfig.php
index 4d23c191ac1..62ab7f7120f 100644
--- a/core/Command/Config/System/SetConfig.php
+++ b/core/Command/Config/System/SetConfig.php
@@ -142,6 +142,13 @@ class SetConfig extends Base {
 					'readable-value' => ($value === '') ? 'empty string' : 'string ' . $value,
 				];
 
+			case 'json':
+				$value = json_decode($value, true);
+				return [
+					'value' => $value,
+					'readable-value' => 'json ' . json_encode($value),
+				];
+
 			default:
 				throw new \InvalidArgumentException('Invalid type');
 		}
@@ -183,7 +190,7 @@ class SetConfig extends Base {
 	 */
 	public function completeOptionValues($optionName, CompletionContext $context) {
 		if ($optionName === 'type') {
-			return ['string', 'integer', 'double', 'boolean'];
+			return ['string', 'integer', 'double', 'boolean', 'json', 'null'];
 		}
 		return parent::completeOptionValues($optionName, $context);
 	}
diff --git a/core/Command/Info/File.php b/core/Command/Info/File.php
index a081d1d13e1..c21c2e666fb 100644
--- a/core/Command/Info/File.php
+++ b/core/Command/Info/File.php
@@ -8,6 +8,7 @@ declare(strict_types=1);
 namespace OC\Core\Command\Info;
 
 use OC\Files\ObjectStore\ObjectStoreStorage;
+use OC\Files\Storage\Wrapper\Encryption;
 use OC\Files\View;
 use OCA\Files_External\Config\ExternalMountPoint;
 use OCA\GroupFolders\Mount\GroupMountPoint;
@@ -71,6 +72,15 @@ class File extends Command {
 			} else {
 				$output->writeln('    <error>encryption key not found</error> should be located at: ' . $keyPath);
 			}
+			$storage = $node->getStorage();
+			if ($storage->instanceOfStorage(Encryption::class)) {
+				/** @var Encryption $storage */
+				if (!$storage->hasValidHeader($node->getInternalPath())) {
+					$output->writeln('    <error>file doesn\'t have a valid encryption header</error>');
+				}
+			} else {
+				$output->writeln('    <error>file is marked as encrypted, but encryption doesn\'t seem to be setup</error>');
+			}
 		}
 
 		if ($node instanceof Folder && $node->isEncrypted() || $node instanceof OCPFile && $node->getParent()->isEncrypted()) {
diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js
index a4e4c78a105..3fcb68d8b54 100644
--- a/core/l10n/en_GB.js
+++ b/core/l10n/en_GB.js
@@ -27,6 +27,7 @@ OC.L10N.register(
     "Could not complete login" : "Could not complete login",
     "State token missing" : "State token missing",
     "Your login token is invalid or has expired" : "Your login token is invalid or has expired",
+    "Please use original client" : "Please use original client",
     "This community release of Nextcloud is unsupported and push notifications are limited." : "This community release of Nextcloud is unsupported and push notifications are limited.",
     "Login" : "Login",
     "Unsupported email length (>255)" : "Unsupported email length (>255)",
diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json
index 093c9564552..aa8e57fa52f 100644
--- a/core/l10n/en_GB.json
+++ b/core/l10n/en_GB.json
@@ -25,6 +25,7 @@
     "Could not complete login" : "Could not complete login",
     "State token missing" : "State token missing",
     "Your login token is invalid or has expired" : "Your login token is invalid or has expired",
+    "Please use original client" : "Please use original client",
     "This community release of Nextcloud is unsupported and push notifications are limited." : "This community release of Nextcloud is unsupported and push notifications are limited.",
     "Login" : "Login",
     "Unsupported email length (>255)" : "Unsupported email length (>255)",
diff --git a/core/l10n/ko.js b/core/l10n/ko.js
index 21de2675fe3..ac73f72136a 100644
--- a/core/l10n/ko.js
+++ b/core/l10n/ko.js
@@ -27,6 +27,7 @@ OC.L10N.register(
     "Could not complete login" : "로그인을 완료할 수 없음",
     "State token missing" : "상태 토큰 누락",
     "Your login token is invalid or has expired" : "로그인 토큰이 잘못되었거나 만료되었습니다.",
+    "Please use original client" : "원본 클라이언트를 사용해주십시오.",
     "This community release of Nextcloud is unsupported and push notifications are limited." : "이 Nextcloud 커뮤니티 릴리즈는 지원하지 않는 버전이며, 푸시 알림은 제한됩니다.",
     "Login" : "로그인",
     "Unsupported email length (>255)" : "지원하지 않는 이메일 길이 (255자 초과)",
diff --git a/core/l10n/ko.json b/core/l10n/ko.json
index 67fc5f25474..98c8a26cfbb 100644
--- a/core/l10n/ko.json
+++ b/core/l10n/ko.json
@@ -25,6 +25,7 @@
     "Could not complete login" : "로그인을 완료할 수 없음",
     "State token missing" : "상태 토큰 누락",
     "Your login token is invalid or has expired" : "로그인 토큰이 잘못되었거나 만료되었습니다.",
+    "Please use original client" : "원본 클라이언트를 사용해주십시오.",
     "This community release of Nextcloud is unsupported and push notifications are limited." : "이 Nextcloud 커뮤니티 릴리즈는 지원하지 않는 버전이며, 푸시 알림은 제한됩니다.",
     "Login" : "로그인",
     "Unsupported email length (>255)" : "지원하지 않는 이메일 길이 (255자 초과)",
diff --git a/core/l10n/zh_HK.js b/core/l10n/zh_HK.js
index 705b05a6a8d..73aaa79a73c 100644
--- a/core/l10n/zh_HK.js
+++ b/core/l10n/zh_HK.js
@@ -27,6 +27,7 @@ OC.L10N.register(
     "Could not complete login" : "無法完成登錄",
     "State token missing" : "找不到狀態權杖",
     "Your login token is invalid or has expired" : "您的登入權杖無效或已過期",
+    "Please use original client" : "請使用原先的客戶端",
     "This community release of Nextcloud is unsupported and push notifications are limited." : "這個社群版的 Nextcloud 是不受支援的，且推送通知功能有限。",
     "Login" : "登入",
     "Unsupported email length (>255)" : "不受支援的電郵地址長度（>255）",
diff --git a/core/l10n/zh_HK.json b/core/l10n/zh_HK.json
index 1099177ec34..dfd9a4dec15 100644
--- a/core/l10n/zh_HK.json
+++ b/core/l10n/zh_HK.json
@@ -25,6 +25,7 @@
     "Could not complete login" : "無法完成登錄",
     "State token missing" : "找不到狀態權杖",
     "Your login token is invalid or has expired" : "您的登入權杖無效或已過期",
+    "Please use original client" : "請使用原先的客戶端",
     "This community release of Nextcloud is unsupported and push notifications are limited." : "這個社群版的 Nextcloud 是不受支援的，且推送通知功能有限。",
     "Login" : "登入",
     "Unsupported email length (>255)" : "不受支援的電郵地址長度（>255）",