Add allow_files_filtered_by_circles option, to list or not circle i…

…n the files app

Default is set to `1` to list them in the `files` application
To hide them, set it to `0`

Signed-off-by: Tortue Torche <tortuetorche@users.noreply.github.com>

lib/AppInfo/Application.php

@@ -130,6 +130,16 @@ function() {
  }
 
  public function registerFilesPlugin() {
+ try {
+ /** @var ConfigService $configService */
+ $configService = $this->server->query(ConfigService::class);
+ if (!$configService->isFilesFilteredCirclesAllowed()) {
+ return;
+ }
+ } catch (QueryException $e) {
+ return;
+ }
+
  $this->dispatcher->addListener(
  'OCA\Files::loadAdditionalScripts',
  function() {
@@ -148,6 +158,16 @@ function() {
  *
  */
  public function registerFilesNavigation() {
+ try {
+ /** @var ConfigService $configService */
+ $configService = $this->server->query(ConfigService::class);
+ if (!$configService->isFilesFilteredCirclesAllowed()) {
+ return;
+ }
+ } catch (QueryException $e) {
+ return;
+ }
+
  $appManager = FilesApp::getNavigationManager();
  $appManager->add(
  function() {

lib/Service/ConfigService.php

@@ -41,6 +41,7 @@ class ConfigService {
  const CIRCLES_ALLOW_FEDERATED_CIRCLES = 'allow_federated';
  const CIRCLES_MEMBERS_LIMIT = 'members_limit';
  const CIRCLES_ACCOUNTS_ONLY = 'accounts_only';
+ const CIRCLES_ALLOW_FILES_CIRCLES_FILTER = 'allow_files_filtered_by_circles';
  const CIRCLES_ALLOW_LISTED_CIRCLES = 'allow_listed_circles';
  const CIRCLES_ALLOW_ANY_GROUP_MEMBERS = 'allow_adding_any_group_members';
  const CIRCLES_ALLOW_LINKED_GROUPS = 'allow_linked_groups';
@@ -68,6 +69,7 @@ class ConfigService {
  self::CIRCLES_NON_SSL_LOCAL => '0',
  self::CIRCLES_ACTIVITY_ON_CREATION => '1',
  self::CIRCLES_SKIP_INVITATION_STEP => '0'
+ self::CIRCLES_ALLOW_FILES_CIRCLES_FILTER => '1',
  self::CIRCLES_ALLOW_LISTED_CIRCLES => '1',
  self::CIRCLES_ALLOW_ANY_GROUP_MEMBERS => '1',
  ];
@@ -90,6 +92,9 @@ class ConfigService {
  /** @var int */
  private $allowedCircle = -1;
 
+ /** @var int */
+ private $allowFilesFilteredByCircles = -1;
+
  /** @var int */
  private $allowedListedCircles = -1;
 
@@ -149,6 +154,20 @@ public function isCircleAllowed($type) {
  return ((int)$type & (int)$this->allowedCircle);
  }
 
+ /**
+ * returns if the files list could be filtered by circles
+ *
+ * @return bool
+ */
+ public function isFilesFilteredCirclesAllowed() {
+ if ($this->allowFilesFilteredByCircles === -1) {
+ $this->allowFilesFilteredByCircles =
+ (int)$this->getAppValue(self::CIRCLES_ALLOW_FILES_CIRCLES_FILTER);
+ }
+
+ return ($this->allowFilesFilteredByCircles === 1);
+ }
+
  /**
  * returns if the circles are allowed to be listed outside the Circles application.
  *