fixup! Support iMIP invitations from Mail

Author: miaulalala

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -2169,38 +2169,6 @@ public function getCalendarObjectByUID($principalUri, $uid) {
 		return null;
 	}
 
-	/**
-	 * Searches through all of a users calendars and calendar objects to find
-	 * an object with a specific UID and will return the object.
-	 * Could theoretically return more than one object as we're searching the whole
-	 * principal (UIDs are only unqiue across calendars, not principals)
-	 * thus the result is sorted by the Last_modified time and only the first result is
-	 * returned.
-	 *
-	 * As this method is (at this moment in time) used to compare it with
-	 * incoming scheduling data, the possibility of duplicates across the principal
-	 * collection is not a problem.
-	 *
-	 * @throws Exception
-	 */
-	public function searchPrincipalByUid(string $principalUri, string $uid): ?array {
-		$query = $this->db->getQueryBuilder();
-		$query->select('c.*', 'co.calendardata', 'co.calendarid', 'co.uid')
-			->from('calendarobjects', 'co')
-			->leftJoin('co', 'calendars', 'c', $query->expr()->eq('co.calendarid', 'c.id'))
-			->where($query->expr()->eq('c.principaluri', $query->createNamedParameter($principalUri)))
-			->andWhere($query->expr()->eq('co.uid', $query->createNamedParameter($uid)))
-			->andWhere($query->expr()->isNull('co.deleted_at'))
-			->orderBy('co.lastmodified');
-		$stmt = $query->executeQuery();
-		$row = $stmt->fetch();
-		$stmt->closeCursor();
-		if ($row) {
-			return $row;
-		}
-		return null;
-	}
-
 	public function getCalendarObjectById(string $principalUri, int $id): ?array {
 		$query = $this->db->getQueryBuilder();
 		$query->select(['co.id', 'co.uri', 'co.lastmodified', 'co.etag', 'co.calendarid', 'co.size', 'co.calendardata', 'co.componenttype', 'co.classification', 'co.deleted_at'])

apps/dav/lib/CalDAV/CalendarProvider.php

@@ -70,7 +70,7 @@ public function getCalendars(string $principalUri, array $calendarUris = []): ar
 			$iCalendars[] = new CalendarImpl(
 				$calendar,
 				$calendarInfo,
-				$this->calDavBackend
+				$this->calDavBackend,
 			);
 		}
 		return $iCalendars;