1
0
Fork 0
Commit Graph

13970 Commits

Author SHA1 Message Date
Michael Schuster 4419e7fe2a Remove Submodule binary (old upstream binaries)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-05-31 14:08:23 +00:00
Nextcloud bot 92e77a186a
[tx-robot] updated from transifex 2020-05-31 03:24:09 +00:00
Nextcloud bot 2eb7ba2eb4
[tx-robot] updated from transifex 2020-05-30 03:24:01 +00:00
Nextcloud bot cdd1e7b69f
[tx-robot] updated from transifex 2020-05-29 03:25:37 +00:00
Michael Schuster b972fd9e19
Merge pull request #2034 from nextcloud/backport/2032/stable-2.6
[stable-2.6] testLaunchOnStartup shouldn't fail on dev setup
2020-05-27 16:15:01 +02:00
Kevin Ottens fb6f998a7a 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 14:13:25 +00:00
Michael Schuster f2a8106a57
Merge pull request #2033 from nextcloud/backport/2023/stable-2.6
[stable-2.6] Use the return braced init list pattern
2020-05-27 16:12:23 +02:00
Kevin Ottens fb428847af 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:09:38 +00:00
Nextcloud bot 2f20530bf1
[tx-robot] updated from transifex 2020-05-27 03:25:40 +00:00
Michael Schuster 4f988e09ca
Merge pull request #2029 from nextcloud/backport/2021/stable-2.6
[stable-2.6] Use = default for trivial ctors and dtors
2020-05-27 05:19:11 +02:00
Kevin Ottens 1e12b9dca8 Use = default for trivial ctors and dtors
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-05-27 03:18:10 +00:00
Michael Schuster ce9fa18976
Merge pull request #2028 from nextcloud/backport/2020/stable-2.6
[stable-2.6] Use make_unique when appropriate
2020-05-27 05:12:32 +02:00
Kevin Ottens 8cd63918a7 Use make_unique when appropriate
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-05-27 03:11:35 +00:00
Michael Schuster a87e90a56f
Merge pull request #2027 from nextcloud/backport/2019/stable-2.6
[stable-2.6] Remove redundant void argument list
2020-05-27 05:10:30 +02:00
Kevin Ottens 67276be84f Remove redundant void argument list
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-05-27 03:08:41 +00:00
Michael Schuster d3a71c1f60
Merge pull request #2026 from nextcloud/backport/2018/stable-2.6
[stable-2.6] Use using instead of typedef
2020-05-27 05:06:43 +02:00
Kevin Ottens f48ebfd0ab Use using instead of typedef
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-05-27 03:05:47 +00:00
Michael Schuster 2670fcc0f9
Merge pull request #2025 from nextcloud/backport/2017/stable-2.6
[stable-2.6] Remove redundant initializer
2020-05-27 05:03:16 +02:00
Kevin Ottens 822fcad0c2 Remove redundant initializer
This is the same value than the initializer value in the header, no need
to repeat it.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-05-27 03:02:21 +00:00
Nextcloud bot 9d0b0cb3b6
[tx-robot] updated from transifex 2020-05-25 03:22:45 +00:00
Nextcloud bot 2173abd23f
[tx-robot] updated from transifex 2020-05-24 03:23:49 +00:00
Michael Schuster fb01fda0fb
Merge pull request #2007 from nextcloud/backport/2006/stable-2.6
[stable-2.6] Improve URL input field in Wizard
2020-05-23 20:08:08 +02:00
Stephan Beyer 8a938c4af3 Replace "https://..." hint by "https://host:port"
The new hint is a little more verbose and provides more information
than the old one.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
2020-05-23 18:07:11 +00:00
Stephan Beyer 992ba0321f Show URL placeholder hint in wizard
In owncloudsetupnocredspage.ui, the URL input field leUrl has a
placeholder text saying "https://..." which is a very useful hint
for the user.  However, in the OwncloudSetupPage constructor, the
placeholer text is overwritten by the return string of the theme's
wizardUrlHint() method.  The NextcloudTheme class does not override
this virtual method, so an empty string is used.

To make available the "https://..." hint, it is moved from the
UI file to NextcloudTheme::wizardUrlHint().  Note that, if a
theme is used which does not allow a custom server URL, the
placeholder text is now empty.  This makes sense because the
input field is disabled in that case.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
2020-05-23 18:07:10 +00:00
Stephan Beyer fb33e8f84b Change vertical size policy of URL input field in wizard
The input field for the nextcloud server URL is vertically too
big (because of the icon next to it in the same horizontal layout).
This commit solves this issue by changing its vertical size policy
from Ignored to Fixed.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
2020-05-23 18:07:10 +00:00
Nextcloud bot ef6f00798f
[tx-robot] updated from transifex 2020-05-23 03:26:22 +00:00
Michael Schuster eb122ffbec
Merge pull request #2005 from nextcloud/backport/2001/stable-2.6
[stable-2.6] Use default member initialization
2020-05-22 16:08:47 +02:00
Stephan Beyer 815170728e Use default member initializers in OCC::FolderStatusModel sub-structs
This allows to remove their explicit default constructor definitions.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
2020-05-22 14:07:27 +00:00
Stephan Beyer d9d14fd091 Use default member initializers in OCC::SyncJournalErrorBlacklistRecord
This allows to remove its explicit default constructor definition.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
2020-05-22 14:07:26 +00:00
Stephan Beyer 23902944da Use default member initializers in OCC::SyncJournalDb sub-structs
This allows to remove their explicit default constructor definitions.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
2020-05-22 14:07:26 +00:00
Stephan Beyer 6f57016120 Use default member initializers in OCC::FolderDefinition
Using default member initializers (available since C++11) in
OCC::FolderDefinition allows to remove its explicit default
constructor, which is favorable.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
2020-05-22 14:07:26 +00:00
Stephan Beyer cd69585d4a Remove unused member in OCC::FolderDefinition
OCC::FolderDefinition has a member called isClientSideEncrypted
that was introduced by commit 9318c487b9 but has not been used
in any way since.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
2020-05-22 14:07:26 +00:00
Kevin Ottens 0fb0fc2d7e
Don't use int literals for bools
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
(cherry picked from commit 5543e4d834)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-05-22 16:05:23 +02:00
Stephan Beyer 40121dd03d
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>
(cherry picked from commit f275640343)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-05-22 15:54:57 +02:00
Stephan Beyer da9e2250d7
Fix leak in CloudProviderManager
The member _map, allocated in the constructor, was leaking.

The ad-hoc way to fix the leak would have been to add a destructor
that deletes _map.  However, there is no good reason why _map has
to be a pointer to a QMap (instead of a QMap).
Hence this commit changes the type of the _map member from a QMap
pointer to a QMap.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
(cherry picked from commit eaf4aa0e5b)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-05-22 15:54:49 +02:00
Stephan Beyer 6aa087a892
Fix leak in CloudProviderWrapper
The member _recentlyChanged, allocated in the constructor, was leaking.

The ad-hoc way to fix the leak would have been to add a destructor
that deletes _recentlyChanged.  However, there is no good reason why
_recentlyChanged has to be a pointer to a QList (instead of a QList).
Hence this commit changes the type of the _recentlyChanged member
from a QList pointer to a QList.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
(cherry picked from commit 71a474129b)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-05-22 15:54:36 +02:00
Nextcloud bot a6a9df9720
[tx-robot] updated from transifex 2020-05-22 03:28:02 +00:00
Nextcloud bot aa71623946
[tx-robot] updated from transifex 2020-05-21 03:27:30 +00:00
Nextcloud bot 03c63721a4
[tx-robot] updated from transifex 2020-05-20 03:24:56 +00:00
Michael Schuster f77b706eb1
Merge pull request #1999 from nextcloud/backport/1989/stable-2.6
[stable-2.6] Remove useless virtual, better use override only
2020-05-20 03:29:04 +02:00
Kevin Ottens 01d47ea60a Remove useless virtual, better use override only
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-05-20 01:28:27 +00:00
Stephan Beyer 9cb8c52568
Add -fno-sanitize=vptr for SANITIZE_UNDEFINED=ON
The UndefinedBehaviorSanitizer includes the "vptr" check.  This
check, however, needs typeinfo for OCC::AccountManager because
otherwise its stub for FileManTest leads to undefined references
when linking.  Adding the -frtti flag to enable run-time typeinfo
did not solve the problem.  I do not know another solution, so this
commit disables the vptr check.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
(cherry picked from commit 7f598b181e)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-05-20 03:12:43 +02:00
Stephan Beyer 69ae63ea50 Make sanitizer options more fine-grained
The SANITIZE_ADDRESS option of our CMake configuration activates the
AddressSanitizer (and UBSan in a non-working way) for the whole project
(although, by the way, its documentation pretends that it is only enabled
for tests).

This commit introduces new options SANITIZE_LEAK, SANITIZE_MEMORY,
SANITIZE_UNDEFINED, SANITIZE_THREAD.  Each of these options (including
SANITIZE_ADDRESS) enables only the corresponding sanitizer.

Moreover, we mark all sanitizer options as advanced options, because these
options are only interesting for developers.

Note that some sanitizers are conflicting, that is, not all options can
be enabled simultaneously.  Also, not all sanitizers are available for
all compilers and versions.  We, however, do not check for this, instead
we let the compiler throw its errors in such cases.

The explicit usage of the Google Linker is removed, because it is not
necessary and can lead to problems with clang.

The commit can be considered a rewrite of cmake/modules/SanitizerFlags.cmake.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
(cherry picked from commit 00574ef8b4)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-05-20 03:11:45 +02:00
Michael Schuster acec8a9721
Merge pull request #1998 from nextcloud/backport/1992/stable-2.6
[stable-2.6] Update github links to desktop repository
2020-05-20 03:03:01 +02:00
Reinhold Gschweicher 6bca361351 Update github links to desktop repository
Update the issue and open PR links with the new repository URL.
The old URL is forwarded, but feels not completely right.

Signed-off-by: Reinhold Gschweicher <pyro4hell@gmail.com>
2020-05-20 01:02:19 +00:00
Michael Schuster 1130d3941a
Merge pull request #1997 from nextcloud/backport/1988/stable-2.6
[stable-2.6] Use nullptr when appropriate
2020-05-20 02:59:21 +02:00
Michael Schuster a7ad510e93 Use the default parameter: QUrl::path(QUrl::PrettyDecoded = 0x000000)
Change it to path() to be consistent with the other usages in the project :)

See: https://doc.qt.io/qt-5/qurl.html#path

Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-05-20 00:56:10 +00:00
Kevin Ottens 800624de66 Use nullptr when appropriate
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-05-20 00:56:09 +00:00
Michael Schuster 9c80cc2603
Merge pull request #1996 from nextcloud/backport/1986/stable-2.6
[stable-2.6] Properly handle denormalized href
2020-05-20 01:33:57 +02:00
Kevin Ottens 3920f264c4 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-19 23:32:25 +00:00