Merge lp:~online-accounts/ubuntu-system-settings-online-accounts/master into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Merge from upstream

- Add account data as search keywords (LP: #1373279)
- Delete accounts when their plugin is removed (LP: #1413542)
- More fixes for plugin confinement (LP: #1219644)
- Fail initialization if trust session cannot be setup (LP: #1420847)

Merge from upstream

- Add account data as search keywords (LP: #1373279)
- Delete accounts when their plugin is removed (LP: #1413542)
- More fixes for plugin confinement (LP: #1219644)
- Fail initialization if trust session cannot be setup (LP: #1420847)

[lp:~online-accounts/ubuntu-system-settings-online-accounts/master]

232. By Alberto Mardegan on 2015-02-18

From trunk

[ CI Train Bot ]
* Fix tests with Qt 5.4
[ Timo Jyrinki ]
* Use qt_gl_set_global_share_context with Qt 5.4 (LP: #1398372) (LP:
  #1398372)

233. By Alberto Mardegan on 2015-02-18

fix version

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:233
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/198/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1407
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-i386-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1405
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1405/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18142

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-online-accounts-ci/198/rebuild

review: Approve (continuous-integration)

[lp:~online-accounts/ubuntu-system-settings-online-accounts/master]

234. By Alberto Mardegan on 2015-02-23

Disconnect from signal

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:234
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/199/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1481
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-vivid-i386-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1314
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1479
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1479/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18264

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-online-accounts-ci/199/rebuild

review: Approve (continuous-integration)

=== modified file '.bzrignore'
--- .bzrignore	2014-12-11 12:51:46 +0000
+++ .bzrignore	2015-02-23 09:45:54 +0000
@@ -57,3 +57,4 @@
 /tests/online-accounts-ui/tst_notification
 /tests/online-accounts-ui/tst_signonui_request
 /tests/plugin/tst_application_manager
+/tests/system-settings-plugin/tst_plugin
 
=== modified file 'click-hooks/main.cpp'
--- click-hooks/main.cpp	2015-01-21 15:11:36 +0000
+++ click-hooks/main.cpp	2015-02-23 09:45:54 +0000
@@ -217,7 +217,20 @@
     }
 }
 
-static void removeStaleFiles(const QStringList &fileTypes,
+static void removeStaleAccounts(Accounts::Manager *manager,
+                                const QString &providerName)
+{
+    Q_FOREACH(Accounts::AccountId id, manager->accountList()) {
+        Accounts::Account *account = manager->account(id);
+        if (account->providerName() == providerName) {
+            account->remove();
+            account->syncAndBlock();
+        }
+    }
+}
+
+static void removeStaleFiles(Accounts::Manager *manager,
+                             const QStringList &fileTypes,
                              const QString &localShare,
                              const QDir &hooksDirIn)
 {
@@ -245,8 +258,13 @@
              * means that the click package was removed, and we must remove our
              * copy as well. */
             QString hookFileName = profile + "." + fileType;
-            if (!hooksDirIn.exists(hookFileName)) {
-                QFile::remove(fileInfo.filePath());
+            if (hooksDirIn.exists(hookFileName)) continue;
+
+            QFile::remove(fileInfo.filePath());
+            /* If this is a provider, we must also remove any accounts
+             * associated with it */
+            if (fileType == QStringLiteral("provider")) {
+                removeStaleAccounts(manager, fileInfo.completeBaseName());
             }
         }
     }
@@ -256,6 +274,12 @@
 {
     QCoreApplication app(argc, argv);
 
+    Accounts::Manager::Options managerOptions;
+    if (qgetenv("DBUS_SESSION_BUS_ADDRESS").isEmpty()) {
+        managerOptions |= Accounts::Manager::DisableNotifications;
+    }
+    Accounts::Manager *manager = new Accounts::Manager(managerOptions);
+
     /* Go through the hook files in ~/.local/share/online-accounts-hooks/ and
      * check if they have already been processed into a file under
      * ~/.local/share/accounts/{providers,services,service-types,applications}/;
@@ -274,7 +298,7 @@
         QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
     QDir hooksDirIn(localShare + "/" HOOK_FILES_SUBDIR);
 
-    removeStaleFiles(fileTypes, localShare, hooksDirIn);
+    removeStaleFiles(manager, fileTypes, localShare, hooksDirIn);
 
     Q_FOREACH(const QFileInfo &fileInfo, hooksDirIn.entryInfoList()) {
         const QString fileType = fileInfo.suffix();
@@ -320,8 +344,6 @@
     /* To ensure that all the installed services are parsed into
      * libaccounts' DB, we enumerate them now.
      */
-    Accounts::Manager *manager =
-        new Accounts::Manager(Accounts::Manager::DisableNotifications);
     manager->serviceList();
     delete manager;
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-02-11 06:39:10 +0000
+++ debian/changelog	2015-02-23 09:45:54 +0000
@@ -1,3 +1,13 @@
+ubuntu-system-settings-online-accounts (0.6+15.04.20150211-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Merge from upstream
+    - Add account data as search keywords (LP: #1373279)
+    - Delete accounts when their plugin is removed (LP: #1413542)
+    - More fixes for plugin confinement (LP: #1219644)
+    - Fail initialization if trust session cannot be setup (LP: #1420847)
+
+ -- Alberto Mardegan <[e-mail]>  Wed, 18 Feb 2015 09:34:01 +0200
+
 ubuntu-system-settings-online-accounts (0.6+15.04.20150211-0ubuntu1) vivid; urgency=medium
 
   [ CI Train Bot ]
 
=== modified file 'online-accounts-service/mir-helper-stub.cpp'
--- online-accounts-service/mir-helper-stub.cpp	2014-11-25 13:34:16 +0000
+++ online-accounts-service/mir-helper-stub.cpp	2015-02-23 09:45:54 +0000
@@ -40,7 +40,11 @@
 
 QString PromptSession::requestSocket()
 {
+#ifdef BUILDING_TESTS
+    return QString::fromUtf8(qgetenv("TEST_MIR_HELPER_SOCKET"));
+#else
     return QString();
+#endif
 }
 
 MirHelper::MirHelper(QObject *parent):
@@ -65,5 +69,10 @@
 PromptSessionP MirHelper::createPromptSession(pid_t initiatorPid)
 {
     Q_UNUSED(initiatorPid);
+#ifdef BUILDING_TESTS
+    return qgetenv("TEST_MIR_HELPER_FAIL_CREATE").isEmpty() ?
+        PromptSessionP(new PromptSession(0)) : PromptSessionP();
+#else
     return PromptSessionP();
+#endif
 }
 
=== modified file 'online-accounts-service/mir-helper.h'
--- online-accounts-service/mir-helper.h	2014-11-21 13:50:15 +0000
+++ online-accounts-service/mir-helper.h	2015-02-23 09:45:54 +0000
@@ -27,6 +27,7 @@
 namespace OnlineAccountsUi {
 
 class PromptSessionPrivate;
+class MirHelper;
 class MirHelperPrivate;
 
 class PromptSession: public QObject
@@ -45,6 +46,7 @@
     explicit PromptSession(PromptSessionPrivate *priv);
 
 private:
+    friend class MirHelper;
     friend class MirHelperPrivate;
     PromptSessionPrivate *d_ptr;
     Q_DECLARE_PRIVATE(PromptSession)
 
=== modified file 'online-accounts-service/ui-proxy.cpp'
--- online-accounts-service/ui-proxy.cpp	2015-02-03 10:21:46 +0000
+++ online-accounts-service/ui-proxy.cpp	2015-02-23 09:45:54 +0000
@@ -225,6 +225,8 @@
 {
     Q_Q(UiProxy);
 
+    if (!m_clientPid) return false;
+
     PromptSessionP session =
         MirHelper::instance()->createPromptSession(m_clientPid);
     if (!session) return false;
@@ -246,15 +248,20 @@
 
 bool UiProxyPrivate::init()
 {
-    m_arguments.clear();
-    if (!m_promptSession) {
-        /* the first argument is required to be the desktop file */
-        m_arguments.append("--desktop_file_hint=/usr/share/applications/online-accounts-ui.desktop");
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+    if (env.value("QT_QPA_PLATFORM").startsWith("ubuntu")) {
+        if (!setupPromptSession()) {
+            qWarning() << "Couldn't setup prompt session";
+            return false;
+        }
     }
 
-    if (m_clientPid) {
-        setupPromptSession();
-    }
+    /* We also create ~/cache/online-accounts-ui/, since the plugin might not
+     * have permissions to do that. */
+    QString userCacheDir =
+        QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation);
+    QDir cacheDir(userCacheDir + "/online-accounts-ui");
+    if (!cacheDir.exists()) cacheDir.mkpath(".");
 
     return true;
 }
@@ -313,15 +320,6 @@
         m_arguments.prepend(accountsUi);
     }
 
-    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-    if (env.value("QT_QPA_PLATFORM").startsWith("ubuntu")) {
-        if (!setupPromptSession()) {
-            qWarning() << "Couldn't setup prompt session";
-            setStatus(UiProxy::Error);
-            return;
-        }
-    }
-
     setStatus(UiProxy::Loading);
     m_process.start(processName, m_arguments);
     if (Q_UNLIKELY(!m_process.waitForStarted())) {
 
=== modified file 'online-accounts-ui/browser-request.cpp'
--- online-accounts-ui/browser-request.cpp	2015-01-09 10:12:03 +0000
+++ online-accounts-ui/browser-request.cpp	2015-02-23 09:45:54 +0000
@@ -265,6 +265,8 @@
     Q_Q(BrowserRequest);
 
     DEBUG() << "Browser dialog closed";
+    QObject::disconnect(m_dialog, SIGNAL(finished(int)),
+                        this, SLOT(onFinished()));
 
     QVariantMap reply;
     QUrl url = m_responseUrl.isEmpty() ? m_currentUrl : m_responseUrl;
 
=== modified file 'online-accounts-ui/signonui-request.cpp'
--- online-accounts-ui/signonui-request.cpp	2015-01-14 09:31:14 +0000
+++ online-accounts-ui/signonui-request.cpp	2015-02-23 09:45:54 +0000
@@ -33,6 +33,8 @@
 #include <SignOn/uisessiondata.h>
 #include <SignOn/uisessiondata_priv.h>
 #include <sys/apparmor.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 using namespace SignOnUi;
 
@@ -135,6 +137,13 @@
     if (profile == "unconfined" &&
         parameters.contains(SSOUI_KEY_PID)) {
         pid_t pid = parameters.value(SSOUI_KEY_PID).toUInt();
+        if (pid == getpid()) {
+            /* If the request was initiated by our own process, we might not
+             * have the rights to call the aa_* functions (we might be
+             * confined). */
+            return QString();
+        }
+
         char *con = NULL, *mode = NULL;
         int ret = aa_gettaskcon(pid, &con, &mode);
         if (Q_LIKELY(ret >= 0)) {
 
=== modified file 'system-settings-plugin/online-accounts.settings'
--- system-settings-plugin/online-accounts.settings	2014-09-24 19:05:32 +0000
+++ system-settings-plugin/online-accounts.settings	2015-02-23 09:45:54 +0000
@@ -14,14 +14,10 @@
         "access",
         "authorize",
         "revoke",
-        "web",
-        "facebook",
-        "twitter",
-        "flickr",
-        "google",
-        "gmail"
+        "web"
     ],
     "has-dynamic-keywords": true,
     "has-dynamic-visibility": false,
+    "plugin": "online-accounts",
     "page-component": "MainPage.qml"
 }
 
=== added file 'system-settings-plugin/plugin.cpp'
--- system-settings-plugin/plugin.cpp	1970-01-01 00:00:00 +0000
+++ system-settings-plugin/plugin.cpp	2015-02-23 09:45:54 +0000
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "plugin.h"
+
+#include <Accounts/Account>
+#include <Accounts/Manager>
+#include <Accounts/Provider>
+#include <Accounts/Service>
+#include <QDebug>
+#include <QStringList>
+#include <SystemSettings/ItemBase>
+#include <libintl.h>
+
+using namespace SystemSettings;
+
+class Item: public ItemBase
+{
+    Q_OBJECT
+
+public:
+    Item(const QVariantMap &staticData, QObject *parent = 0);
+    ~Item();
+
+private:
+    void computeKeywords();
+};
+
+Item::Item(const QVariantMap &staticData, QObject *parent):
+    ItemBase(staticData, parent)
+{
+    computeKeywords();
+}
+
+Item::~Item()
+{
+}
+
+static QStringList translations(const QString &text, const QString &domain)
+{
+    /* Return a list of keywords based on a translatable name:
+     * - the untranslated text (lowercase, split into words)
+     * - the translated text (lowercase, split into words)
+     */
+    QStringList keys;
+    keys = text.toLower().split(" ", QString::SkipEmptyParts);
+    if (!domain.isEmpty()) {
+        QByteArray baText = text.toUtf8();
+        QByteArray baDomain = domain.toUtf8();
+        QString translated = QString::fromUtf8(dgettext(baDomain.constData(),
+                                                        baText.constData()));
+        if (translated != text) {
+            keys.append(translated.toLower().split(" ",
+                                                   QString::SkipEmptyParts));
+        }
+    }
+    return keys;
+}
+
+void Item::computeKeywords()
+{
+    Accounts::Manager *manager = new Accounts::Manager;
+
+    QStringList keywords;
+
+    /* List available providers, and add their names to the search keywords */
+    Q_FOREACH(const Accounts::Provider &provider, manager->providerList()) {
+        keywords.append(provider.name().toLower());
+        keywords.append(translations(provider.displayName(),
+                                     provider.trCatalog()));
+    }
+
+    /* Same for services */
+    Q_FOREACH(const Accounts::Service &service, manager->serviceList()) {
+        keywords.append(service.name().toLower());
+        keywords.append(translations(service.displayName(),
+                                     service.trCatalog()));
+    }
+
+    /* Also add the account display names */
+    Q_FOREACH(Accounts::AccountId id, manager->accountList()) {
+        Accounts::Account *account = manager->account(id);
+        if (Q_UNLIKELY(!account)) continue;
+        QString name = account->displayName().toLower();
+        if (!name.isEmpty()) {
+            keywords.append(name);
+        }
+    }
+
+    delete manager;
+
+    setKeywords(keywords);
+}
+
+ItemBase *Plugin::createItem(const QVariantMap &staticData,
+                             QObject *parent)
+{
+    return new Item(staticData, parent);
+}
+
+#include "plugin.moc"
 
=== added file 'system-settings-plugin/plugin.h'
--- system-settings-plugin/plugin.h	1970-01-01 00:00:00 +0000
+++ system-settings-plugin/plugin.h	2015-02-23 09:45:54 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ONLINE_ACCOUNTS_SYSTEM_SETTINGS_PLUGIN_H
+#define ONLINE_ACCOUNTS_SYSTEM_SETTINGS_PLUGIN_H
+
+#include <QObject>
+#include <SystemSettings/PluginInterface>
+
+class Plugin: public QObject, public SystemSettings::PluginInterface2
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.ubuntu.SystemSettings.PluginInterface/2.0")
+    Q_INTERFACES(SystemSettings::PluginInterface2)
+
+public:
+    SystemSettings::ItemBase *createItem(const QVariantMap &staticData,
+                                         QObject *parent = 0);
+};
+
+#endif // ONLINE_ACCOUNTS_SYSTEM_SETTINGS_PLUGIN_H
 
=== modified file 'system-settings-plugin/system-settings-plugin.pro'
--- system-settings-plugin/system-settings-plugin.pro	2014-08-13 13:11:06 +0000
+++ system-settings-plugin/system-settings-plugin.pro	2015-02-23 09:45:54 +0000
@@ -1,7 +1,27 @@
 include(../common-project-config.pri)
 include($${TOP_SRC_DIR}/common-vars.pri)
 
-TEMPLATE=aux
+TEMPLATE=lib
+TARGET = online-accounts
+
+CONFIG += \
+    link_pkgconfig \
+    plugin \
+    qt
+
+QT += \
+    core \
+    qml
+
+PKGCONFIG += \
+    SystemSettings \
+    accounts-qt5
+
+SOURCES += \
+    plugin.cpp
+
+HEADERS += \
+    plugin.h
 
 QML_SOURCES = \
     AccountEditPage.qml \
@@ -19,6 +39,9 @@
 settings.path = $${PLUGIN_MANIFEST_DIR}
 INSTALLS += settings
 
+target.path = $${PLUGIN_MODULE_DIR}
+INSTALLS += target
+
 image.files = settings-accounts.svg
 image.path = $${PLUGIN_MANIFEST_DIR}/icons
 INSTALLS += image
 
=== modified file 'tests/click-hooks/click-hooks.pro'
--- tests/click-hooks/click-hooks.pro	2014-05-16 09:42:06 +0000
+++ tests/click-hooks/click-hooks.pro	2015-02-23 09:45:54 +0000
@@ -3,13 +3,17 @@
 TARGET = tst_online_accounts_hooks
 
 CONFIG += \
-    debug
+    debug \
+    link_pkgconfig
 
 QT += \
     core \
     testlib \
     xml
 
+PKGCONFIG += \
+    accounts-qt5
+
 DEFINES += \
     DEBUG_ENABLED \
     HOOK_PROCESS=\\\"../../click-hooks/online-accounts-hooks\\\"
 
=== modified file 'tests/click-hooks/tst_online_accounts_hooks.cpp'
--- tests/click-hooks/tst_online_accounts_hooks.cpp	2014-11-04 12:26:46 +0000
+++ tests/click-hooks/tst_online_accounts_hooks.cpp	2015-02-23 09:45:54 +0000
@@ -18,6 +18,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <Accounts/Account>
+#include <Accounts/Manager>
 #include <QDebug>
 #include <QDir>
 #include <QDomDocument>
@@ -42,6 +44,7 @@
     void testValidHooks_data();
     void testValidHooks();
     void testRemoval();
+    void testAccountRemoval();
     void testUpdate();
     void testDesktopEntry_data();
     void testDesktopEntry();
@@ -139,6 +142,8 @@
 {
     qputenv("XDG_DATA_HOME", TEST_DIR);
     qputenv("OAH_CLICK_DIR", m_packageDir.path().toUtf8());
+    qputenv("ACCOUNTS", TEST_DIR);
+
     // The hook must be able to run without a D-Bus session
     qunsetenv("DBUS_SESSION_BUS_ADDRESS");
 
@@ -377,6 +382,64 @@
     QVERIFY(m_installDir.exists(noProfile));
 }
 
+void OnlineAccountsHooksTest::testAccountRemoval()
+{
+    clearHooksDir();
+    clearInstallDir();
+
+    Accounts::Manager *manager =
+        new Accounts::Manager(Accounts::Manager::DisableNotifications);
+
+    QString stillInstalled("providers/com.ubuntu.test_StillInstalled.provider");
+    writeInstalledFile(stillInstalled,
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+        "<provider>\n"
+        "  <profile>com-ubuntu.test_StillInstalled_2.0</profile>\n"
+        "</provider>");
+    QVERIFY(m_installDir.exists(stillInstalled));
+
+    writeHookFile("com-ubuntu.test_StillInstalled_2.0.provider",
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+        "<provider>\n"
+        "</provider>");
+
+    Accounts::Account *account =
+        manager->createAccount("com.ubuntu.test_StillInstalled");
+    account->setDisplayName("Still alive");
+    account->syncAndBlock();
+    Accounts::AccountId idPreserved = account->id();
+    QVERIFY(idPreserved > 0);
+
+    QString myProvider("providers/com.ubuntu.test_MyProvider.provider");
+    writeInstalledFile(myProvider,
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+        "<provider>\n"
+        "  <profile>com-ubuntu.test_MyProvider_3.0</profile>\n"
+        "</provider>");
+    QVERIFY(m_installDir.exists(myProvider));
+
+    account = manager->createAccount("com.ubuntu.test_MyProvider");
+    account->setDisplayName("Must die");
+    account->syncAndBlock();
+    Accounts::AccountId idRemoved = account->id();
+    QVERIFY(idRemoved > 0);
+
+    delete manager;
+
+    QVERIFY(runHookProcess());
+
+    QVERIFY(m_installDir.exists(stillInstalled));
+    QVERIFY(!m_installDir.exists(myProvider));
+
+    manager = new Accounts::Manager(Accounts::Manager::DisableNotifications);
+    account = manager->account(idPreserved);
+    QVERIFY(account != 0);
+    account = manager->account(idRemoved);
+    QVERIFY(account == 0);
+
+    delete manager;
+}
+
 void OnlineAccountsHooksTest::testUpdate()
 {
     clearHooksDir();
 
=== modified file 'tests/online-accounts-service/tst_ui_proxy.cpp'
--- tests/online-accounts-service/tst_ui_proxy.cpp	2014-12-03 13:42:09 +0000
+++ tests/online-accounts-service/tst_ui_proxy.cpp	2015-02-23 09:45:54 +0000
@@ -204,6 +204,8 @@
     void testRequestDelay();
     void testHandler();
     void testWrapper();
+    void testTrustSessionError_data();
+    void testTrustSessionError();
 
 private:
     QDBusConnection m_connection;
@@ -477,6 +479,43 @@
     delete proxy;
 }
 
+void UiProxyTest::testTrustSessionError_data()
+{
+    QTest::addColumn<int>("clientPid");
+    QTest::addColumn<QString>("envVar");
+    QTest::addColumn<bool>("expectSuccess");
+
+    QTest::newRow("PID 0") << 0 << "" << false;
+
+    QTest::newRow("fail creation") << 4 <<
+        "TEST_MIR_HELPER_FAIL_CREATE=1" << false;
+
+    QTest::newRow("return empty socket") << 4 <<
+        "" << false;
+
+    QTest::newRow("success") << 4 <<
+        "TEST_MIR_HELPER_SOCKET=something" << true;
+}
+
+void UiProxyTest::testTrustSessionError()
+{
+    QFETCH(int, clientPid);
+    QFETCH(QString, envVar);
+    QFETCH(bool, expectSuccess);
+
+    qputenv("QT_QPA_PLATFORM", "ubuntu-something");
+
+    QStringList envVarSplit = envVar.split('=');
+    QByteArray envVarKey = envVarSplit.value(0, "").toUtf8();
+    QByteArray envVarValue = envVarSplit.value(1, "").toUtf8();
+    qputenv(envVarKey.constData(), envVarValue);
+    UiProxy *proxy = new UiProxy(clientPid, this);
+    QCOMPARE(proxy->init(), expectSuccess);
+    delete proxy;
+
+    qunsetenv(envVarKey.constData());
+}
+
 QTEST_MAIN(UiProxyTest);
 
 #include "tst_ui_proxy.moc"
 
=== modified file 'tests/online-accounts-service/tst_ui_proxy.pro'
--- tests/online-accounts-service/tst_ui_proxy.pro	2014-12-08 16:22:39 +0000
+++ tests/online-accounts-service/tst_ui_proxy.pro	2015-02-23 09:45:54 +0000
@@ -13,6 +13,7 @@
     testlib
 
 DEFINES += \
+    BUILDING_TESTS \
     INSTALL_BIN_DIR=\\\"$${INSTALL_PREFIX}/bin\\\"
 
 PKGCONFIG += \
 
=== added directory 'tests/system-settings-plugin'
=== added file 'tests/system-settings-plugin/system-settings-plugin.pro'
--- tests/system-settings-plugin/system-settings-plugin.pro	1970-01-01 00:00:00 +0000
+++ tests/system-settings-plugin/system-settings-plugin.pro	2015-02-23 09:45:54 +0000
@@ -0,0 +1,32 @@
+include(../../common-project-config.pri)
+
+TARGET = tst_plugin
+
+CONFIG += \
+    debug \
+    link_pkgconfig
+
+QT += \
+    core \
+    qml \
+    testlib
+
+PKGCONFIG += \
+    SystemSettings \
+    accounts-qt5
+
+SYSTEM_SETTINGS_PLUGIN_DIR = $${TOP_SRC_DIR}/system-settings-plugin
+
+INCLUDEPATH += \
+    $${SYSTEM_SETTINGS_PLUGIN_DIR}
+
+SOURCES += \
+    $${SYSTEM_SETTINGS_PLUGIN_DIR}/plugin.cpp \
+    tst_plugin.cpp
+
+HEADERS += \
+    $${SYSTEM_SETTINGS_PLUGIN_DIR}/plugin.h
+
+check.commands = "xvfb-run -s '-screen 0 640x480x24' -a dbus-test-runner -t ./$${TARGET}"
+check.depends = $${TARGET}
+QMAKE_EXTRA_TARGETS += check
 
=== added file 'tests/system-settings-plugin/tst_plugin.cpp'
--- tests/system-settings-plugin/tst_plugin.cpp	1970-01-01 00:00:00 +0000
+++ tests/system-settings-plugin/tst_plugin.cpp	2015-02-23 09:45:54 +0000
@@ -0,0 +1,292 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This file is part of online-accounts-ui
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <Accounts/Account>
+#include <Accounts/Manager>
+
+#include <QDebug>
+#include <QDir>
+#include <QDomDocument>
+#include <QDomElement>
+#include <QFile>
+#include <QSignalSpy>
+#include <QTemporaryDir>
+#include <QTest>
+
+#include <SystemSettings/ItemBase>
+
+#include "plugin.h"
+
+namespace QTest {
+template<>
+char *toString(const QSet<QString> &set)
+{
+    QByteArray ba = "QSet<QString>(";
+    QStringList list = set.toList();
+    ba += list.join(", ");
+    ba += ")";
+    return qstrdup(ba.data());
+}
+} // QTest namespace
+
+/* mocking libintl { */
+static QHash<QString,QHash<QByteArray,QByteArray> > m_translations;
+extern "C" {
+char *dgettext(const char *domainname, const char *msgid)
+{
+    return (char *)m_translations[domainname].value(msgid).data();
+}
+char *dcgettext(const char *__domainname, const char *__msgid, int __category)
+{
+    Q_UNUSED(__category);
+    return dgettext(__domainname, __msgid);
+}
+} // extern C
+/* } mocking libintl */
+
+class PluginTest: public QObject
+{
+    Q_OBJECT
+
+    struct FileData {
+        FileData() {}
+        FileData(const QString &name, const QString &domain):
+            name(name), domain(domain) {}
+        QString name;
+        QString domain;
+    };
+
+public:
+    PluginTest();
+
+private Q_SLOTS:
+    void testKeywords_data();
+    void testKeywords();
+
+private:
+    void setDataDir(const QTemporaryDir &dir);
+    void writeProvider(const QString &id, const QString &name,
+                       const QString &domain);
+    void writeService(const QString &id, const QString &name,
+                      const QString &domain);
+    void writeLibaccountsFile(const QString &type, const QString &id,
+                              const QString &name, const QString &domain);
+    void createAccount(const QString &name);
+
+private:
+    QHash<QString,FileData> m_providersData;
+    QHash<QString,FileData> m_servicesData;
+    QDir m_dataDir;
+};
+
+PluginTest::PluginTest():
+    QObject(0)
+{
+    m_providersData["provider_noname"] = FileData("", "");
+    m_providersData["provider_nodomain"] = FileData("Happy", "");
+    m_providersData["provider_translated"] = FileData("Joyful", "translations1");
+
+    m_servicesData["service_nodomain"] = FileData("Sad", "");
+    m_servicesData["service_translated"] = FileData("Depressed", "translations1");
+    m_servicesData["service_translated2"] = FileData("Depressed", "translations2");
+
+    m_translations["translations1"]["Happy"] = "Contento";
+    m_translations["translations1"]["Joyful"] = "Gioioso";
+    m_translations["translations1"]["Sad"] = "Triste";
+    m_translations["translations1"]["Depressed"] = "Depresso1";
+    m_translations["translations1"]["Black"] = "Nero";
+    m_translations["translations1"]["White"] = "Bianco";
+
+    m_translations["translations2"]["Depressed"] = "Depresso2";
+}
+
+void PluginTest::setDataDir(const QTemporaryDir &dir)
+{
+    QVERIFY(dir.isValid());
+
+    m_dataDir = QDir(dir.path());
+
+    QByteArray dataPath = dir.path().toUtf8();
+    qputenv("ACCOUNTS", dataPath);
+    qputenv("AG_PROVIDERS", dataPath);
+    qputenv("AG_SERVICES", dataPath);
+}
+
+void PluginTest::writeProvider(const QString &id, const QString &name,
+                               const QString &domain)
+{
+    writeLibaccountsFile("provider", id, name, domain);
+}
+
+void PluginTest::writeService(const QString &id, const QString &name,
+                              const QString &domain)
+{
+    writeLibaccountsFile("service", id, name, domain);
+}
+
+void PluginTest::writeLibaccountsFile(const QString &type, const QString &id,
+                                      const QString &name, const QString &domain)
+{
+    QDomDocument doc;
+    QDomElement root = doc.createElement(type);
+    root.setAttribute("id", id);
+    doc.appendChild(root);
+
+    QDomElement nameTag = doc.createElement("name");
+    nameTag.appendChild(doc.createTextNode(name));
+    root.appendChild(nameTag);
+
+    QDomElement domainTag = doc.createElement("translations");
+    domainTag.appendChild(doc.createTextNode(domain));
+    root.appendChild(domainTag);
+
+    if (type == "service") {
+        QDomElement typeTag = doc.createElement("type");
+        typeTag.appendChild(doc.createTextNode("something"));
+        root.appendChild(typeTag);
+    }
+
+    QFile file(m_dataDir.filePath(id + "." + type));
+    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+        qWarning() << "Could not write file" << file.fileName();
+        return;
+    }
+
+    file.write(doc.toString().toUtf8());
+}
+
+void PluginTest::createAccount(const QString &name)
+{
+    Accounts::Manager *manager = new Accounts::Manager;
+
+    Accounts::Account *account = manager->createAccount("any");
+    account->setDisplayName(name);
+    account->syncAndBlock();
+
+    delete manager;
+}
+
+void PluginTest::testKeywords_data()
+{
+    QTest::addColumn<QStringList>("providers");
+    QTest::addColumn<QStringList>("services");
+    QTest::addColumn<QStringList>("accountNames");
+    QTest::addColumn<QStringList>("keywords");
+
+    QTest::newRow("provider, no name") <<
+        (QStringList() << "provider_noname") <<
+        QStringList() <<
+        QStringList() <<
+        (QStringList() << "provider_noname");
+
+    QTest::newRow("provider, untranslated") <<
+        (QStringList() << "provider_nodomain") <<
+        QStringList() <<
+        QStringList() <<
+        (QStringList() << "provider_nodomain" << "happy");
+
+    QTest::newRow("provider, translated") <<
+        (QStringList() << "provider_translated") <<
+        QStringList() <<
+        QStringList() <<
+        (QStringList() << "provider_translated" << "joyful" << "gioioso");
+
+    QTest::newRow("service, untranslated") <<
+        QStringList() <<
+        (QStringList() << "service_nodomain") <<
+        QStringList() <<
+        (QStringList() << "service_nodomain" << "sad");
+
+    QTest::newRow("service, translated 1") <<
+        QStringList() <<
+        (QStringList() << "service_translated") <<
+        QStringList() <<
+        (QStringList() << "service_translated" << "depressed" << "depresso1");
+
+    QTest::newRow("service, translated 2") <<
+        QStringList() <<
+        (QStringList() << "service_translated2") <<
+        QStringList() <<
+        (QStringList() << "service_translated2" << "depressed" << "depresso2");
+
+    QTest::newRow("one account, one word") <<
+        QStringList() <<
+        QStringList() <<
+        (QStringList() << "[e-mail]") <<
+        (QStringList() << "[e-mail]");
+
+    QTest::newRow("one account, many words") <<
+        QStringList() <<
+        QStringList() <<
+        (QStringList() << "My little sweet account") <<
+        (QStringList() << "my little sweet account");
+
+    QTest::newRow("combined") <<
+        (QStringList() << "provider_translated" << "provider_nodomain") <<
+        (QStringList() << "service_translated" << "service_translated2") <<
+        (QStringList() << "john@invalid" << "[e-mail]") <<
+        (QStringList() << "provider_translated" << "joyful" << "gioioso" <<
+         "provider_nodomain" << "happy" <<
+         "service_translated" << "depressed" << "depresso1" <<
+         "service_translated2" << "depressed" << "depresso2" <<
+         "john@invalid" << "[e-mail]");
+}
+
+void PluginTest::testKeywords()
+{
+    QFETCH(QStringList, providers);
+    QFETCH(QStringList, services);
+    QFETCH(QStringList, accountNames);
+    QFETCH(QStringList, keywords);
+
+    QTemporaryDir dataDir;
+
+    setDataDir(dataDir);
+
+    /* Create the needed files */
+    Q_FOREACH(const QString &providerId, providers) {
+        writeProvider(providerId,
+                      m_providersData[providerId].name,
+                      m_providersData[providerId].domain);
+    }
+
+    Q_FOREACH(const QString &serviceId, services) {
+        writeService(serviceId,
+                     m_servicesData[serviceId].name,
+                     m_servicesData[serviceId].domain);
+    }
+
+    /* create the accounts */
+    Q_FOREACH(const QString &displayName, accountNames) {
+        createAccount(displayName);
+    }
+
+    /* Now do the actual test */
+    Plugin plugin;
+
+    SystemSettings::ItemBase *item = plugin.createItem(QVariantMap());
+    QStringList pluginKeywords = item->keywords();
+
+    QCOMPARE(pluginKeywords.toSet(), keywords.toSet());
+}
+
+QTEST_MAIN(PluginTest);
+
+#include "tst_plugin.moc"
 
=== modified file 'tests/tests.pro'
--- tests/tests.pro	2014-10-03 14:56:11 +0000
+++ tests/tests.pro	2015-02-23 09:45:54 +0000
@@ -5,4 +5,5 @@
     client \
     online-accounts-service \
     online-accounts-ui \
-    plugin
+    plugin \
+    system-settings-plugin