beenull/karadav
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update deps: NextCloud desktop client crashes if fileId is not returned

Browse source
This commit is contained in:
bohwaz 2023-06-12 00:03:40 +02:00
parent d456ba6764
commit 8b09483ea7
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/KD2/WebDAV/NextCloud.php
View file

@ -157,15 +157,22 @@ abstract class NextCloud
/**
* Return a unique integer for a file. Return NULL if file IDs are not supported.
* Return a unique integer for a file.
*
* By default, the integer is just a partial has of the file URI.
* As the file ID is required by the NextCloud desktop client.
*
* Make sure this is smaller than largest long value in Java (9,223,372,036,854,775,807)
* or the NextCloud Android client will fail.
*
* @param string $uri File URI
* @param string $login User name
* @return integer|null
* @return integer
* @see https://github.com/nextcloud/android/issues/11718
*/
static public function getFileId(string $uri, string $login): ?int
static public function getFileId(string $uri, string $login): int
{
return null;
return base_convert(substr(md5($login . ':' . $uri), 0, 14), 16, 10);
}
/**
@ -814,10 +821,7 @@ abstract class NextCloud
$mtime = (int) $_SERVER['HTTP_X_OC_MTIME'] ?: null;
header('X-OC-MTime: accepted');
if ($id = self::getFileId($user, $dest)) {
header('OC-FileId: ' . $id);
}
header('OC-FileId: ' . self::getFileId($dest, $user));
$return = $this->assembleChunks($login, $dir, $dest, $mtime);

2
lib/KaraDAV/Storage.php
View file

@ -169,6 +169,7 @@ class Storage extends AbstractStorage
return '';
case NextCloud::PROP_OC_ID:
// fileId is required by NextCloud desktop client
$username = $this->users->current()->login;
return NextCloud::getFileId($uri, $username);
case NextCloud::PROP_OC_PERMISSIONS:
@ -185,7 +186,6 @@ class Storage extends AbstractStorage
return implode('', $permissions);
case 'DAV::quota-available-bytes':
return null;
return -3;
case 'DAV::quota-used-bytes':
return null;
case Nextcloud::PROP_OC_SIZE: