perf: switch places that always use the first getById result to getFirstNodeById

Signed-off-by: Robin Appelman <robin@icewind.nl>

2 files changed, 4 insertions, 7 deletions

diff --git a/apps/files/lib/Activity/Helper.php b/apps/files/lib/Activity/Helper.php
index 7bbaf44ab4c..9ad790f5154 100644
--- a/apps/files/lib/Activity/Helper.php
+++ b/apps/files/lib/Activity/Helper.php
@@ -61,9 +61,8 @@ class Helper {
 		$userFolder = $this->rootFolder->getUserFolder($user);
 		$favoriteNodes = [];
 		foreach ($favorites as $favorite) {
-			$nodes = $userFolder->getById($favorite);
-			if (!empty($nodes)) {
-				$node = array_shift($nodes);
+			$node = $userFolder->getFirstNodeById($favorite);
+			if ($node) {
 				if (!$foldersOnly || $node instanceof Folder) {
 					$favoriteNodes[] = $node;
 				}
diff --git a/apps/files/lib/Activity/Provider.php b/apps/files/lib/Activity/Provider.php
index fb81e200688..50535cab5c6 100644
--- a/apps/files/lib/Activity/Provider.php
+++ b/apps/files/lib/Activity/Provider.php
@@ -433,8 +433,8 @@ class Provider implements IProvider {
 		}
 
 		$userFolder = $this->rootFolder->getUserFolder($this->activityManager->getCurrentUserId());
-		$files = $userFolder->getById($fileId);
-		if (empty($files)) {
+		$file = $userFolder->getFirstNodeById($fileId);
+		if (!$file) {
 			try {
 				// Deleted, try with parent
 				$file = $this->findExistingParent($userFolder, dirname($path));
@@ -450,8 +450,6 @@ class Provider implements IProvider {
 			return $file;
 		}
 
-		$file = array_shift($files);
-
 		if ($file instanceof Folder && $file->isEncrypted()) {
 			// If the folder is encrypted, it is the Container,
 			// but can be the name is just fine.