Skip to content

Commit cad548a

Browse files
committed
Merge #296 [V32] Fix android e2ee slowness and upload speed
2 parents a9094e8 + 238aa35 commit cad548a

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

lib/private/Files/Cache/Updater.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,12 @@ public function update($path, $time = null, ?int $sizeDifference = null) {
119119
if (isset($data['encrypted']) && (bool)$data['encrypted']) {
120120
$sizeDifference = null;
121121
}
122+
123+
// skip E2E encryption metadata files to avoid interfering with internal encryption handling
124+
$appDataPath = 'appdata_' . \OC_Util::getInstanceId() . '/end_to_end_encryption/meta-data';
125+
if (str_starts_with($path, $appDataPath)) {
126+
return;
127+
}
122128

123129
// scanner didn't provide size info, fallback to full size calculation
124130
if ($this->cache instanceof Cache && $sizeDifference === null) {
@@ -147,6 +153,12 @@ public function remove($path) {
147153

148154
$this->cache->remove($path);
149155

156+
// skip E2E encryption metadata files to avoid interfering with internal encryption handling
157+
$appDataPath = 'appdata_' . \OC_Util::getInstanceId() . '/end_to_end_encryption/meta-data';
158+
if (str_starts_with($path, $appDataPath)) {
159+
return;
160+
}
161+
150162
$this->correctParentStorageMtime($path);
151163
if ($entry instanceof ICacheEntry) {
152164
$this->propagator->propagateChange($path, time(), -$entry->getSize());

0 commit comments

Comments
 (0)