Skip to content

Encryption trash fixes #3425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
icewind1991 merged 9 commits into from
Dec 6, 2024
Merged

Encryption trash fixes #3425

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
042e274
fix: fix missing dot in unique name when restoring from trash
icewind1991 Nov 13, 2024
2989996
fix: remove manual un-jailing when moving to trash as the storage now…
icewind1991 Nov 13, 2024
2270976
fix: use "full" target folder from user when restoring trash items
icewind1991 Nov 13, 2024
0928494
fix: make root cache entry optional for groupfolder storage
icewind1991 Nov 18, 2024
617eb29
fix: create a separate mount for trashbin to make encryption work
icewind1991 Nov 18, 2024
cca334a
fix: fix moving files to trash
icewind1991 Nov 18, 2024
6b15dd4
fix: add fallback behavior for pre-fix trashbin restore
icewind1991 Nov 27, 2024
98c45aa
chore: formatting
icewind1991 Nov 28, 2024
630caec
chore: psalm fixes
icewind1991 Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: make root cache entry optional for groupfolder storage 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991
icewind1991 committed Dec 6, 2024
commit 09284947ecb74ff5a850825eeff5594e9a5dd7a1
8 changes: 6 additions & 2 deletions lib/Mount/GroupFolderStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

class GroupFolderStorage extends Quota implements IConstructableStorage {
private int $folderId;
private ICacheEntry $rootEntry;
private ?ICacheEntry $rootEntry;
private IUserSession $userSession;
private ?IUser $mountOwner;
/** @var RootEntryCache|null */
Expand Down Expand Up @@ -59,7 +59,11 @@ public function getCache(string $path = '', ?IStorage $storage = null): ICache {
$storage = $this;
}

$this->cache = new RootEntryCache(parent::getCache($path, $storage), $this->rootEntry);
$cache = parent::getCache($path, $storage);
if ($this->rootEntry !== null) {
$cache = new RootEntryCache($cache, $this->rootEntry);
}
$this->cache = $cache;

return $this->cache;
}
Expand Down