aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-08-21 10:23:10 +0200
committerMorris Jobke <hey@morrisjobke.de>2015-08-21 10:23:10 +0200
commitc87042905c9f06aadef6df279b308232b0a2f2c8 (patch)
tree1dc0e022fbd129f59cc5e1bd4981bd19247635d0
parent5f5c3520c9c48c4d0f5fbe2aa05f5d952b3607f6 (diff)
parent5ded5c6fc198783b8f2f59f488b1dc80ad9aa837 (diff)
downloadnextcloud-server-c87042905c9f06aadef6df279b308232b0a2f2c8.tar.gz
nextcloud-server-c87042905c9f06aadef6df279b308232b0a2f2c8.zip
Merge pull request #18468 from owncloud/sharing_availability_fix
Storage availability fixes for files_sharing and FailedStorage
-rw-r--r--apps/files_external/lib/failedstorage.php8
-rw-r--r--apps/files_sharing/lib/sharedstorage.php18
2 files changed, 26 insertions, 0 deletions
diff --git a/apps/files_external/lib/failedstorage.php b/apps/files_external/lib/failedstorage.php
index 6afa98052c2..22ee5326491 100644
--- a/apps/files_external/lib/failedstorage.php
+++ b/apps/files_external/lib/failedstorage.php
@@ -197,4 +197,12 @@ class FailedStorage extends Common {
throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
}
+ public function getAvailability() {
+ throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+ }
+
+ public function setAvailability($isAvailable) {
+ throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+ }
+
}
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 66803db1425..c7529df0617 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -662,4 +662,22 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
list($targetStorage, $targetInternalPath) = $this->resolvePath($path);
$targetStorage->changeLock($targetInternalPath, $type, $provider);
}
+
+ /**
+ * @return array [ available, last_checked ]
+ */
+ public function getAvailability() {
+ // shares do not participate in availability logic
+ return [
+ 'available' => true,
+ 'last_checked' => 0
+ ];
+ }
+
+ /**
+ * @param bool $available
+ */
+ public function setAvailability($available) {
+ // shares do not participate in availability logic
+ }
}