Commit Graph

5589 Commits

Author SHA1 Message Date
Olivier Goffart
494f094455 Delta-Sync: Fix crash after previous merge from master
The reply can be null with zsync, so move the code that needs the reply after
we test for it
2018-09-14 16:23:58 +02:00
Olivier Goffart
9f56db67ef Delta-Sync: Fix test TestRemoteDiscovery::testRemoteDiscoveryError(MissingPermissions)
The presence of a zsync meta data file should not prevent the client
from detecting missing permissions
2018-09-14 16:13:15 +02:00
Olivier Goffart
305e36a00b Delta-sync: Fix the merge from master 2018-09-14 15:45:11 +02:00
Olivier Goffart
0290564d5c Merge remote-tracking branch 'owncloud/master' into delta-sync
Conflicts:
	.gitmodules
	src/cmd/cmd.cpp
	src/gui/generalsettings.ui
	src/libsync/propagatedownload.cpp
	src/libsync/propagateuploadng.cpp
2018-09-14 15:25:59 +02:00
Olivier Goffart
3a335879fa Merge remote-tracking branch 'owncloud/2.5' into tmp 2018-09-03 11:09:21 +02:00
Christian Kamm
9b7da91f6d Private links: improve legacy fileid derivation #6745 2018-08-31 18:10:01 +02:00
Olivier Goffart
a31eadcadf Discovery: Do full local discovery when changing the ignore files config
Since we are now skipping the full local discovery, we also need to
call the method to force a full local discovery while we were making
full remote discovery, for the same reason.

Same applies when applying a selective sync: Normally there should not
be any file or directory with the same same of a blacklisted folder, but
if there is one, it was ignored and now need to be taken in account.

Also make the F6 shortcut do a full local discovery as well.
2018-08-31 16:41:23 +02:00
Olivier Goffart
7209fd27a0 Virtual files: don't check for new big folders
https://github.com/owncloud/client/issues/6724#issuecomment-417368475
2018-08-31 16:40:27 +02:00
Christian Kamm
0bab7cb068 virtual files: show option only when branding allows it 2018-08-31 16:33:19 +02:00
Olivier Goffart
0696805cef Virtual files: Don't show selective sync
Issue #6724
2018-08-31 16:01:21 +02:00
Olivier Goffart
e448f5ef0f Checksum: Add support for SHA256 and SHA3
In case, some day, the server also supports it
2018-08-31 10:41:32 +02:00
Olivier Goffart
22d38db28b Move the checksum related routine from FileSystem to checksum, where they belong 2018-08-31 10:41:32 +02:00
Olivier Goffart
61452de83d Socket API: add an option to replace existing files with virtual files
Issue #6726
2018-08-30 17:59:02 +02:00
Olivier Goffart
aefeb08e36 Update the minimum supported version
We want to warn if the server version is not supported and did not get
appropriate QA for this client version.

https://github.com/owncloud/enterprise/issues/2687
2018-08-30 17:57:02 +02:00
Markus Goetz
662d218595 CMakeLists.txt: Log the Qt version in compile 2018-08-22 16:39:24 +02:00
Christian Kamm
b4f63ca219 Conflicts: Rename BasePath to InitialBasePath #6709 2018-08-22 09:03:54 +02:00
Olivier Goffart
2793930874 Merge remote-tracking branch 'origin/2.5' 2018-08-21 10:47:11 +02:00
Olivier Goffart
4194025eeb Account Settings: the info text should not be clickable
Adjustment for #6723
2018-08-21 10:36:44 +02:00
Olivier Goffart
6b8af42419 Activity: Handle the fact that the username can contain a '@'
Issue #6728
2018-08-19 21:26:16 +02:00
Olivier Goffart
c85cd8e225 Conflict handling: add the OC-ConflictBasePath header
Issue #6702
2018-08-19 21:22:08 +02:00
Olivier Goffart
dd13e6304a Account Settings: Add a text for folder using vierual files
Issue #6723
2018-08-19 21:18:15 +02:00
Olivier Goffart
d1e15b7802 Virtual Files: Set the mtime of the virtual file to that of the server
Note: When the server mtime is modified, the mtime of the file is not updated

Issue #6727
2018-08-19 21:11:59 +02:00
Olivier Goffart
add417e7af Virtual Files Mime Type: use "vnd." prefix instead of "x-"
As reported in https://github.com/owncloud/client/issues/6717#issuecomment-413703567
2018-08-19 21:10:23 +02:00
Christian Kamm
406192d0ba Windows: Release handle/fd when file open fails #6699 2018-08-17 14:35:49 +02:00
Christian Kamm
0b9049e6ff Virtual files: Renaming to virtual doesn't delete data #6718
Unfortunately to do this, the local update phase must write to the
database, creating a new side-effect and order dependency (local update
must run before remote update).
2018-08-17 14:27:09 +02:00
Olivier Goffart
4a3fce531c SyncEngine: Fix renames making hierarchy inversion
Issue #6694
2018-08-16 10:38:18 +02:00
Christian Kamm
760f0eab89 C++: Don't use auto parameters in lambdas
The mingw compiler isn't happy with them.
2018-08-16 10:26:44 +02:00
Christian Kamm
c8ecbc30ed RemotePermissions: Fix empty vs null
Fixes two bugs that appeared since the introduction of the struct:
- when reading permissions from the journal, null ("") was read as
  empty-not-null
- when reading permissinos from the server, empty ("") was read as null

Addresses #4608
2018-08-16 09:08:17 +02:00
Olivier Goffart
d038ffa1fd FolderStatusModel: Do not abort applying selective sync if one folder has an error
Issue #6675
2018-08-15 09:34:43 +02:00
Olivier Goffart
58f46010b5 SyncEngine: Fix the "direction" of the "all file delted" message when the server is reset
Using the direction of the "first" item is not enough as it might be a directory
which is a UPDATE_META_DATA,  or there can have been a few changes locally as well.

As reported on https://github.com/owncloud/client/issues/6317#issuecomment-412163113
2018-08-15 09:34:19 +02:00
Olivier Goffart
8ba0b83353 Wizard: pre-select the right radio button...
... when the wizardSelectiveSyncDefaultNothing branding option is set

Note: bormally the right option is set when the "choose what to sync"
dialog is closed.  So this was only a problem when the dialog was visible
for the first time, the wrong option would be selected underneath.

Issue #6685
2018-08-14 11:03:28 +02:00
Olivier Goffart
cf6e8269bf Activities: Remove the text that a server does not support activities when the account is removed
Issue #6679
2018-08-14 11:03:02 +02:00
Olivier Goffart
58d6632eaf Data-Fingerprint: Fix backup detection when fingerprint is empty
Add a test to test the data fingerprint feature make me realize it was broken.
The code was relying in the distinction between empty and null QByteArray,
but this was a bad idea as this difference is lost when going through QString.
2018-08-14 10:57:20 +02:00
Markus Goetz
b6aae66334 Merge branch '2.5' 2018-08-13 15:30:37 +02:00
Olivier Goffart
eb7e074795 OAuth: Fix infinite loop when the refresh token is expired
The server reply with a code 400 when the token is invalid,
the client was understanding this error as a network error, and was retying
again with the same token.

Instead, we must rely on what the json is saying, even if the reply is
not a 200 code.

Issue https://github.com/owncloud/enterprise/issues/2777
2018-08-09 13:48:45 +02:00
Markus Goetz
d0bdccc60a Windows: Don't ignore files with FILE_ATTRIBUTE_TEMPORARY
Too many applications incorrectly use this attribute.

For #6696 #6610
2018-08-09 13:37:50 +02:00
Olivier Goffart
45bf2e9023 MSI: Fix crash in the auto updater
'auto' here is a QStringBuilder referencing a temporary

Ammend commit 150d4f5935
(MSI: Always with logfile #6609)

Found in the crash reporter:
https://sentry.io/owncloud/desktop-win-and-mac/issues/623245771/
2018-08-07 09:56:05 +02:00
Dominik Schmidt
3f120ce134 Support higher resolution theme icons 2018-08-03 16:16:05 +02:00
Markus Goetz
97a229cbf1 Settings: Attempt to fix rename issue on old macOS
Found by @hurradieweltgehtunter
2018-07-25 16:54:37 +02:00
Christian Kamm
597d76137b Do not require server replies to contain an mtime
The check was added for #6317 in commit
13eb64584f.

We did see missing mtimes in replies in tests with live servers though.
Possibly those were old incomplete responses cached in the stat cache?
2018-07-25 14:24:35 +02:00
Olivier Goffart
324033f4d1 Merge remote-tracking branch 'owncloud/2.5' 2018-07-25 13:49:49 +02:00
Olivier Goffart
a0675bd0ab Convert p7.pl to a C++ test
This is just a translation of test/scripts/txpl/t7.pl to C++ using the test
framework.
2018-07-25 13:48:58 +02:00
Jürgen Weigert
04bbe2a34b Update ocssharejob.cpp 2018-07-20 16:02:32 +02:00
Markus Goetz
9ea402a67e sqlite: Update bundled version to 3.24.0
For OS X and Windows.
2018-07-19 17:11:47 +02:00
Christian Kamm
1872e9a5f9 Update: Report on readdir() errors #6610 2018-07-19 08:24:24 +02:00
Markus Goetz
ce19eefef1 Merge branch '2.5' 2018-07-18 17:27:36 +02:00
Olivier Goffart
d7e77b7473 FolderMan::checkPathValidityForNewFolder: make sure to work when folder points to deleted folders
Note that we also needed to adjust the server url to contains the user name
in the folder wizard. (As checkPathValidityForNewFolder expect the user name)

Issue #6654
2018-07-17 09:02:37 +02:00
Olivier Goffart
3d850fe24d Log: Remove inaccurate comment about --logdebug
The exact string is actually "sync.*.debug=true\ngui.*.debug=true".
And this is not strictly equivalent to setting the env var, as it
calls QLoggingCategory::setFilterRules.
Over all, that's an implementation details that users do not care about.
2018-07-16 16:33:38 +02:00
Markus Goetz
0f79406e93 Help Text: really wrap the text
Issue #6644
2018-07-16 16:33:38 +02:00
Olivier Goffart
ff09ebd47a Help Text: wrap the text
But add a line of spaces to make sure it is wide enough otherwise the
default messagebox size is way too small.

Issue #6644
2018-07-16 16:33:38 +02:00