chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-10-05 02:53:40 +02:00
Code Activity
13,590 Commits 4 Branches 173 Tags
2.6.2-buildtest1
Commit Graph
6388 Commits
Author SHA1 Message Date
Olivier Goffart bae00358b9 Merge pull request #6219 from owncloud/config 
Move config and remove most dependencies form the sync engine.
 2017-12-11 17:10:18 +01:00
Olivier Goffart d517d92f6c FolderWizard: don't use deprecated API 2017-12-08 16:16:06 +01:00
Olivier Goffart 71dcf7fc37 SSLButton: Removes some call to deprecated functions 2017-12-08 16:16:02 +01:00
Olivier Goffart 0a59faf03d OcsJob: Use QUrlQuery 
Qurl::setEncodedQueryItems is deprecated.
 2017-12-08 16:15:48 +01:00
Olivier Goffart 7bd48b1327 cmd: remove usage of deprecated qInstallMsgHandler 2017-12-08 16:15:48 +01:00
Olivier Goffart 8c652e061d Remove uses of deprecated QString::fromAscii 2017-12-08 16:15:48 +01:00
Olivier Goffart a4816d6a8c Updater: use QUrlQuery 
QUrl::addQueryItem is deprecated
 2017-12-08 16:15:47 +01:00
Olivier Goffart 1a503d54f6 Remove usage of deprecated qSort 2017-12-08 16:15:47 +01:00
Olivier Goffart 263668b1cb Remove use of deprecated translate call 2017-12-08 16:15:38 +01:00
Olivier Goffart 3df65460f5 Remove usage of QString::null 
Replaces by "QString()"
 2017-12-08 16:15:22 +01:00
Olivier Goffart 74672d493d Utility: use QUrlQuery 
For QUrl::setQuery is deprecated in Qt5
 2017-12-08 16:15:17 +01:00
Tomaz Canabrava 0a83d3e743 [CSE] Fix reading the public key for the metadata 
This broke when we started to use QSslKey and the Qt Keychain
framework.
 2017-12-08 11:24:22 +01:00
Tomaz Canabrava a08a32ceca [CSE] Fetch the metadata for the upload. 2017-12-08 10:32:05 +01:00
Tomaz Canabrava 6745777ca3 [CSE] Save folder id and token for the lock 
So we can unlock it later. - perhaps we should store this
on the disk or something, to make it harder to lose.
 2017-12-08 10:19:56 +01:00
Olivier Goffart f1b7d506ae csync_exclude: fix compilation of non-test builds 2017-12-08 09:43:26 +01:00
Tomaz Canabrava 70d562668c [CSE] Add handling for side-by-side uploads. 2017-12-07 21:51:42 +01:00
Tomaz Canabrava ccd8cff4db [CSE] Try to lock repeteadly the folder if needed. 
The upload is made in an event loop with more than one
upload at the same time, this confuses the hell out of the
folder locking mechanism.

We need to lock the folder and ask the other trials to try
again in a few seconds in the future to give time for the
uploader to actually upload the current file that's locking
the folder.
 2017-12-07 21:31:20 +01:00
Tomaz Canabrava 9f678652f8 [CSE] Lock the folder to upload a file. 2017-12-07 20:52:54 +01:00
Tomaz Canabrava 76916b6c48 [CSE] Request the Folder ID. 2017-12-07 19:39:30 +01:00
Tomaz Canabrava 4878e824e5 [CSE] Fix reading encrypted status of folders. 2017-12-07 19:04:12 +01:00
Tomaz Canabrava 893ca66af8 [CSE] Fix indentation 
Parts of the code are indented by spaces, other parts by tabs.
This needs to run in the whole codebase.
 2017-12-07 18:12:25 +01:00
Tomaz Canabrava 19120fde9f [CSE] Don't query for files on GetFolderEncryptStatusJob 
The request for folders whas also replying for files.
 2017-12-07 18:10:14 +01:00
Tomaz Canabrava 7fe4dd2163 [CSE] Renane GetFolderEncryptStatus to GetFolderEncryptStatusJob 
it's a network job after all
 2017-12-07 18:06:55 +01:00
Olivier Goffart 4581d708ff Account: remove dependency with ConfigFile 
Part of #6213
 2017-12-07 17:39:16 +01:00
Olivier Goffart e0a14cac5b ConfigFile: use QStandardPaths::AppConfigLocation for the config file 
Also use appName instead of appNameGui in order to compute the path

Issue: #2245

The reason is to respect the XDG spec on Unix (#1601) and might help
on windows roaming profiles (#684)
 2017-12-07 17:39:16 +01:00
Olivier Goffart ac844a2a45 AbstractNetworkJob: move the httpTimeout from the propagator to the network job 
Remove one dependency from the config file for the sync engine.
Part of issue #6213
 2017-12-07 17:39:16 +01:00
Olivier Goffart 7230fa6b4f SyncOptions: move to its own file 
It does not really belong in the discoveryphase.h as it is used also for
propagator option.

Also use C++11 style member initializer
 2017-12-07 17:35:38 +01:00
Olivier Goffart e25af4f0dc csync_exclude: Fix compile 
csync_exclude.cpp:428:17: error: assigning to 'char *' from incompatible type 'const char *'
        bname = path;
                ^~~~

The C library's strrchr always return 'char*'
Only the C++'s std::strrchr has two overloads
 2017-12-07 17:34:14 +01:00
Tomaz Canabrava 863e86138f [CSE] Pass the folder to the GetEncryptionStatus 
Sometimes we are only interested in folders.
 2017-12-07 17:32:35 +01:00
Christian Kamm 287670c9d6 Excludes: Remove fnmatch codepath 
Now all exclude patterns can be translated to regular expressions.
 2017-12-07 14:38:21 +01:00
Christian Kamm 994f3bb644 Excludes: fnmatch doesn't treat '{' as special 
Neither the documentation at
http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_13
nor the fnmatch source code in <glibc>/posix/fnmatch_loop.c points
toward { causing special matching behavior.
 2017-12-07 14:38:21 +01:00
Christian Kamm e5c780ee19 Excludes: Translate full-path patterns to regex 
Improves full matches by more than an order of magnitude
and also improves speed of traversal matches by roughly 20%,
judging by the check_csync_exclude performance test.
 2017-12-07 14:38:21 +01:00
Christian Kamm 1c3d5ab158 Excludes: Introduce dir-only regex matches 2017-12-07 14:38:21 +01:00
Christian Kamm 5d668eca40 Excludes: Optimize Desktop.ini check 2017-12-07 14:38:21 +01:00
Christian Kamm 7ab127ad53 Excludes: Refactor for pending improvements 
Make ExcludedFiles something that is instantiated outside of
the CSYNC context and then given to it as a hook.

ExcludedFiles still lives in csync_exclude and the internal
workings haven't been touched.
 2017-12-07 14:38:21 +01:00
Olivier Goffart dd91f4a86e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/csync/csync.cpp
 2017-12-07 09:37:50 +01:00
Hefee 32f38dc5f8 fix typo error: occured-> occurred 2017-12-06 20:02:53 +01:00
Christian Kamm ceac18c554 Reconcile: Rename maps are consistent with update phase #6212 
For duplicate file ids the update phase and reconcile phase determined
the rename mappings independently. If they disagreed (due to different
order of processing), complicated misbehavior would result.

This patch fixes it by letting reconcile try to use the mapping that the
update phase has computed first.
 2017-12-06 16:42:11 +01:00
Christian Kamm 99f32dcb99 Clear csync rename mappings after reconcile 
They were being preserved *across sync runs*.
 2017-12-06 16:42:11 +01:00
Christian Kamm 79fe71db58 Hide selective sync buttons while disconnected #5809 
The choices or big folder warnings will pop up again on reconnection.
 2017-12-06 16:41:28 +01:00
Olivier Goffart ed5385faa3 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libsync/connectionvalidator.cpp
     	src/libsync/networkjobs.cpp
 2017-12-05 15:58:13 +01:00
Tomaz Canabrava 66aecb9626 [CSE] Handle normal uploads in CSE enabled instances 2017-12-04 22:45:10 +01:00
Tomaz Canabrava 6f35cbff6b [CSE] Fetch the Folder information for encryption status 2017-12-04 22:27:13 +01:00
Tomaz Canabrava 387737d908 [CSE] Start to create the upload logic. 2017-12-04 21:33:43 +01:00
Markus Goetz 0479322c1d fstack-protector: Improve previous commit 2017-12-04 12:37:03 +01:00
Klaas Freitag 0be7b6fe1f Only enable -fstack-protector-strong compiler flag for gcc > 4.9 
On older/other compilers this flag is not understood.
 2017-12-04 12:37:03 +01:00
Olivier Goffart ee98daf9ea Shibboleth: Upgrade to OAuth2 When the server supports it 
If the server support both Shibboleth and OAuth2, upgrades to OAuth2

Issue #6198
 2017-12-04 08:09:34 +01:00
Tomaz Canabrava 8c4928d9f6 Merge branch 'uploadImprovements' into clientSideEncryptionV3 2017-12-03 18:15:33 +01:00
Olivier Goffart 30e3932af8 FolderWizard: Fix minimum size 
There are several bugs in QWizard that needs to be worked around for the minimum
size of the widget to take effect.

Issue #4280
 2017-11-29 08:03:06 +01:00
Tomaz Canabrava 35eb071874 [uploadImprovements] use the new struct on PropagateUploadNg 
use the new struct on PropagateUploadNg to make the algorithm
more future proof.
 2017-11-28 22:58:52 +01:00