Only update capabilities on successfull fetch

fixes #448

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

2 files changed, 19 insertions, 2 deletions

diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index 432b0f12..fd1d53be 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -152,6 +152,8 @@ class SettingsController extends Controller{
 		}
 
 		$this->discoveryManager->refretch();
+
+		$this->capabilitiesService->clear();
 		$this->capabilitiesService->refretch();
 
 		$response = [
diff --git a/lib/Service/CapabilitiesService.php b/lib/Service/CapabilitiesService.php
index 740c22ca..82202ce4 100644
--- a/lib/Service/CapabilitiesService.php
+++ b/lib/Service/CapabilitiesService.php
@@ -25,6 +25,7 @@ namespace OCA\Richdocuments\Service;
 
 use OCP\Files\IAppData;
 use OCP\Files\NotFoundException;
+use OCP\Files\SimpleFS\ISimpleFile;
 use OCP\Files\SimpleFS\ISimpleFolder;
 use OCP\Http\Client\IClientService;
 use OCP\IConfig;
@@ -48,15 +49,29 @@ class CapabilitiesService {
 		}
 	}
 
-	public function refretch() {
+	private function getFile() {
 		try {
 			$file = $this->appData->getFile('capabilities.json');
 		} catch (NotFoundException $e) {
 			$file = $this->appData->newFile('capabilities.json');
+			$file->putContent(json_encode([]));
 		}
 
+		return $file;
+	}
+
+	public function clear() {
+		$file = $this->getFile();
+		$file->putContent(json_encode([]));
+	}
+
+	public function refretch() {
 		$capabilties = $this->renewCapabilities();
-		$file->putContent(json_encode($capabilties));
+
+		if ($capabilties !== []) {
+			$file = $this->getFile();
+			$file->putContent(json_encode($capabilties));
+		}
 	}
 
 	private function renewCapabilities() {