Commit b738dc01 authored by Gabriel Souza Franco's avatar Gabriel Souza Franco Committed by Laurent Montel
Browse files

Revert "Start to port to qt5keychain"

This reverts commit a4ae7e6d.

This change broke saving the account map in KWallet, including the OAuth
tokens. Therefore, user interaction is required to re-login in the browser
each time, instead of silently being able to refresh the tokens.
parent 4647da03
Pipeline #74433 skipped
......@@ -82,7 +82,6 @@ target_link_libraries(akonadi_google_resource
KPim::GAPIContacts
KPim::GAPICore
KPim::GAPITasks
qt5keychain
)
install(TARGETS akonadi_google_resource ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
......
......@@ -10,8 +10,6 @@
#include <KGAPI/Account>
#include <KWallet>
#include <qt5keychain/keychain.h>
using namespace QKeychain;
using namespace KWallet;
using namespace KGAPI2;
......@@ -109,9 +107,9 @@ bool GoogleSettings::storeAccount(AccountPtr account)
void GoogleSettings::cleanup()
{
auto deleteJob = new DeletePasswordJob(googleWalletFolder);
deleteJob->setKey(m_account->accountName());
deleteJob->start();
if (m_account && m_wallet) {
m_wallet->removeEntry(m_account->accountName());
}
}
void GoogleSettings::addCalendar(const QString &calendar)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment