Merge pull request #342 from nextcloud/calendar_displayname

Fix calendar display name

Author: lukasdotcom

lib/Service/GoogleCalendarAPIService.php

@@ -24,6 +24,7 @@
 use Ortic\ColorConverter\Colors\Named;
 use Psr\Log\LoggerInterface;
 use Sabre\DAV\Exception\BadRequest;
+use Sabre\DAV\PropPatch;
 use Sabre\VObject\Component\VCalendar;
 use Sabre\VObject\Component\VEvent;
 use Sabre\VObject\Reader;
@@ -320,6 +321,9 @@ public function importCalendar(string $userId, string $calId, string $calName, ?
 		$calendarIsNew = is_null($ncCalId);
 		if (is_null($ncCalId)) {
 			$ncCalId = $this->caldavBackend->createCalendar('principals/users/' . $userId, $newCalUri, $params);
+			// Ensures the right name is given to the calendar
+			$proppatch = new PropPatch(['{DAV:}displayname' => $newCalName]);
+			$this->caldavBackend->updateCalendar($ncCalId, $proppatch);
 		}
 
 		// get color list

psalm-baseline.xml

@@ -89,12 +89,14 @@
       <code><![CDATA[$this->caldavBackend]]></code>
       <code><![CDATA[$this->caldavBackend]]></code>
       <code><![CDATA[$this->caldavBackend]]></code>
+      <code><![CDATA[$this->caldavBackend]]></code>
       <code><![CDATA[private]]></code>
     </MissingDependency>
     <UndefinedClass>
       <code><![CDATA[$ex]]></code>
       <code><![CDATA[$ex]]></code>
       <code><![CDATA[BadRequest]]></code>
+      <code><![CDATA[PropPatch]]></code>
       <code><![CDATA[Reader]]></code>
     </UndefinedClass>
     <UndefinedDocblockClass>