Commit graph

22068 commits

Author SHA1 Message Date
Matthieu Gallien
f0908dbbfc handle NEW/NEW conflicts by being real conflicts
NEW/NEW conflicts could sometime be ignored and replaced by update
metadata instructions

we stop doing this and handle them like any other conflicts

that would cause more download from the server

those conflicts would be solved automatically in case this is not a real
conflict but the client was missing the server reply with the updated
metadata

will enable more changes to improve MOVE detection from server side

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2024-10-17 09:45:57 +02:00
Matthieu Gallien
7301ad3356 in automated tests, update modtime when modifying the content of a file
why one would not update the modification time when modifying a remote
file during automated tests

there is no reason to not update the modification time as this is what
is done by the server

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2024-10-17 09:45:57 +02:00
Matthieu Gallien
fe47ca01ce
Merge pull request #7291 from nextcloud/bugfix/improveLocalDiscoveryLogs
better logs to understand when a folder is locally discovered
2024-10-17 08:52:36 +02:00
Matthieu Gallien
8abe8e6f52 better logs tounderstand when a folder is local scanned
should hopefully allows to understand when local file system discovery
is done or omitted

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2024-10-17 08:52:27 +02:00
Matthieu Gallien
647f5b26a2
Merge pull request #7285 from nextcloud/bugfix/catchFilesystemExceptions
test syncing of read-only .lnk windows shorcuts
2024-10-17 08:51:47 +02:00
Matthieu Gallien
8a791713cd test syncing of read-only .lnk windows shorcuts
related to https://github.com/nextcloud/desktop/pull/7282

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2024-10-17 08:51:37 +02:00
Nextcloud bot
88f3ef3944
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-10-17 02:52:33 +00:00
Matthieu Gallien
97539218e6
Merge pull request #7333 from nextcloud/bugfix/signature
Bugfix/signature
2024-10-16 15:22:21 +02:00
Camila Ayres
ddaaf2c344 Fail with error before calling folder metada setup when received empty signature.
Signed-off-by: Camila Ayres <hello@camilasan.com>
2024-10-16 11:51:01 +02:00
Camila Ayres
ef811ff220 Report client status error when signature is empty.
Signed-off-by: Camila Ayres <hello@camilasan.com>
2024-10-16 11:51:01 +02:00
Camila Ayres
0e218bc549 Add test testFolderMetadataWithEmptySignatureDecryptFails.
Signed-off-by: Camila Ayres <hello@camilasan.com>
2024-10-16 11:51:01 +02:00
Camila Ayres
8cce183ba4 Check if signature is empty.
Signed-off-by: Camila Ayres <hello@camilasan.com>
2024-10-16 11:51:01 +02:00
Claudio Cambra
e02cf85201
Merge pull request #7322 from nextcloud/bugfix/vfs-crash-socketcontroller
Fix crash caused due to null accountstate in FileProviderSocketController
2024-10-16 16:09:05 +08:00
Claudio Cambra
14a9382772 Fix crash caused by null accountstate due to bad domain identifier parsed from FPExt
Turns out since we are forced to replace colons with hyphens we need to
replace them back to colons when we receive the domain identifier from
the file provider extension. If we do not then we get a null
accountState pointer in the socket controller and this causes a crash

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-10-16 15:49:59 +08:00
Matthieu Gallien
ace0278bf1
Merge pull request #7319 from nextcloud/bugfix/betterMessageForFilesDeletionDetection
improve wordings of confirmation dialog when many files are deleted
2024-10-16 09:45:11 +02:00
Matthieu Gallien
08abceda73 improve wordings of confirmation dialog when many files are deleted
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2024-10-16 09:11:13 +02:00
Nextcloud bot
e16400f191
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-10-16 02:57:54 +00:00
Matthieu Gallien
88ba1816e4
Merge pull request #7320 from nextcloud/bugfix/text
Make string more readable for translators.
2024-10-15 08:55:55 +02:00
Camila Ayres
eeb1ed8ac3 Make string more readable for translators.
Fix #7309.

Signed-off-by: Camila Ayres <hello@camilasan.com>
2024-10-15 08:55:47 +02:00
Claudio Cambra
e5f4264d7c
Merge pull request #7316 from nextcloud/bugfix/blacklist-string-tr
Fix poor translation strings for blacklisted error reason strings
2024-10-15 10:59:53 +08:00
Claudio Cambra
498da851d0 Fix poor translation strings for blacklisted error reason strings
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-10-15 10:59:44 +08:00
Nextcloud bot
46de639de5
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-10-15 02:45:28 +00:00
Nextcloud bot
3815b8961c
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-10-14 02:44:37 +00:00
Nextcloud bot
1dd6a1076c
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-10-13 02:51:58 +00:00
Nextcloud bot
7517f9882f
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-10-12 02:45:14 +00:00
Claudio Cambra
b68da202e4
Merge pull request #7240 from nextcloud/bugfix/mac-vfs-login-loop 2024-10-11 16:43:27 +08:00
Claudio Cambra
690303f952 Stop fetching user profile details now that is not necessary in file provider extension
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-10-11 16:40:47 +08:00
Claudio Cambra
4d7b3eeacb Handle userId correctly in File Provider Extension client interface
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-10-11 16:40:47 +08:00
Claudio Cambra
6f1322fe47 Properly provide both user-provided username AND backing user ID to File Provider Extension
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-10-11 16:40:47 +08:00
Claudio Cambra
cbf4ea571e Fetch user profile (and user ID) when setting up domain account
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-10-11 16:40:47 +08:00
Claudio Cambra
4d96dbbc7a Wait for task to complete synchronously after setting up domain account rather than wrapping everything in task
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-10-11 16:40:47 +08:00
Claudio Cambra
9f9bcf0045 Retry authentication if connection timed out
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-10-11 16:40:47 +08:00
Claudio Cambra
ad2a2c40d8 Try to authenticate new account details before setting them
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-10-11 16:40:47 +08:00
Claudio Cambra
7b826d5ef2
Merge pull request #7286 from nextcloud/bugfix/cmd-hosturl-parse
Properly check for webdav or dav path in provided host url for cmd.cpp
2024-10-11 14:46:06 +08:00
Claudio Cambra
e79e86fde0 Properly check for webdav or dav path in provided host url for cmd.cpp
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-10-11 14:02:36 +08:00
Claudio Cambra
fc2fb02923 Encourage use of https in error message for cmd.cpp
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-10-11 14:02:36 +08:00
Claudio Cambra
a7c9282bf4 Remove unused <random> import in cmd.cpp
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
2024-10-11 14:02:36 +08:00
Nextcloud bot
495befabe2
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-10-11 02:54:56 +00:00
Matthieu Gallien
4cdda7ee5e
Merge pull request #7066 from nextcloud/ci/addGithubActionMacOsTimeout
try to increase timeout of github actions for macOS
2024-10-10 16:19:30 +02:00
Matthieu Gallien
b14e38c2ac CI fix warning: inkscape was renamed to homebrew/cask/inkscape
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2024-10-10 15:23:16 +02:00
Matthieu Gallien
4ac601e17e no longer use deprecated Craft command line option
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2024-10-10 15:23:16 +02:00
Matthieu Gallien
4062f70af5 try to increase timeout of github actions for macOS
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2024-10-10 15:23:16 +02:00
Matthieu Gallien
ceaa125536
Merge pull request #7290 from nextcloud/bugfix/improveLogsAgainFromUsingThem
Cleaning logs
2024-10-10 15:08:33 +02:00
Matthieu Gallien
6c5c7c27d2 improve log when too many deleted files are detected
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2024-10-10 14:36:51 +02:00
Matthieu Gallien
3835d377ff remove info level output from activity list model: not so usefull
they just are printed when everything is working fine

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2024-10-10 14:36:51 +02:00
Matthieu Gallien
d4f28b2a51 remove not so usefull log output
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2024-10-10 14:36:51 +02:00
Matthieu Gallien
578d52c0f1
Merge pull request #7289 from nextcloud/bugfix/removeQStringArgWarning
remove extra argument from QString::arg: string has only 1 placeholder
2024-10-10 14:35:12 +02:00
Matthieu Gallien
3db8c33a17
remove extra argument from QString::arg: string has only 1 placeholder
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2024-10-10 09:57:07 +02:00
Nextcloud bot
a2c6b68803
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-10-10 02:47:56 +00:00
Camila Ayres
1e284e2000
Merge pull request #7284 from nextcloud/update/readmes
Small READMEs fix/updates
2024-10-08 16:15:05 +02:00