chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-08-18 17:07:59 +02:00
Code Activity
14,618 Commits 4 Branches 173 Tags
v2.7.0-beta2
Commit Graph
422 Commits
Author SHA1 Message Date
Roeland Jago DoumaandMichael Schuster 50dcab5f88 Move the proxyfiles to libsync where they make more sense 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2020-06-18 18:38:06 +02:00
Michael Schuster 456c1eadbe Simplify nullptr comparisons where appropriate 
Make the codebase consistent, we already have a lot of implicit pointer comparisons.

Exception: Stay explicit on return's, example:
  return _db != nullptr;

Signed-off-by: Michael Schuster <michael@schuster.ms>
 2020-06-11 00:27:30 +02:00
Stephan BeyerandKevin Ottens ea16804751 Replace NULL by nullptr in all C++ files 
We keep NULL in the pure C files in src/csync/std and test/csync.

We also replace Doxygen documentation referring to "NULL" to
"\c nullptr" (formatted as code).

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
 2020-06-08 20:07:50 +02:00
Kevin OttensandCamila 00d20b03ac Add some more make_unique calls 
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-06-04 08:44:05 +02:00
Camila SanandKevin Ottens (Rebase PR Action) 3bae570f29 Do not declare local variables without an initial value. 
Signed-off-by: Camila San <hello@camila.codes>
 2020-06-03 07:50:40 +00:00
Michael SchusterandGitHub c0a9f60d0d Merge pull request #2032 from nextcloud/insulate_testutility_from_user_settings 
testLaunchOnStartup shouldn't fail on dev setup
 2020-05-27 16:10:57 +02:00
Kevin Ottens b39a14bf2b testLaunchOnStartup shouldn't fail on dev setup 
This test was failing locally for me. Indeed, through QStandardPaths it
was finding the user settings of my production client and not having the
initial state it expected. Using QStandardPaths test mode then it starts
from a clean slate every time.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-05-27 15:11:25 +02:00
Kevin Ottens 6e62c8b430 Use the return braced init list pattern 
This way we avoid repeating the return type while it is already known.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-05-27 14:36:07 +02:00
Michael SchusterandGitHub ccc409dbd0 Merge pull request #2024 from nextcloud/use_raw_string_literals 
Use raw string literals when appropriate
 2020-05-27 05:54:54 +02:00
Kevin Ottens f5350db078 Use raw string literals when appropriate 
This is especially nice for Windows paths.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-05-26 20:13:51 +02:00
Kevin Ottens 0bc4dcd8a5 Use using instead of typedef 
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-05-25 20:29:44 +02:00
Stephan Beyer f275640343 Fix leak in OCC::AccountManager stub for FolderManTest 
We simply use a static QObject using Q_GLOBAL_STATIC()
instead of allocating a leaking QObject on the heap.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
 2020-05-21 01:22:15 +02:00
Kevin OttensandCamila 5543e4d834 Don't use int literals for bools 
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-05-20 13:52:58 +02:00
Kevin OttensandMichael Schuster 712869db9a Use auto to avoiding repeating type names 
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-05-20 03:54:41 +02:00
Michael SchusterandGitHub 3d2de4fc40 Merge pull request #1989 from nextcloud/remove_redundant_virtual 
Remove useless virtual, better use override only
 2020-05-20 03:27:45 +02:00
Kevin Ottens 9328a4bba3 Remove useless virtual, better use override only 
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-05-18 20:45:20 +02:00
Kevin Ottens 4d1ff01654 Properly handle denormalized href 
In case of denormalized paths in the dav href (presence of . or .. in
the path) simple string startsWith comparison wasn't enough to know if
said href ended up in the right namespace. That's why we're now using
QUrl (pretending local file since we don't have a full URL in the href)
to normalize the path before comparison.

This could happen with broken proxies for instance where we would
wrongly validate the dav information resulting in potentially surprising
syncing and name collisions.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
 2020-05-18 19:33:34 +02:00
Michael Schuster 5f42813d98 Updater: Fix Tests build (failed with BUILD_UPDATER=NO) 
Also don't build the test for the updater, fix missing updater library.

Signed-off-by: Michael Schuster <michael@schuster.ms>
 2020-03-10 22:10:45 +01:00
Max Rees 3d3021e3b0 Fix cmake inclusion of Qml and Quick 
Signed-off-by: Max Rees <maxcrees@me.com>
 2020-02-23 23:44:54 -06:00
Michael Schuster 3e255df533 Fix Tests linkage (missed UserInfo.cpp in CMakeLists.txt) 
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2020-02-14 03:12:37 +01:00
Michael SchusterandGitHub 8c2d77c68f Merge pull request #1699 from Milokita/test-file-fix 
apply http2 qt resend patch from owncloud
 2020-01-19 18:11:36 +01:00
Dominique Fuchs d7a9940973 Fix failing of several tests by including ocsjob source (after its inclusion in accountstate in a previous commit) 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-16 10:53:43 +01:00
Dominique Fuchs db92d5bfff append the correct folderwatcher (platform specific) 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2020-01-16 10:39:56 +01:00
XNG 768cf7e1ae apply http2 qt resend patch from owncloud 
Signed-off-by: XNG <Milokita@users.noreply.github.com>
 2019-12-25 14:36:25 +08:00
XNG d87a88e39f apply http2 qt resend patch from owncloud 
Signed-off-by: XNG <Milokita@users.noreply.github.com>
 2019-12-25 14:13:03 +08:00
XNG 314c00a8b7 apply http2 qt resend patch from owncloud 
Signed-off-by: XNG <Milokita@users.noreply.github.com>
 2019-12-25 13:59:15 +08:00
Michael SchusterandGitHub 4d5dd0f49c Merge branch 'master' into testSyncFileStatusTracker-winPath 2019-10-20 21:33:19 +02:00
Camila San 19491ff85f Once client gets 401/403 from the server, check if remote wipe was requested. 
- When the the users logs because of 401 or 403 errors, it checks if the
server requested the remote wipe. If yes, locally deletes account and folders
connected to the account and notify the server. If no, proceeds to ask the
user to login again.
- The app password is restored in the keychain.
- WIP: The change also includes a test class for RemoteWipe.

Signed-off-by: Camila San <hello@camila.codes>
 2019-10-17 20:11:31 +02:00
Camila AyresandGitHub 6c56811636 Merge branch 'master' into testSyncFileStatusTracker-winPath 2019-10-17 13:37:01 +02:00
Dominique Fuchs f993e7c555 Fixed typo preventing successful path rename on Win and modified ASSERT for Window path styles 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-10-08 08:31:31 +02:00
asapelkin 17f39bd09d little loops optimization 
Signed-off-by: asapelkin <asapelkin0x01@ya.ru>
 2019-10-07 01:29:55 +03:00
Dominique FuchsandGitHub 4edab98b58 Merge branch 'master' into owncloud 2019-09-10 11:03:39 +02:00
Dominique FuchsandGitHub 07df659a3f Merge branch 'master' into issue1216/IgnoreEmacsRecoveryFiles 2019-09-09 21:46:39 +02:00
Samir Benmendil 5e3c2d2a96 Fix fullPath matching 
Signed-off-by: Samir Benmendil <me@rmz.io>
 2019-08-15 03:00:26 +01:00
Samir Benmendil 14279104ae Read .sync_exclude.lst in each subdirectory 
Signed-off-by: Samir Benmendil <me@rmz.io>
 2019-08-15 03:00:26 +01:00
Sebastian Grund a9bea53c89 issue1216: added sync-exclude entry for emacs recovery files 
Signed-off-by: Sebastian Grund <grund92@gmx.de>
 2019-05-22 08:52:37 +02:00
Joshua Sterner bd9fcd88d8 testMove3LevelDirWithFile now uses mv function to move the directory 
Signed-off-by: Joshua Sterner <joshua.s.sterner@gmail.com>
 2019-05-09 04:12:33 -07:00
Joshua Sterner b6ff17c50b Fixed Issue #1000 - Subfolders of moved folders not synced 
Signed-off-by: Joshua Sterner <joshua.s.sterner@gmail.com>
 2019-05-09 04:12:33 -07:00
Camila San b5b2ef3120 Updates test to fit new configuration default value. 
Signed-off-by: Camila San <hello@camila.codes>
 2019-04-12 16:22:07 +02:00
Roeland Jago DoumaandGitHub 3b5d8f0277 Merge branch 'master' into upstream/pr/6656 2018-11-01 08:07:55 +01:00
Roeland Jago DoumaandGitHub dd39887f2b Merge pull request #641 from nextcloud/upstream/pr/6621 
TestOAuth: Don't have global static QObject
 2018-10-30 22:38:51 +01:00
Roeland Jago DoumaandGitHub d246c1e8b9 Merge branch 'master' into upstream/pr/6485 2018-10-24 08:27:11 +02:00
Roeland Jago DoumaandGitHub 24606c0105 Merge branch 'master' into upstream/pr/6632 2018-10-23 22:51:12 +02:00
Roeland Jago DoumaandGitHub 6b7328bb87 Merge branch 'master' into upstream/pr/6632 2018-10-23 22:48:34 +02:00
Roeland Jago DoumaandGitHub f3529e3dd7 Merge branch 'master' into upstream/pr/6674 2018-10-23 21:43:13 +02:00
tuxmaster5000 f9c6449c05 Fix include file 2018-10-12 15:56:26 +02:00
tuxmaster5000 3c00c09ea8 Rename owncloud tests to nextcloud 2018-10-12 14:52:18 +02:00
Olivier GoffartandCamila San 08e4ba3363 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-09-10 20:44:03 +02:00
Olivier GoffartandCamila San b3e4ec9454 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-09-09 22:02:44 +02:00
Olivier GoffartandCamila San d202942a2c Reconcile: When detecting a local move, keep the local mtime 
https://github.com/owncloud/client/issues/6629#issuecomment-402450691
 2018-09-09 21:38:10 +02:00