Only perform login check during ownership transfer for encryption

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

diff --git a/apps/files/lib/Service/OwnershipTransferService.php b/apps/files/lib/Service/OwnershipTransferService.php
index 870aa9f9d77c09171fc80c3ec306a223b3bbd7c2..3ab1a0c29d55d43d1c7d4f9884a841315d4b0654 100644 (file)
--- a/apps/files/lib/Service/OwnershipTransferService.php
+++ b/apps/files/lib/Service/OwnershipTransferService.php
@@ -100,12 +100,15 @@ class OwnershipTransferService {
                $destinationUid = $destinationUser->getUID();
                $sourcePath = rtrim($sourceUid . '/files/' . $path, '/');
 
-               // target user has to be ready
-               if ($destinationUser->getLastLogin() === 0 || !$this->encryptionManager->isReadyForUser($destinationUid)) {
+               // If encryption is on we have to ensure the user has logged in before and that all encryption modules are ready
+               if (($this->encryptionManager->isEnabled() && $destinationUser->getLastLogin() === 0)
+                       || !$this->encryptionManager->isReadyForUser($destinationUid)) {
                        throw new TransferOwnershipException("The target user is not ready to accept files. The user has at least to have logged in once.", 2);
                }
 
                // setup filesystem
+               // Requesting the user folder will set it up if the user hasn't logged in before
+               \OC::$server->getUserFolder($destinationUser->getUID());
                Filesystem::initMountPoints($sourceUid);
                Filesystem::initMountPoints($destinationUid);