fixup! fixup! feat(files_sharing): fetch remote avatars for external shares

Author: leftybournes

lib/private/Avatar/RemoteAvatar.php

@@ -11,6 +11,7 @@
 
 use OCP\Federation\ICloudId;
 use OCP\Federation\ICloudIdManager;
+use OCP\Files\NotFoundException;
 use OCP\Files\SimpleFS\ISimpleFile;
 use OCP\Files\SimpleFS\ISimpleFolder;
 use OCP\Http\Client\IClientService;
@@ -69,11 +70,22 @@ public function getFile(int $size, bool $darkTheme = false): ISimpleFile {
 
 		// check first if a png avatar exists
 		$ext = 'png';
-		$avatarExists = $this->folder->fileExists($filename . '.' . $ext);
+		try {
+			$file = $this->folder->getFile($filename . '.' . $ext);
+			$avatarExists = true;
+		} catch (NotFoundException $e) {
+			$this->logger->debug('Unable to find avatar with .png extension. Trying .jpg');
+		}
+
 		// if the png avatar doesn't exist, check if there's a jpg
 		if (!$avatarExists) {
 			$ext = 'jpg';
-			$avatarExists = $this->folder->fileExists($filename . '.' . $ext);
+			try {
+				$file = $this->folder->getFile($filename . '.' . $ext);
+				$avatarExists = true;
+			} catch (NotFoundException $e) {
+				$this->logger->debug('No avatar found');
+			}
 		}
 
 		if ($avatarExists) {