Fix wrong failure-msg when clearing photo-cache.

bool GeophotoService::clearCache returns false, if any of the cleared caches was already empty. This change makes the function always return true unless an exception occured - then false is returned. Signed-off-by: umgfoin <[email protected]>
nextcloud · Jan 16, 2025 · 8258635 · 8258635
1 parent a2e54d7
commit 8258635
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/lib/Service/GeophotoService.php b/lib/Service/GeophotoService.php
@@ -74,11 +74,16 @@ public function __construct(
 	 * @return bool
 	 */
 	public function clearCache(string $userId = ''): bool {
-		$a = $this->photosCache->clear($userId);
-		$b = $this->timeOrderedPointSetsCache->clear($userId);
-		$c = $this->backgroundJobCache->clear('recentlyAdded:'.$userId);
-		$d = $this->backgroundJobCache->clear('recentlyUpdated:'.$userId);
-		return $a and $b and $c and $d;
+		try {  
+                	$this->photosCache->clear($userId);
+                	$this->timeOrderedPointSetsCache->clear($userId);
+                	$this->backgroundJobCache->clear('recentlyAdded:'.$userId);
+                	$this->backgroundJobCache->clear('recentlyUpdated:'.$userId);
+                	return true;
+
+		} catch (\Exception $e) {
+                	return false;
+    		}
 	}
 
 	/**