From c5df58ec69af0f8ee48543df66f61e3090bdfb17 Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Wed, 19 Oct 2016 15:11:58 +0200
Subject: [PATCH] phpdoc

Signed-off-by: Robin Appelman <robin@icewind.nl>
---
 lib/private/App/AppManager.php                |  5 -----
 .../Authentication/Token/DefaultToken.php     |  3 +--
 lib/private/Lockdown/LockdownManager.php      | 12 ----------
 lib/private/legacy/app.php                    |  2 +-
 lib/public/Lockdown/ILockdownManager.php      | 22 +++++++++++++++++--
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php
index 354f891828..55fd575e12 100644
--- a/lib/private/App/AppManager.php
+++ b/lib/private/App/AppManager.php
@@ -112,11 +112,6 @@ class AppManager implements IAppManager {
 				return $value !== 'no';
 			});
 			ksort($this->installedAppsCache);
-			foreach ($this->installedAppsCache as $appId => $value) {
-				if (!\OC::$server->getLockdownManager()->canAccessApp($appId)) {
-					unset($this->installedAppsCache[$appId]);
-				}
-			}
 		}
 		return $this->installedAppsCache;
 	}
diff --git a/lib/private/Authentication/Token/DefaultToken.php b/lib/private/Authentication/Token/DefaultToken.php
index ea2414e6e1..8e6774a0a2 100644
--- a/lib/private/Authentication/Token/DefaultToken.php
+++ b/lib/private/Authentication/Token/DefaultToken.php
@@ -154,8 +154,7 @@ class DefaultToken extends Entity implements IToken {
 		$scope = json_decode($this->getScope(), true);
 		if (!$scope) {
 			return [
-				'filesystem'=> true,
-				'apps' => []
+				'filesystem'=> true
 			];
 		}
 		return $scope;
diff --git a/lib/private/Lockdown/LockdownManager.php b/lib/private/Lockdown/LockdownManager.php
index c34f7e01b6..5ce52a0368 100644
--- a/lib/private/Lockdown/LockdownManager.php
+++ b/lib/private/Lockdown/LockdownManager.php
@@ -43,16 +43,4 @@ class LockdownManager implements ILockdownManager {
 		}
 		return !$this->scope || $this->scope['filesystem'];
 	}
-
-	public function canAccessApp($app) {
-		if (!$this->enabled) {
-			return true;
-		}
-		if ($this->scope && $this->scope['apps']) {
-			return in_array($app, $this->scope['apps']);
-		} else {
-			// no limit
-			return true;
-		}
-	}
 }
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index 5503b8b525..c2ff9a5be3 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -140,7 +140,7 @@ class OC_App {
 	public static function loadApp($app, $checkUpgrade = true) {
 		self::$loadedApps[] = $app;
 		$appPath = self::getAppPath($app);
-		if($appPath === false || !\OC::$server->getLockdownManager()->canAccessApp($app)) {
+		if($appPath === false) {
 			return;
 		}
 
diff --git a/lib/public/Lockdown/ILockdownManager.php b/lib/public/Lockdown/ILockdownManager.php
index 0b0c525501..d4d05b37ff 100644
--- a/lib/public/Lockdown/ILockdownManager.php
+++ b/lib/public/Lockdown/ILockdownManager.php
@@ -21,12 +21,30 @@ namespace OCP\Lockdown;
 
 use OC\Authentication\Token\IToken;
 
+/**
+ * @since 9.2
+ */
 interface ILockdownManager {
+	/**
+	 * Enable the lockdown restrictions
+	 *
+	 * @since 9.2
+	 */
 	public function enable();
 
+	/**
+	 * Set the active token to get the restrictions from and enable the lockdown
+	 *
+	 * @param IToken $token
+	 * @since 9.2
+	 */
 	public function setToken(IToken $token);
 
+	/**
+	 * Check whether or not filesystem access is allowed
+	 *
+	 * @return bool
+	 * @since 9.2
+	 */
 	public function canAccessFilesystem();
-
-	public function canAccessApp($app);
 }