Merge pull request #53998 from nextcloud/backport/53979/stable30

[stable30] fix(files_sharing): ensure share folder exists in the settings

Author: susnux

apps/files_sharing/lib/Settings/Personal.php

@@ -9,6 +9,7 @@
 namespace OCA\Files_Sharing\Settings;
 
 use OCA\Files_Sharing\AppInfo\Application;
+use OCA\Files_Sharing\Helper;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Services\IInitialState;
 use OCP\IConfig;
@@ -31,16 +32,18 @@ public function __construct(IConfig $config, IInitialState $initialState, string
 
 	public function getForm(): TemplateResponse {
 		$defaultAcceptSystemConfig = $this->config->getSystemValueBool('sharing.enable_share_accept', false) ? 'no' : 'yes';
-		$shareFolderSystemConfig = $this->config->getSystemValue('share_folder', '/');
+		$defaultShareFolder = $this->config->getSystemValue('share_folder', '/');
+		$userShareFolder = Helper::getShareFolder(userId: $this->userId);
 		$acceptDefault = $this->config->getUserValue($this->userId, Application::APP_ID, 'default_accept', $defaultAcceptSystemConfig) === 'yes';
 		$enforceAccept = $this->config->getSystemValueBool('sharing.force_share_accept', false);
 		$allowCustomDirectory = $this->config->getSystemValueBool('sharing.allow_custom_share_folder', true);
-		$shareFolderDefault = $this->config->getUserValue($this->userId, Application::APP_ID, 'share_folder', $shareFolderSystemConfig);
+
 		$this->initialState->provideInitialState('accept_default', $acceptDefault);
 		$this->initialState->provideInitialState('enforce_accept', $enforceAccept);
 		$this->initialState->provideInitialState('allow_custom_share_folder', $allowCustomDirectory);
-		$this->initialState->provideInitialState('share_folder', $shareFolderDefault);
-		$this->initialState->provideInitialState('default_share_folder', $shareFolderSystemConfig);
+		$this->initialState->provideInitialState('default_share_folder', $defaultShareFolder);
+		$this->initialState->provideInitialState('share_folder', $userShareFolder);
+
 		return new TemplateResponse('files_sharing', 'Settings/personal');
 	}