100 Commits
Author SHA1 Message Date
Kevin OttensandGitHub 0996b13386 Merge pull request #2928 from nextcloud/add_missing_override_specifier
Add missing override specifier
2021-02-13 11:32:46 +01:00
Kevin OttensandGitHub 81831fd69a Merge pull request #2919 from nextcloud/validate_ssl_providers_certificate
Validate the providers ssl certificate
2021-02-12 10:50:41 +01:00
Kevin OttensandGitHub 1c1301e482 Merge pull request #2892 from nextcloud/repair_e2ee_on_non_remote_root_sync_folder
Repair E2EE on sync folders which don't point to the root of the server on the remote end
2021-02-04 13:24:18 +01:00
Kevin Ottensandallexzander (Rebase PR Action) 856f0567a7 Make sure we pass a full remote path to LSCOL jobs
Indeed the path we have is supposedly not fully qualified in case of a
sync folder which doesn't point to / on the remote end. But LSCOL works
with absolute paths on the server so make sure this is what we give it
out.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-02-04 11:16:48 +00:00
Kevin Ottensandallexzander (Rebase PR Action) dd83efb543 The e2eMangledName was relative to the remote folder, repair it
This got broken during the huge discovery refactoring. I wrongly passed
the mangled name as is out of discovery, but coming from listing jobs it
was fully qualified while the jobs at propagation time and the db expect
those paths to be relative to the remote folder.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-02-04 11:16:48 +00:00
Kevin Ottens 55fd0562de Load the theme resource explictly
Otherwise they won't be loaded automatically at startup leading to lots
of missing icons. Since they're now in a static library they need that
explicit loading.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-02-02 18:33:45 +01:00
Kevin OttensandGitHub c19f048774 Merge pull request #2894 from nextcloud/fix-docs
Documentation: break line in config example.
2021-02-02 11:40:11 +01:00
Kevin OttensandGitHub d176b96b43 Merge pull request #2874 from nextcloud/more_active_stalebot
Reduce exempt labels list to give a chance to stale bot to do something
2021-01-27 19:33:18 +01:00
Kevin OttensandKevin Ottens (Rebase PR Action) cc681d094a Reduce exempt labels list to give a chance to stale bot to do something
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-27 18:15:26 +00:00
Kevin OttensandGitHub ab6ba2212a Merge pull request #2877 from nextcloud/revert_2875
Revert "Specify PUBLIC for the link targets to make them visible to w…
2021-01-27 19:14:16 +01:00
Kevin Ottens 1456d6e433 Revert "Specify PUBLIC for the link targets to make them visible to windeployqt"
This reverts commit 002abdc38b.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-27 19:06:23 +01:00
Kevin OttensandGitHub f2ffa74a7b Merge pull request #2875 from nextcloud/make_qtwebsockets_visible_to_windeployqt
Specify PUBLIC for the link targets to make them visible to windeployqt
2021-01-27 18:07:51 +01:00
Kevin Ottens 002abdc38b Specify PUBLIC for the link targets to make them visible to windeployqt
I went full steam on making it all public which is not really required,
it's only really QtWebSockets we're after. Could always be fine tuned
later on if this works as expected.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-27 18:00:26 +01:00
Kevin OttensandGitHub c7d9e11d89 Merge pull request #2867 from nextcloud/fix_file_resolve_dialog
Start file conflict resolve dialog asynchronous
2021-01-27 09:10:32 +01:00
Kevin OttensandGitHub 71f0b45412 Merge pull request #2732 from nextcloud/Valdnet-patch-2
Replace dots with ellipses and add spaces.
2021-01-27 08:59:48 +01:00
Kevin OttensandGitHub 90a7f583b2 Merge pull request #2868 from nextcloud/vfs_cfapi_dont_mistake_unpinned_directory_for_files_to_dehydrate
Don't treat new folders in unpinned folders as files to dehydrate
2021-01-26 18:27:24 +01:00
Kevin OttensandKevin Ottens (Rebase PR Action) ebfe51b7e7 Don't treat new folders in unpinned folders as files to dehydrate
This would only happen if the parent of the newly created folder would
be explicitly set to online only, hence why it went under the radar
previously.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-26 17:09:24 +00:00
Kevin OttensandGitHub d119fc4749 Merge pull request #2733 from nextcloud/Valdnet-patch-3
Move space in "owncloudadvancedsetuppage.cpp"
2021-01-26 18:07:30 +01:00
Kevin OttensandGitHub 56b7ec70f4 Merge pull request #2840 from nextcloud/avoid_keeping_account_alive_from_subobject
Avoid keeping Account alive via a shared ptr in ClientSideEncryption
2021-01-26 14:00:27 +01:00
Kevin OttensandKevin Ottens (Rebase PR Action) d20fc1a6ce Remove unused method
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-26 11:20:13 +00:00
Kevin OttensandKevin Ottens (Rebase PR Action) 4168c0d082 Avoid keeping Account alive via a shared ptr in ClientSideEncryption
This account object was really only used during the initialization phase
or for forgetting the sensitive data. So let's receive it as parameter
there and pass it on from job to job as needed.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-26 11:20:13 +00:00
Kevin OttensandGitHub 737158e9b4 Merge pull request #2865 from nextcloud/vfs_cfapi_dont_get_stuck
VFS CfAPI implementation shouldn't get stuck
2021-01-26 12:19:07 +01:00
Kevin OttensandKevin Ottens (Rebase PR Action) 21035d48a6 Don't crash when the same request is filled twice
The OS might request the same file again if we take too much time to
fulfill a request. So in case it's queueing the same one again instead
of bailing out just fail the second one and let the first one finish
properly.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-26 10:58:14 +00:00
Kevin OttensandKevin Ottens (Rebase PR Action) d3c7218ee8 Be a bit more resilient with errors
In case we'd been to slow to fullfill or we're still processing a
cancelled request better not just crash. We still log the issue though.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-26 10:58:14 +00:00
Kevin OttensandGitHub 76d0fb254b Merge pull request #2734 from nextcloud/Valdnet-patch-4
Move space in "folderwizard.cpp"
2021-01-25 18:51:15 +01:00
Kevin OttensandGitHub 24ee350ef3 Merge pull request #2735 from nextcloud/Valdnet-patch-5
Change the quotation marks
2021-01-25 18:41:31 +01:00
Kevin OttensandGitHub 8c66b9f89e Merge pull request #2814 from nextcloud/files_push_notifications
Add push notifications for file changes
2021-01-25 18:17:39 +01:00
Kevin OttensandGitHub fd604ddc9e Merge pull request #2864 from nextcloud/fixes_for_wizard_advanced_setup
Fixes for wizard advanced setup
2021-01-25 17:45:02 +01:00
Kevin Ottens 4992bfa8ef Ensure the right radio is selected when selective sync is picked
This got broken previously when trying to reconcile during a
cherry-pick. This also repairs the case when the theme tells us the
default is to not select anything (not that we're using this right now
but in case we'd like to brand this).

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-25 16:53:21 +01:00
Kevin Ottens 2b2dac10ef It's not really recommended anymore at least not on Windows
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-25 16:24:44 +01:00
Kevin OttensandGitHub 18f5b841e3 Merge pull request #2859 from nicolasfella/qt5153
Fix build against Qt 5.15.3
2021-01-25 09:35:08 +01:00
Kevin OttensandGitHub 398101ae3d Merge pull request #2860 from nextcloud/rakekniven-patch-2
Removed blank before colon
2021-01-25 09:18:46 +01:00
Kevin OttensandGitHub b43701822f Merge pull request #2845 from nextcloud/default_to_colored_systray_on_linux
Default to colored systray on linux
2021-01-21 08:01:58 +01:00
Kevin OttensandKevin Ottens (Rebase PR Action) 48f0c54a90 Fix the branding detection for monochrome icons on Mac
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-21 06:39:11 +00:00
Kevin OttensandKevin Ottens (Rebase PR Action) 96b2b2a509 Revert "Make monochrome icons the default on Linux and Mac OS."
This reverts commit 016410dbaa.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-21 06:39:11 +00:00
Kevin OttensandGitHub 7f51355dc8 Merge pull request #2844 from nextcloud/handle_svg_branded_clients
Handle SVG branded clients
2021-01-20 16:08:01 +01:00
Kevin Ottens 471bb25e62 Use APPLICATION_ICON_SET for themed icons
We now favor APPLICATION_ICON_SET to isBranded() regarding the decision
to use PNG or SVG for icons.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-20 15:11:57 +01:00
Kevin Ottens 88986749a4 Use the SVG wizard logo when APPLICATION_ICON_SET says so
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-20 15:09:58 +01:00
Kevin Ottens 4b4437787f Add the APPLICATION_ICON_SET option
Also mention the svg possibly used in the wizard

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-20 10:41:16 +01:00
Kevin Ottens 0b135ae644 Reference the wizard_logo.svg file from the resources
Somehow this was missing

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-20 10:10:22 +01:00
Kevin OttensandKevin Ottens (Rebase PR Action) 576a25161b Integrate the version suffix to the MSI filename
This should be enough to reinstate the "-daily" marker in the filename
for daily builds.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-14 19:24:42 +00:00
Kevin OttensandGitHub bc78ee0ca8 Merge pull request #2826 from nextcloud/reference_coding_style_wiki_page
Reference coding style wiki page from CONTRIBIUTING.md
2021-01-14 19:01:36 +01:00
Kevin OttensandGitHub 314f714082 Merge pull request #2824 from nextcloud/e2ee-can-not-move-folder
Fix e2ee folder move issue
2021-01-14 15:12:17 +01:00
Kevin OttensandGitHub c34c0f078b Merge pull request #2793 from nextcloud/xattr_backend_for_vfs
XAttr backend for VFS
2021-01-14 14:30:39 +01:00
Kevin Ottens 1aeb77c967 Add the XAttr backend prototype with its test suite
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-14 12:57:03 +01:00
Kevin Ottens 7c8b7db725 Don't detect file changes during hydration for virtual files
Indeed, that file size will almost always change between the 1 byte
placeholder and the hydrated file. Only when using the CfAPI on Windows
this won't be the case since because it will expose the original size
even for placeholders.

Also worth noting: the suffix backend didn't hit that case since the
filename changes (with suffix for placeholders, without for hydrated
files).

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-14 12:57:03 +01:00
Kevin Ottens 6e51dcf9c6 Provide the path to the current folder to statTypeVirtualFile on unix
Otherwise backends can't get to the actual file which will be needed for
the XAttr backend.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-14 12:57:03 +01:00
Kevin Ottens a89b483773 Add the plumbing for a new extended attributes backend
Ideally this will end up being the backend we use for both Linux and
macOS but that will require work with desktop environments on the Linux
side and to reverse engineering at least on xattr value on macOS.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-14 12:57:02 +01:00
Kevin OttensandGitHub 4a1c650a56 Merge pull request #2821 from nextcloud/e2ee-fix-parallel-uploads-issue
E2EE fix upload parallelism issue.
2021-01-14 11:41:52 +01:00
Kevin Ottens 5325e058d8 Repair chunked uploads
There's been a confusion between the chunk number and the chunk
offset leading to corruptions... Let's pass the proper offset to
the UploadDevice again.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-13 18:00:19 +01:00
Kevin OttensandGitHub 8d5d45ea5c Merge pull request #2801 from nextcloud/fix_cfapi_win32_build
Fix CfAPI Win32 build
2021-01-07 15:33:45 +01:00
Kevin Ottens 2d8eb19ee5 Second attempt at fixing CfAPI wrapper build in Win32 mode
MSVC having so useless error messages it didn't quite point to the root
cause of the issue... it turns out that through the maze of macros
defined in the windows API, there's one which impacted the function
pointer definition of CfCloseHandle which would then not convert to
FileHandle::Deleter as expected. So I end up wrapping it in a lambda to
help... luckily this kind of lambdas decay into a simple function
pointer so there's likely no overhead it's just to coerce the compiler
into doing the right thing.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-07 13:49:10 +01:00
Kevin Ottens 79a54d68ed Revert "Fix CfAPI wrapper build in Win32 mode"
This reverts commit 3b3864296a.
2021-01-07 13:40:01 +01:00
Kevin Ottens 3b3864296a Fix CfAPI wrapper build in Win32 mode
For some reason MSVC manages to deduce the right constructor in Win64
mode but not in Win32 mode. So let's be more explicit about what we
return.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-06 17:07:50 +01:00
Kevin OttensandGitHub 0bb6dcebd8 Merge pull request #2794 from FlexW/master
Remove NO_SHIBBOLETH flag and dead code
2021-01-05 14:17:25 +01:00
Kevin OttensandGitHub fbd9f5126c Merge pull request #2781 from nextcloud/cherry_pick_2020_w53
Cherry pick 2020 w53
2020-12-30 19:00:19 +01:00
Kevin Ottens da3ff631ef Use Q_REQUIRED_RESULT directly like in other places
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-30 16:20:42 +01:00
Kevin OttensandGitHub c501eed365 Merge pull request #2778 from nextcloud/windows_cfapi_backend_for_vfs
Windows cfapi backend for vfs
2020-12-30 16:16:57 +01:00
Kevin Ottens 46a5bd6b25 Ensure we properly cancel hydration on server errors
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-30 09:44:59 +01:00
Kevin Ottens e37a5f36b0 Don't look at virtual files data for the mimetype matches
Otherwise this would attempt to download the file everytime we check the
direct editor for a given file which wouldn't be adequate. Would also
lead to a deadlock in our case since that would happen in the main
thread and implicit hydration is driven from there as well.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-30 09:44:58 +01:00
Kevin Ottens 90fbb7d322 Implement callback between wrapper and vfs object for hydration requests
This comes with a test simulating an open request coming from another
process (although in our case it's really just a thread). The actual
hydration works as expected by cfapi, handling of encrypted files is for
now missing.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-30 09:44:58 +01:00
Kevin Ottens 5d013accea Improve test readability with a bunch of macros
Since we often checked the same file states to see if they were virtual,
non virtual or gone, let's factor this out. This way intent in tests is
clearer.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-30 09:44:58 +01:00
Kevin Ottens 691ab9a40a Port the tests to the CfApiWrapper
This reduces code duplication and opportunities of mistakes between the
test and the implementation.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-30 09:44:58 +01:00
Kevin Ottens 7668c521c1 Split the CfAPI lower level code in a wrapper
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-30 09:44:58 +01:00
Kevin Ottens 423780bf79 Add initial version of the CfApi backend
For now this implements only the logic necessary to get a test suite
equivalent to the TestSyncVirtualFiles one to pass. It doesn't (yet)
honor request to fetch files from the system.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-30 09:44:58 +01:00
Kevin Ottens 216b251b40 One byte placeholders assumption only holds for the suffix backend
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-30 09:44:57 +01:00
Kevin Ottens 4d4b87c9c3 Don't consider CfApi backend as experimental
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-30 09:44:53 +01:00
Kevin OttensandGitHub 23efdd2ead Merge pull request #2748 from nextcloud/rakekniven-patch-1
Removed translation for "etag" and changed spelling
2020-12-28 10:01:18 +01:00
Kevin OttensandGitHub 1c46101dff Merge pull request #2739 from hrittich/master
Fixed the autostart for AppImages. See #2504.
2020-12-21 12:07:44 +01:00
Kevin OttensandGitHub f7ec914380 Merge pull request #2749 from nextcloud/rakekniven-patch-2
Changed triple dot to ellipsis
2020-12-21 09:12:42 +01:00
Kevin OttensandGitHub 92a968860d Merge pull request #2726 from nextcloud/settings-ui
UI improvements: Settings dialog
2020-12-17 11:00:48 +01:00
Kevin OttensandGitHub 0d084ee343 Merge pull request #2725 from nextcloud/default-mono-icons
Make monochrome icons the default on Linux and Mac OS.
2020-12-16 19:03:56 +01:00
Kevin OttensandGitHub 1d5c203044 Merge pull request #2700 from nextcloud/major_engine_update
Major engine update
2020-12-15 12:32:17 +01:00
Kevin Ottens a938e7d05f Adjust the appimage script to the buildsystem changes
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 11:01:53 +01:00
Kevin Ottens af57a702ef Workaround bug in older GCC used for the AppImage toolchain
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 11:01:53 +01:00
Kevin Ottens 0756497c3e Get the excluded files test to pass again on Windows
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 11:01:53 +01:00
Kevin Ottens c57eff6fd8 Please the clang-tidy overlord
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 11:01:53 +01:00
Kevin Ottens 201dbd54db Remove the plugin loader mechanism for VFS backends
We will have all the code in public anyway so it can just be compiled
in. Thus no need to go through the plugin loading dance. Replaced the
loading with factory functions. Kept mostly the same structure
otherwise.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:59:24 +01:00
Kevin Ottens 7e5f81ea81 Allow to control availability of folders in the settings dialog
It felt odd to be able to control the encryption status in the settings
dialog but not the availability. Also availability was controllable on
the root, so let's make it widely available.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:59:24 +01:00
Kevin Ottens 70c2dc70a1 Resurrect the display of subfolders for VFS sync folders
This got removed from the settings since in that case selective sync
isn't supported. Unfortunately that's also necessary to display them to
allow encrypting folders via the context menu.

So we display the subfolders again but in the case of VFS we disable the
ability to (un)check them. They just have an icon, a name and a context
menu.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:59:24 +01:00
Kevin Ottens 9f0e0b0f6a Update the FolderStatusModel when a folder encryption ends
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:59:24 +01:00
Kevin Ottens 596bfab6e1 Set the account state after E2EE is setup in the GUI
Otherwise we would not display the E2EE message if the account was
connected before the creation of the settings dialog. This was likely
caused by the delayed creation of the settings dialog.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:59:24 +01:00
Kevin Ottens f45e84f2ee Remove empty action in the settings toolbar
This was causing an unwanted line in the middle of the bar.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:59:24 +01:00
Kevin Ottens d63097475c Fix typo and style
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:59:23 +01:00
Kevin Ottens 1acb2679dd Get rid of now unused GetFolderEncryptStatusJob
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:59:23 +01:00
Kevin Ottens 36b8e7c2a4 Remove the encryption flag check from encrypted propagation code
If we use those encrypted propagation code paths, we already know from
the discovery phase (and thus the journal db) that the folders are
encrypted so no need to check again.

This will remove another expensive round trip with the server.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:59:23 +01:00
Kevin Ottens b2533e6451 Remove encrypt status job fetching from ClientSideEncryption
This is now unused.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:59:23 +01:00
Kevin Ottens d22046d679 No need to fetch encryption data separately before discovery
This step isn't necessary anymore, no one looks at ClientSideEncryption
for that information anyway.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:59:23 +01:00
Kevin Ottens 580b36fe20 Remove unused methods on ClientSideEncryption
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:59:23 +01:00
Kevin Ottens ce5edfdf4d Stop using e2e()->isFolderEncrypted() in the folder wizard
We used the same approach than for the FolderStatusModel by getting the
is-encrypted property straight from the LSCOL job.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:59:23 +01:00
Kevin Ottens 4fde05b8b6 FolderStatusModel now uses the LSCOL job result for encryption status
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:59:22 +01:00
Kevin Ottens 8e5a8d9fb9 FolderStatusModel LSCOL job now gets the is-encrypted property
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:59:22 +01:00
Kevin Ottens 7a4a359704 Stop using e2e()->isFolderEncrypted() in the jobs
Thanks to the new discovery algorithm, we got all the freshest E2EE
information straight from the database so reuse it instead of going
through an in memory copy.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:59:22 +01:00
Kevin Ottens 37a51872e1 Set the encrypted flag in the database when EncryptFolderJob succeeds
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:59:22 +01:00
Kevin Ottens b667bdda14 Change EncryptFolderJob path convention
It had a different path convention than all the other jobs, most likely
for legacy reasons because of the tight coupling it had to the settings
dialog.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:59:22 +01:00
Kevin Ottens ee8e0fa332 Have the folder token inside the EncryptFolderJob
No need to look for a token on the outside we can just work properly by
keeping all the state encapsulated in the job.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:59:22 +01:00
Kevin Ottens af00ef1cca Don't use getFileRecordByE2eMangledName in jobs anymore
Thanks to the new discovery algorithm we got both mangled and original
file names in the item so no need to go through the database for
nothing.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:59:21 +01:00
Kevin Ottens 66f24241d8 Repair E2EE deletions
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:59:21 +01:00
Kevin Ottens 567f678fd5 Make sure the encrypted flag gets all the way to the journal db
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:59:21 +01:00
Kevin Ottens 961794669e Repair E2EE uploads
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:59:21 +01:00