Merge pull request #6922 from nextcloud/unneeded-isEnabled-check

Remove unneeded check if app is enabled

apps/encryption/lib/Hooks/UserHooks.php

@@ -170,11 +170,6 @@ class UserHooks implements IHook {
 	 * @return boolean|null
 	 */
 	public function login($params) {
-
-		if (!App::isEnabled('encryption')) {
-			return true;
-		}
-
 		// ensure filesystem is loaded
 		if (!\OC\Files\Filesystem::$loaded) {
 			$this->setupFS($params['uid']);
@@ -200,11 +195,8 @@ class UserHooks implements IHook {
 	 * @param array $params
 	 */
 	public function postCreateUser($params) {
-
-		if (App::isEnabled('encryption')) {
 		$this->userSetup->setupUser($params['uid'], $params['password']);
 	}
-	}
 
 	/**
 	 * cleanup encryption backend upon user deleted
@@ -213,18 +205,13 @@ class UserHooks implements IHook {
 	 * @note This method should never be called for users using client side encryption
 	 */
 	public function postDeleteUser($params) {
-
-		if (App::isEnabled('encryption')) {
 		$this->keyManager->deletePublicKey($params['uid']);
 	}
-	}
 
 	public function prePasswordReset($params) {
-		if (App::isEnabled('encryption')) {
 		$user = $params['uid'];
 		self::$passwordResetUsers[$user] = true;
 	}
-	}
 
 	public function postPasswordReset($params) {
 		$uid = $params['uid'];

apps/files_trashbin/lib/Hooks.php

@@ -39,11 +39,9 @@ class Hooks {
 	 * to remove the used space for the trash bin stored in the database
 	 */
 	public static function deleteUser_hook($params) {
-		if( \OCP\App::isEnabled('files_trashbin') ) {
 		$uid = $params['uid'];
 		Trashbin::deleteUser($uid);
 	}
-	}
 
 	public static function post_write_hook($params) {
 		$user = \OCP\User::getUser();

apps/files_versions/lib/Hooks.php

@@ -54,14 +54,11 @@ class Hooks {
 	 * listen to write event.
 	 */
 	public static function write_hook( $params ) {
-
-		if (\OCP\App::isEnabled('files_versions')) {
 		$path = $params[\OC\Files\Filesystem::signal_param_path];
 		if($path !== '') {
 			Storage::store($path);
 		}
 	}
-	}
 
 
 	/**
@@ -72,14 +69,11 @@ class Hooks {
 	 * cleanup the versions directory if the actual file gets deleted
 	 */
 	public static function remove_hook($params) {
-
-		if (\OCP\App::isEnabled('files_versions')) {
 		$path = $params[\OC\Files\Filesystem::signal_param_path];
 		if($path !== '') {
 			Storage::delete($path);
 		}
 	}
-	}
 
 	/**
 	 * mark file as "deleted" so that we can clean up the versions if the file is gone
@@ -100,15 +94,12 @@ class Hooks {
 	 * of the stored versions along the actual file
 	 */
 	public static function rename_hook($params) {
-
-		if (\OCP\App::isEnabled('files_versions')) {
 		$oldpath = $params['oldpath'];
 		$newpath = $params['newpath'];
 		if($oldpath !== '' && $newpath !== '') {
 			Storage::renameOrCopy($oldpath, $newpath, 'rename');
 		}
 	}
-	}
 
 	/**
 	 * copy versions of copied files
@@ -118,15 +109,12 @@ class Hooks {
 	 * the stored versions to the new location
 	 */
 	public static function copy_hook($params) {
-
-		if (\OCP\App::isEnabled('files_versions')) {
 		$oldpath = $params['oldpath'];
 		$newpath = $params['newpath'];
 		if($oldpath !== '' && $newpath !== '') {
 			Storage::renameOrCopy($oldpath, $newpath, 'copy');
 		}
 	}
-	}
 
 	/**
 	 * Remember owner and the owner path of the source file.
@@ -137,8 +125,6 @@ class Hooks {
 	 *
 	 */
 	public static function pre_renameOrCopy_hook($params) {
-		if (\OCP\App::isEnabled('files_versions')) {
-
 		// if we rename a movable mount point, then the versions don't have
 		// to be renamed
 		$absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files' . $params['oldpath']);
@@ -155,8 +141,6 @@ class Hooks {
 		} else {
 			Storage::setSourcePathAndUser($params['oldpath']);
 		}
-
-		}
 	}
 
 	/**