mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,646 Commits 194 Branches 287 Tags 562 MiB
afec3ccf6e
Commit Graph

5387 Commits

Author SHA1 Message Date
Christian Kamm
afec3ccf6e Conflicts: Change tags to be more user friendly #6365 
From "_conflict-user-yyyymmdd-hhmmss"
to   " (conflicted copy user yyyy-mm-dd hhmmss)"
 2018-04-03 14:03:03 +02:00
Olivier Goffart
39d909b05a csync_update: add the checksum in the discovery log 
Issue #6414
 2018-03-28 13:42:54 +02:00
Christian Kamm
2641a6af21 Rename local discovery option for clarity 
It's using full relative filepaths, not just dir paths.
 2018-03-28 11:25:32 +02:00
Olivier Goffart
d69936e065 FolderStatusModel: fix potential assert 
OCC::FolderStatusModel::slotUpdateDirectories: ASSERT: "parentInfo->_fetching" in file /home/olivier/kdegit/owncloud/mirall/src/gui/folderstatusmodel.cpp, line 599

This can happen if the structure of a folder is change while the user
expands the root folder. In this case, resetSubs() is called which
resets _fetching to false.
Instead, we need to keep a pointer to the job so we can abort it by
deleting it.
 2018-03-28 10:19:05 +02:00
Christian Kamm
5e75d224ee Blacklisting must prevent parent etag updates #6411 2018-03-28 10:01:33 +02:00
Markus Goetz
31f13c8846 SslButton: Improve speed (especially on macOS) #6031 
From 1+n*450msec to 1*450msec
 2018-03-27 17:43:57 +02:00
Christian Kamm
25deaed9e5 Excludes: Expand doc, Desktop.ini only in root folder 
The Desktop.ini exclude was added for 2.4 because we add such a file to
the synced folder on Windows. It doesn't need to cover subdirectories.
 2018-03-27 12:43:53 +02:00
Christian Kamm
17342031d7 Upload: Simplify 'finished' flag 
* Sometimes there was 'finished' and '_finished'
* Make each done() call automatically set _finished to true
 2018-03-27 12:42:48 +02:00
Olivier Goffart
26b991c0c0 Folder: normalize the local path. 
We otherwise normalize all path in the C form, so we must have
the Folder's path normalized the same. Or all comparizon will fail
(such as knowing if a file from the SocketAPI or the FilesystemWatcher
are part of the folder)

Issue #4424
 2018-03-27 10:54:10 +02:00
Olivier Goffart
3f4d504c34 propagateuploadv1: don't finalize after a done() 
Should fix an assert when "Server does not support X-OC-MTime"
(Which only happens with owncloud 5)

Issue #6403
 2018-03-27 10:50:40 +02:00
Markus Goetz
7739157bfc SslButton: Add HTTP/2 info #3146 2018-03-26 22:49:54 +02:00
Markus Goetz
75a269acb6 About section: Try to lower height #6075 #6215 2018-03-22 15:37:04 +01:00
Dominik Schmidt
d69e9ebf46 Apply branding to crashreporter resources file 2018-03-16 16:59:01 +01:00
Dominik Schmidt
24bf1b3629 Define APPLICATION_ICON_NAME fallback only in one place 2018-03-16 16:59:01 +01:00
Dominik Schmidt
94b0c9f78e Fix crash reporter icon 2018-03-16 16:59:01 +01:00
Christian Kamm
a89508ba26 Minor header fixup 
To make the IDE happy.
 2018-03-16 13:41:57 +01:00
Olivier Goffart
0bf0f92949 OwnSql: Fixup after feedback for #6388 2018-03-15 19:30:21 +01:00
Olivier Goffart
04f8d0f2bc OwnSql: Put the SQL queries next to their use. 
This avoid haivng to modify 4 places when we want to add a query
 2018-03-15 19:30:21 +01:00
Olivier Goffart
4584e5d3c5 OwnSql: Some refactoring 
Use QByteArray for the query so we don't have to convert twice.
Automatically finish the query when the DB close, so we don't
have to call reset
 2018-03-15 19:30:21 +01:00
Olivier Goffart
bbf1843865 SyncEngine: remove the "CSync" wording from the error messages 
They are confusing for the user.
Example in issue #6274
 2018-03-14 10:25:45 +01:00
Olivier Goffart
b6aaa6fd2b CSync: Remove unused error codes 
None of the removed ERRNO code were ever set.
So none of the removed error hapenned anymore
 2018-03-14 10:25:45 +01:00
Olivier Goffart
0031e09410 CSync: reconcile never returns an error 2018-03-14 10:25:45 +01:00
Olivier Goffart
0071011ebf csync: remove CSYNC_PARAM_ERROR 
It does not make sense to report such error to the user.
Its goal was to show invalid use of the csync API, but this is now done
with asserts.
 2018-03-14 10:25:45 +01:00
Olivier Goffart
978a129eed csync: Simplify csync_walk_local_tree/csync_walk_remote_tree 
Small refactoring
 2018-03-14 10:25:45 +01:00
Christian Kamm
86b30e36c2 Merge remote-tracking branch 'origin/2.4' 2018-03-12 10:24:25 +01:00
Christian Kamm
427bb83f0d IssuesWidget: addItem performance improvement 
Ensure adding a new item isn't usually O(n) by keeping track of which
items have associated issues.
 2018-03-06 13:02:54 +01:00
Christian Kamm
faec059a9b IssuesWidget: Don't allow two issues for the same file/folder 
This is intended to safeguard against invalidation bugs that cause the
same error to be added again for every sync run.
 2018-03-06 13:02:54 +01:00
Christian Kamm
641eddfbdf INSTRUCTION_IGNORE now carries a direction 
This allows IssuesWidget to selectively wipe only the 'Up' ignores
during selective local discovery.
 2018-03-06 13:02:54 +01:00
Christian Kamm
61869bb65e ProtocolItem: Adjust the way data is stored again 
The struct makes it easy to pack data and should consume less memory
overall.
 2018-03-06 13:02:54 +01:00
Christian Kamm
797473ba1f SyncResult: Make sure the number of conflicts is correct #6226 
If the SyncResult incorrectly believes that there are no conflicts, the
tray icon won't be correct and there will be no warning about unresolved
conflicts on the account.

Nevertheless, it's pretty awkward that the IssuesWidget is better
informed about pending conflicts than the Folder itself. This kind of
backwards data flow is very confusing.

Unfortunately the only alternative I see is to either keep track of
this information in two places (also in Folder), or create a common
data-holding class that can serve as a model instance for the issues
view as well as provide data directly to the Folder - which would
have been a much larger change.
 2018-03-06 13:02:54 +01:00
Christian Kamm
f82d61ea19 SyncEngine: Make "local discovery?" question available 
Also fix the minor bug that was mentioned and add tests.
 2018-03-06 13:02:54 +01:00
Christian Kamm
ec281654ae Issues tab: Invalidate issues selectively #6226 
Everything is invalidated later: after discovery, not before. In
addition entries that should only be invalidated when new local
discovery is done have that behavior now.
 2018-03-06 13:02:54 +01:00
Christian Kamm
52dfe589ba ProgressInfo: Add information for local vs remote discovery 2018-03-06 13:02:54 +01:00
Christian Kamm
a5aebac6a7 slotFolderDiscovered: Fix 'local' always being false 
It was unused, so no harm done.
 2018-03-06 13:02:54 +01:00
Christian Kamm
13eb64584f Discovery: Error if properties are missing #6317 2018-03-06 13:01:53 +01:00
Olivier Goffart
7397565274 Propagator: remove a bunch of code related to the 'Shared' directory 
This no longer exists since the owncloud server 7.0 which we no longer
allow to connect to
 2018-03-01 14:48:00 +01:00
Olivier Goffart
4a19a8d644 ConnectionValidator: change the minimum server version 
Forbit connection with server older than 7.0. These server did not have
permission.

Also warn for anything older than 9.1. 9.0 is end of life according to
https://github.com/owncloud/core/wiki/Maintenance-and-Release-Schedule
 2018-03-01 14:48:00 +01:00
Olivier Goffart
302c60fe15 ConnectionValidator::Status use Q_ENUM 
So no need to have a manual conversion to QString
This is only used in debug message anyway.
 2018-02-26 16:11:46 +01:00
Olivier Goffart
22c7002d59 Move ClientProxy and ConnecitonValidator to gui 
They are using the ConfigFile and are used to control
when to sync rather than for the sync itself
 2018-02-26 16:11:46 +01:00
Olivier Goffart
9968142976 owncloudcmd: Do not overwrite the http timeout for json jobs 
The AbstractNetworkJob already has a sensible timeout that depends
on an environment variable.
No need to overwrite that with some arbitrary value. (The connection
validator does that because it could cause problems if two connection
validator were to run at the same time. Not a problem here)
 2018-02-26 16:11:46 +01:00
Olivier Goffart
75a6783a79 owncloudcmd: Do not read the proxy settings from the gui's config file 
The proxy settings for the owncloudcmd client can be set via the
--httpproxy command line argument. owncloudcmd should not depends
on the gui's config
 2018-02-26 16:11:46 +01:00
Olivier Goffart
18afe6a395 Folder: remove unused member 2018-02-26 16:11:46 +01:00
Olivier Goffart
f6331951eb cmake: Remove references of now unused WITH_TESTING 
Issue #6318
 2018-02-21 11:28:31 +01:00
Olivier Goffart
7897b386b6 Utility::fsCasePreserving: remove UNIT_TESTING ifdef 
Since the release package will be build with unit test, we don't
want to query the env variable at every call to fsCasePreserving.
So only test the env variable at startup.
And the testutility can still change the value.

(The env variable is still used from t8.pl and maybe smashbox)

Issue #6318
 2018-02-21 11:28:31 +01:00
Christian Kamm
48dd8ed6c2 Partial local discovery: Fix scheduling logic 
A recent patch that touched the condition for deciding whether a
periodic full local discovery is necessary accidentally inverted the
condition.
 2018-02-20 18:07:28 +01:00
Christian Kamm
33306dcc38 Set launch-on-startup when the first account is set up 
The previous code would disable it when the second account was
configured.

See #6347
 2018-02-20 11:20:52 +01:00
Christian Kamm
6fc3bfc265 Conflicts: Add user name to conflict file name #6325 
For the case of uploading conflict files only.
 2018-02-20 10:10:34 +01:00
Christian Kamm
129b814931 SyncEngine: Use separate state for two unicode conversions 
It's unlikely that there were interaction effects but still seems safer
to use different conversion state for the path and rename_path.
 2018-02-20 10:01:47 +01:00
Christian Kamm
6c1a73b67a SyncJournal: Clear etag filter before sync 
Before, we only cleared the _avoidReadFromDbOnNextSyncFilter *after* a
sync which meant that we had to sync twice after selective sync setup.

Now, we clear the filter *before* a sync as well which allows the actual
next sync to write the correct etags to the db again - instead of only
the sync after that one.

Also expand on comments and rename _avoidReadFromDbOnNextSyncFilter to
_etagStorageFilter.
 2018-02-16 11:39:19 +01:00
Christian Kamm
4a47f7e438 Merge remote-tracking branch 'origin/2.4' 2018-02-16 10:17:19 +01:00