~phablet-team/sync-monitor/trunk

Committer: Bileto Bot
Author(s): Renato Araujo Oliveira Filho
Date: 2016-07-01 02:14:41 UTC
mfrom: (37.3.61 sync-individual-sources)
Revision ID: ci-train-bot@canonical.com-20160701021441-su9ubhybvttesfqt

Remove syncevolution account config files if the account get removed.
Avoid create extra sources for accounts on syncevolution config.
Create a config for each google calendar.

files added:
src/sync-auth.cpp

src/sync-auth.h

files modified:
3rd_party/syncevolution-qt/dbustypes.cpp

3rd_party/syncevolution-qt/dbustypes.h

CMakeLists.txt

Ubuntu/SyncMonitor/syncmonitor-qml.cpp

Ubuntu/SyncMonitor/syncmonitor-qml.h

config.h.in

debian/control

src/CMakeLists.txt

src/eds-helper.cpp

src/eds-helper.h

src/main.cpp

src/sync-account.cpp

src/sync-account.h

src/sync-configure.cpp

src/sync-configure.h

src/sync-daemon.cpp

src/sync-daemon.h

src/sync-dbus.cpp

src/sync-dbus.h

src/sync-queue.cpp

src/sync-queue.h

src/syncevolution-server-proxy.cpp

src/syncevolution-server-proxy.h

src/syncevolution-session-proxy.cpp

src/syncevolution-session-proxy.h

templates/google.conf

tests/unittest/eds-helper-mock.h

tests/unittest/eds-helper-test.cpp

tests/unittest/sync-account-mock.h

tests/unittest/sync-queue-test.cpp

Show diffs side-by-side

added added

removed removed

src/sync-configure.h

#include <Accounts/Account>

#include "dbustypes.h"

class SyncAccount;

class SyncEvolutionSessionProxy;

class SyncConfigure : public QObject

{

Q_OBJECT

public:

SyncConfigure(Accounts::Account *account,

QSettings *settings,

SyncConfigure(SyncAccount *account,

const QSettings *settings,

QObject *parent = 0);

~SyncConfigure();

void configure(const QString &serviceName, const QString &syncMode);

void configureAll(const QString &syncMode);

QString serviceName() const;

Accounts::AccountId accountId() const;

void configure();

static QString accountSessionName(Accounts::Account *account);

static QString normalizeDBName(const QString &name);

static QString formatSourceName(uint accountId, const QString &remoteId);

static void dumpMap(const QStringMultiMap &map);

static void dumpMap(const QStringMap &map);

static void removeAccountSourceConfig(Accounts::Account *account, const QString &sourceName);

static void removeAccountConfig(uint accountId);

Q_SIGNALS:

void done();

void error();

void done(const QStringList &services);

void error(int error);

void sourceRemoved(const QString &sourceName);

public Q_SLOTS:

void onSessionStatusChanged(const QString &newStatus);

void onSessionError(uint error);

private Q_SLOTS:

void onRemoteSourcesAvailable(const QArrayOfDatabases &sources, int error);

private:

Accounts::Account *m_account;

QMap<QString, SyncEvolutionSessionProxy*> m_sessions;

QSettings *m_settings;

QStringList m_services;

QString m_originalServiceName;

QString m_syncMode;

void continueConfigure();

void configureServices(const QString &syncMode);

void configureService(const QString &serviceName, const QString &syncMode);

void removeService(const QString &serviceName);

bool configTarget(const QString &targetName, const QString &serviceName);

bool configSync(const QString &targetName, const QString &serviceName, const QString &syncMode);

bool changeSyncMode(const QString &targetName, const QString &serviceName, const QString &syncMode);

SyncAccount *m_account;

QMap<QString, QArrayOfDatabases> m_remoteDatabasesByService;

QMap<SyncEvolutionSessionProxy*, QStringList> m_peers;

const QSettings *m_settings;

void fetchRemoteCalendars();

void fetchRemoteCalendarsFromSession(SyncEvolutionSessionProxy *session);

void configurePeer(const QStringList &services);

void continuePeerConfig(SyncEvolutionSessionProxy *session, const QStringList &services);

void checkSyncConfig(SyncEvolutionSessionProxy *session,

const QString &peerName,

const QString &serviceName,

const QString &localDbId);

bool createSyncConfig(SyncEvolutionSessionProxy *session, const QString &configName, const QString &peerName, const QString &serviceName, const QString &localDbId);

QString registerDatabase(SyncEvolutionSessionProxy *session, const QString &localDatabaseName, const QString &localDatabaseId);

static bool updateConfig(QStringMultiMap &config, const QString &source, const QString &key, const QString &value);

static bool removeConfigDir(const QString &dirPath);

};

#endif

Older »