mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-25 15:01:11 +02:00
Code Issues Releases Wiki Activity

small changes in QtKeychain integration

Browse Source
This commit is contained in:
Stefan Derkits
2012-05-14 12:22:45 +02:00
parent 7fbcf653d3
commit a968f3e92b
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libtomahawk/accounts/Account.cpp
View File

@@ -116,13 +116,13 @@ Account::onError( int errorCode, const QString& error )
void void
Account::keychainJobFinished(QKeychain::Job* j ) Account::keychainJobFinished(QKeychain::Job* j )
{ {
if ( j->error() != QKeychain::NoError ) if ( j->error() == QKeychain::NoError )
{ {
QKeychain::ReadPasswordJob* readJob = qobject_cast< QKeychain::ReadPasswordJob* >( j ); QKeychain::ReadPasswordJob* readJob = qobject_cast< QKeychain::ReadPasswordJob* >( j );
if ( readJob != 0 ) if ( readJob != 0 )
{ {
tLog() << Q_FUNC_INFO << "readJob finished without errors"; tLog() << Q_FUNC_INFO << "readJob finished without errors";
deserializeCredentials( m_credentials, readJob->binaryData() ); deserializeCredentials( readJob->binaryData() );
tLog() << Q_FUNC_INFO << readJob->key(); tLog() << Q_FUNC_INFO << readJob->key();
tLog() << Q_FUNC_INFO << m_credentials; tLog() << Q_FUNC_INFO << m_credentials;
} }
@@ -139,24 +139,24 @@ Account::keychainJobFinished(QKeychain::Job* j )
} }
} }
else else
tLog() << Q_FUNC_INFO << "Job finished with error: " << j->errorString(); tLog() << Q_FUNC_INFO << "Job finished with error: " << j->error() << " " << j->errorString();
j->deleteLater(); j->deleteLater();
} }
void void
Account::serializeCredentials(const QVariantHash& credentials, QByteArray& data) Account::serializeCredentials( QByteArray& data )
{ {
QDataStream ds(&data, QIODevice::WriteOnly); QDataStream ds(&data, QIODevice::WriteOnly);
ds << credentials; ds << m_credentials;
} }
void void
Account::deserializeCredentials(QVariantHash& credentials, const QByteArray& data) Account::deserializeCredentials( const QByteArray& data )
{ {
QDataStream ds2(data); QDataStream ds2(data);
ds2 >> credentials; ds2 >> m_credentials;
} }
@@ -184,7 +184,7 @@ Account::syncConfig()
j->setKey( m_accountId ); j->setKey( m_accountId );
j->setAutoDelete( false ); j->setAutoDelete( false );
QByteArray bData; QByteArray bData;
serializeCredentials( m_credentials, bData ); serializeCredentials( bData );
j->setBinaryData( bData ); j->setBinaryData( bData );
connect( j, SIGNAL( finished( QKeychain::Job* ) ), this, SLOT( keychainJobFinished( QKeychain::Job* ) ) ); connect( j, SIGNAL( finished( QKeychain::Job* ) ), this, SLOT( keychainJobFinished( QKeychain::Job* ) ) );
j->start(); j->start();

4
src/libtomahawk/accounts/Account.h
View File

@@ -147,8 +147,8 @@ private slots:
void keychainJobFinished( QKeychain::Job* ); void keychainJobFinished( QKeychain::Job* );
private: private:
void serializeCredentials( const QVariantHash& credentials, QByteArray& data ); void serializeCredentials( QByteArray& data );
void deserializeCredentials( QVariantHash& credentials, const QByteArray& data ); void deserializeCredentials( const QByteArray& data );
QString m_accountServiceName; QString m_accountServiceName;
QString m_accountFriendlyName; QString m_accountFriendlyName;