From: Hannah von Reth Date: Tue, 12 Jan 2021 15:37:46 +0000 (+0100) Subject: Also prepend appName if id is empty X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~18^2~299^2~7 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d60eb67c2eafebc2a495fd95437e5fe54ae9394c;p=nextcloud-desktop.git Also prepend appName if id is empty --- diff --git a/src/libsync/creds/abstractcredentials.cpp b/src/libsync/creds/abstractcredentials.cpp index 839bf3bbb..2f2b8b49b 100644 --- a/src/libsync/creds/abstractcredentials.cpp +++ b/src/libsync/creds/abstractcredentials.cpp @@ -50,6 +50,7 @@ QString AbstractCredentials::keychainKey(const QString &url, const QString &user QString key = user + QLatin1Char(':') + u; if (!accountId.isEmpty()) { key += QLatin1Char(':') + accountId; + } #ifdef Q_OS_WIN // On Windows the credential keys aren't namespaced properly // by qtkeychain. To work around that we manually add namespacing @@ -59,7 +60,6 @@ QString AbstractCredentials::keychainKey(const QString &url, const QString &user // migrated to new namespaced keys on windows for 2.4. key.prepend(QCoreApplication::applicationName() + "_"); #endif - } return key; } } // namespace OCC