chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-09-29 00:42:45 +02:00
Code
13,625 Commits 4 Branches 173 Tags 91 MiB
v2.6.2
Commit Graph

98 Commits

Author SHA1 Message Date
Dominique Fuchs
adc3b1a25c
initialize _modtime to prevent undefined usage 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit ab3d0141ec)
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-10-17 19:38:54 +02:00
Dominique Fuchs
03453d6800
Removed disabling of msvc warning to prevent generating a unknown option for other compilers in turn. Now detect specifically GCC in ifdef 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit 7473cdf184)
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-10-17 19:38:53 +02:00
Dominique Fuchs
1ac9c4ea8d
Moved macro definition due to timing issues while compiling when relying on header inheritance 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit c585e81530)
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-10-17 19:34:19 +02:00
Dominique Fuchs
9c7903868f
Further testing of cond. include of Qt library > 5.9. Utilized different macro. 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit 222b2d8645)
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-10-17 19:34:18 +02:00
Dominique Fuchs
8ee1adf058
Fixed another logic error -> logical to bitwise OR for QTLEGACY 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit f41eeaf6ec)
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-10-17 19:34:18 +02:00
Dominique Fuchs
27fb1fcd53
Fixed logic error in QTLEGACY macro and added forgottin #if clause for header file 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit 48097801e8)
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-10-17 19:34:18 +02:00
Dominique Fuchs
29cc5c1e7f
Added macro definition and compile-time condition to support Qt < 5.9 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit dca83aad45)
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-10-17 19:34:18 +02:00
Dominique Fuchs
29bb76019f
Indeed, DWORD is a special snowflake - only when on _WIN32 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit be7a524557)
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-10-17 19:34:18 +02:00
Dominique Fuchs
ed99cb297b
Use existing fct for RegKeyQuery instead of redundant subroutine 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit d60a216982)
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-10-17 19:34:17 +02:00
Dominique Fuchs
a0e794a7f1
Numoerous safe conversions implemented. Added additional Utility::convertSizeToDWORD for windows builds. 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit d6af025a46)
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-10-17 19:34:16 +02:00
Dominique Fuchs
4da9123b67
Renamed conversion function to make intention more clear. Also defaulted to 'controlled truncation' to not stupidly crash. TBD/TODO: Better handling for such things. 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit 46e0a05078)
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-10-17 19:34:16 +02:00
Dominique Fuchs
c7158e2c7c
Selectively and temporary disabled warning about unknown preprocessor declarative for msvc when using specific GCC instruction. 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit 8329de4cee)
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-10-17 19:34:16 +02:00
Dominique Fuchs
4adc45483a
Implemented Utility::convert function to convert size_t -> uint safely and on the fly. Often necessary for Qt and WIN32 functions. Using this will not generate compiler warnings of possible truncation. First call implemented in ownsql.cpp 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit b4dee67bf5)
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-10-17 19:34:16 +02:00
Dominique Fuchs
ae0ff6b3e3
Fixed broken overloading mechanism of variadic templates. See code comment for further information. 
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
(cherry picked from commit 5ae3435fe6)
Signed-off-by: Michael Schuster <michael@schuster.ms>
 2019-10-17 19:34:16 +02:00
Dominique Fuchs
8f3bf3313e Integrated registry check on windows when hasDarkSystray is called. 
Return value determines which theme is applied for monochrome variant.
Fixes #1276 but only when monochrome option is toggled or nc starts, not automatically when changing windows theme.

Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
 2019-09-01 22:13:14 +02:00
Roeland Jago Douma
326c872ba7
Merge pull request #663 from nextcloud/upstream/pr/6707 
Windows: Release handle/fd when file open fails #6699
 2018-10-30 22:40:44 +01:00
Roeland Jago Douma
2dc7ff7332
Merge branch 'master' into upstream/pr/6360 2018-10-19 16:13:09 +02:00
Christian Kamm
4bd2545dad
Windows: Release handle/fd when file open fails #6699 2018-09-10 21:17:20 +02:00
Roeland Jago Douma
24efdd3b45
Fix E2E query 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-03 11:40:58 +02:00
Roeland Jago Douma
6c11c1aa73
Fix query 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-03 10:33:26 +02:00
Olivier Goffart
d114212333
OwnSql: Fixup after feedback for #6388 2018-07-03 10:33:26 +02:00
Olivier Goffart
779969f865
OwnSql: Put the SQL queries next to their use. 
This avoid haivng to modify 4 places when we want to add a query
 2018-07-03 10:33:26 +02:00
Olivier Goffart
518fb90757
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-07-03 10:33:26 +02:00
Christian Kamm
77fcff5bdf
Conflicts: Change tags to be more user friendly #6365 
From "_conflict-user-yyyymmdd-hhmmss"
to   " (conflicted copy user yyyy-mm-dd hhmmss)"
 2018-06-11 14:40:40 +02:00
Markus Goetz
3cd21e258e
macOS: Don't use WAL for sqlite3 in /Volumes 
For #6049
 2018-06-07 10:22:07 +02:00
Christian Kamm
8147963b24
SyncJournal: Explain added file-exists check 2018-06-07 09:50:09 +02:00
Christian Kamm
cc04ce9fe4
SyncJournal: Check file existence even for open dbs #6049 
With WAL mode sqlite seems to occasionally crash when the
underlying filesystem goes away.
 2018-06-07 09:50:09 +02:00
Olivier Goffart
012c638d4e
Uploads: Don't delete unexisting chunks 
Since commit 4dc49ff3, we store an entry in the upload info table even
for non chunked uploads. However, if this fails we don't want to remove
non-existant stale chunks if the upload fails.

Without this commit, we would send a DELETE command to clean non-existant
chunks in the dav/uploads/ namespace.
 2018-06-06 09:52:02 +02:00
Christian Kamm
09f83f4fa9
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-06-05 12:00:20 +02:00
Olivier Goffart
613fd30021
SyncJournalDb::setSelectiveSyncList: Always use a transaction 
Issue #6431
 2018-06-05 11:15:51 +02:00
Roeland Jago Douma
86741de622
Merge pull request #299 from nextcloud/upstream/pr/6349 
Don't delete contents behind directory junctions #6322
 2018-05-30 08:03:04 +02:00
Roeland Jago Douma
c6c42c3c70
Merge pull request #311 from nextcloud/upstream/pr/6371 
Utility::fsCasePreserving: remove UNIT_TESTING ifdef
 2018-05-29 20:33:34 +02:00
Roeland Jago Douma
b7d5aff901
Merge pull request #303 from nextcloud/upstream/issue/6322 
SyncJournal: Don't use LIKE with paths
 2018-05-18 13:56:25 +02:00
Roeland Jago Douma
1dc3c156d4
Merge pull request #304 from nextcloud/upstream/pr/6364 
Conflicts: Add user name to conflict file name #6325
 2018-05-18 13:56:14 +02:00
Olivier Goffart
d4aebd30de
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-05-16 12:57:20 +02:00
Christian Kamm
17d174e6fa
Conflicts: Add user name to conflict file name #6325 
For the case of uploading conflict files only.
 2018-05-15 22:38:35 +02:00
Christian Kamm
ce0e2d0b88
SyncJournal: Don't use LIKE with paths 
Paths can contain the wildcards % and _ and that would lead to odd
behavior.

This patch also clarifies the behavior of avoidReadFromDbOnNextSync()
which previously dependend on whether "foo/bar" or "foo/bar/" was
passed as input.

Possibly affects #6322
 2018-05-15 19:44:00 +02:00
Olivier Goffart
88347a985f
Adjust the Move To Trash patch 
(PR #6265)

 - Remove the UI completely
 - Move the #ifdef inside the FileSystem::moveToTrash function, so it is easier to
   implement on other platforms
 - Q_OS_UNIX includes mac, so we need to disable it. (not using Q_OS_LINUX because of
   other BSD that uses XDG spec as well
 - Translate the error messages
 - Add a couple of doc comments
 2018-05-15 19:10:41 +02:00
Christian Kamm
2d1d651fcd
Don't delete contents behind directory junctions #6322 
QFileInfo::isSymLink() does detect reparse points that are symlinks but
returns false for junctions. The new function FileSystem::isJunction()
can detect those and is used to not recursively delete files inside
directories that are junctions.

See also https://bugreports.qt.io/browse/QTBUG-45344 and the
discussion in the PR https://codereview.qt-project.org/#/c/113019/.
 2018-05-15 18:42:44 +02:00
Oleg Solovyov
f9fe24feb9
Move remote-deleted files to trash 
Squashed from https://github.com/owncloud/client/pull/6265

Linux only, Hidden option, disabled by default
 2018-05-15 17:23:38 +02:00
Tomaz Canabrava
7432d6a814 Merge branch 'master' into clientSideEncryptionV4 2018-04-10 16:18:58 +02:00
Daniel Nicoletti
d93f7269b8 Properly mark encrypted files for removal 2018-04-09 13:23:52 +02:00
Daniel Nicoletti
d3b6aacf3f Fix merging remote and local trees when e2e files are involved 
When populating the tree from the filesystem we need to fill
the e2eMangledName from DB and we when trying to find another
match on the oposite tree we need to take in account that names
don't match and search with the mangled name information
 2018-04-09 13:23:52 +02:00
Camila San
e33d2bf7f7
Removes (s) from time strings. 
Signed-off-by: Camila San <hello@camila.codes>
 2018-02-25 23:55:04 +01:00
Daniel Nicoletti
99117078f3 Remove table for e2e and add an e2eMangledName column (#169) 
If the code was not complex enough syncing two tables
already started to give UNIQUE constrains errors on
simple sync operations, this also adds initial support
remote delete of an encrypted file
 2018-02-12 12:50:51 +01:00
Tomaz Canabrava
d24a1e542e Merge branch 'master' into clientSideEncryptionV3 2018-01-29 14:06:12 +01:00
Tomaz Canabrava
7b123650da [CSE] Search for name, not mangled name. 2018-01-28 23:48:25 +01:00
Tomaz Canabrava
0c94142c97 [CSE] More debug output 2018-01-28 23:47:58 +01:00
Tomaz Canabrava
a003d216a5 [CSE] Implementation of the setE2eRelation 
This call creates a new entry on the database for e2e.
 2018-01-28 18:05:28 +01:00
Tomaz Canabrava
32eaaa0601 [CSE] GetMangledName implementation 2018-01-28 17:50:10 +01:00