Merge pull request #1327 from nextcloud/backport/1320/stable4.10

[stable4.10] fix/shared notes

Author: juliusknorr

lib/AppInfo/BeforeShareCreatedListener.php

@@ -49,8 +49,7 @@ public function overwriteShareTarget(IShare $share): void {
 			$receiver = $share->getSharedWith();
 			$receiverPath = $this->noteUtil->getRoot()->getUserFolder($receiver)->getPath();
 			$receiverNotesInternalPath = $this->settings->get($receiver, 'notesPath');
-			$receiverNotesPath = $receiverPath . '/' . $receiverNotesInternalPath;
-			$this->noteUtil->getOrCreateFolder($receiverNotesPath);
+			$this->noteUtil->getOrCreateNotesFolder($receiver);
 
 			if ($itemType !== 'file' || strpos($fileSourcePath, $ownerNotesPath) !== 0) {
 				return;

lib/Service/NoteUtil.php

@@ -21,21 +21,24 @@ class NoteUtil {
 	private TagService $tagService;
 	private IManager $shareManager;
 	private IUserSession $userSession;
+	private SettingsService $settingsService;
 
 	public function __construct(
 		Util $util,
 		IRootFolder $root,
 		IDBConnection $db,
 		TagService $tagService,
 		IManager $shareManager,
-		IUserSession $userSession
+		IUserSession $userSession,
+		SettingsService $settingsService
 	) {
 		$this->util = $util;
 		$this->root = $root;
 		$this->db = $db;
 		$this->tagService = $tagService;
 		$this->shareManager = $shareManager;
 		$this->userSession = $userSession;
+		$this->settingsService = $settingsService;
 	}
 
 	public function getRoot() : IRootFolder {
@@ -172,9 +175,36 @@ public function getOrCreateFolder(string $path, bool $create = true) : Folder {
 			throw new NotesFolderException($path.' is not a folder');
 		}
 
-		if ($folder->isShared()) {
-			$folderName = $this->root->getNonExistingName($path);
-			$folder = $this->root->newFolder($folderName);
+		return $folder;
+	}
+
+	public function getOrCreateNotesFolder(string $userId, bool $create = true) : Folder {
+		$userFolder = $this->getRoot()->getUserFolder($userId);
+		$notesPath = $this->settingsService->get($userId, 'notesPath');
+		$allowShared = $notesPath !== $this->settingsService->getDefaultNotesPath($userId);
+
+		$folder = null;
+		$updateNotesPath = false;
+		if ($userFolder->nodeExists($notesPath)) {
+			$folder = $userFolder->get($notesPath);
+			if (!$allowShared && $folder->isShared()) {
+				$notesPath = $userFolder->getNonExistingName($notesPath);
+				$folder = $userFolder->newFolder($notesPath);
+				$updateNotesPath = true;
+			}
+		} elseif ($create) {
+			$folder = $userFolder->newFolder($notesPath);
+			$updateNotesPath = true;
+		}
+
+		if (!($folder instanceof Folder)) {
+			throw new NotesFolderException($notesPath . ' is not a folder');
+		}
+
+		if ($updateNotesPath) {
+			$this->settingsService->set($userId, [
+				'notesPath' => $notesPath,
+			], true);
 		}
 
 		return $folder;

lib/Service/NotesService.php

@@ -149,20 +149,8 @@ public function getTitleFromContent(string $content) : string {
 		return $this->noteUtil->getSafeTitle($content);
 	}
 
-
-
-
-
-
-	/**
-	 * @param string $userId the user id
-	 * @return Folder
-	 */
 	private function getNotesFolder(string $userId, bool $create = true) : Folder {
-		$userPath = $this->noteUtil->getRoot()->getUserFolder($userId)->getPath();
-		$path = $userPath . '/' . $this->settings->get($userId, 'notesPath');
-		$folder = $this->noteUtil->getOrCreateFolder($path, $create);
-		return $folder;
+		return $this->noteUtil->getOrCreateNotesFolder($userId, $create);
 	}
 
 	/**

lib/Service/SettingsService.php

@@ -81,7 +81,7 @@ private function getListAttrs(string $attributeName, array $values) : array {
 		];
 	}
 
-	private function getDefaultNotesPath(string $uid) : string {
+	public function getDefaultNotesPath(string $uid) : string {
 		$defaultFolder = $this->config->getAppValue(Application::APP_ID, 'defaultFolder', 'Notes');
 		$defaultExists = $this->root->getUserFolder($uid)->nodeExists($defaultFolder);
 		if ($defaultExists) {
@@ -94,7 +94,7 @@ private function getDefaultNotesPath(string $uid) : string {
 	/**
 	 * @throws \OCP\PreConditionNotMetException
 	 */
-	public function set(string $uid, array $settings) : void {
+	public function set(string $uid, array $settings, bool $writeDefaults = false) : void {
 		// load existing values for missing attributes
 		$oldSettings = $this->getSettingsFromDB($uid);
 		foreach ($oldSettings as $name => $value) {
@@ -107,10 +107,11 @@ public function set(string $uid, array $settings) : void {
 			if ($value !== null && array_key_exists($name, $this->attrs)) {
 				$settings[$name] = $value = $this->attrs[$name]['validate']($value);
 			}
-			if (!array_key_exists($name, $this->attrs)
+			$default = is_callable($this->attrs[$name]['default']) ? $this->attrs[$name]['default']($uid) : $this->attrs[$name]['default'];
+			if (!$writeDefaults && (!array_key_exists($name, $this->attrs)
 				|| $value === null
-				|| $value === $this->attrs[$name]['default']
-			) {
+				|| $value === $default
+			)) {
 				unset($settings[$name]);
 			}
 		}