Merge lp:~mardy/accounts-qml-module/packaging into lp:accounts-qml-module

[Alberto Mardegan]

Add filter on application to AccountServiceModel.

Merge from upstream: add filter on application to AccountServiceModel.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:48
http://jenkins.qa.ubuntu.com/job/accounts-qml-module-ci/34/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/accounts-qml-module-utopic-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/accounts-qml-module-utopic-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/accounts-qml-module-utopic-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/accounts-qml-module-ci/34/rebuild

review: Approve (continuous-integration)

[David Barth (dbarth)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-17 16:41:50 +0000
+++ debian/changelog	2014-05-12 08:03:03 +0000
@@ -1,3 +1,9 @@
+accounts-qml-module (0.4+14.04.20140512-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge from upstream: add filter on application to AccountServiceModel.
+
+ -- Alberto Mardegan <[e-mail]>  Mon, 12 May 2014 10:58:53 +0300
+
 accounts-qml-module (0.4+14.04.20140317-0ubuntu1) trusty; urgency=low
 
   [ Colin Watson ]

=== modified file 'src/account-service-model.cpp'
--- src/account-service-model.cpp	2014-01-30 13:25:22 +0000
+++ src/account-service-model.cpp	2014-05-12 08:03:03 +0000
@@ -22,6 +22,7 @@
 
 #include <Accounts/Account>
 #include <Accounts/AccountService>
+#include <Accounts/Application>
 #include <Accounts/Manager>
 #include <QPointer>
 
@@ -84,12 +85,14 @@
     bool updateQueued;
     bool accountIdChanged;
     bool accountChanged;
+    bool applicationIdChanged;
     bool providerChanged;
     bool serviceTypeChanged;
     bool serviceChanged;
     bool includeDisabled;
     Accounts::AccountId accountId;
     QPointer<Accounts::Account> account;
+    Accounts::Application application;
     QString providerId;
     QString serviceTypeId;
     QString serviceId;
@@ -146,6 +149,8 @@
     } else {
         foreach (Accounts::Service service, account->services()) {
             if (!serviceId.isEmpty() && service.name() != serviceId) continue;
+            if (application.isValid() &&
+                application.serviceUsage(service).isEmpty()) continue;
             ret.append(new Accounts::AccountService(account, service));
         }
     }
@@ -634,6 +639,34 @@
 }
 
 /*!
+ * \qmlproperty string AccountServiceModel::applicationId
+ * If set, the model will only show those account services which are relevant
+ * for the given \a applicationId. This means that an account service will only
+ * be shown if it can be used by the application, as described in the
+ * application's manifest file.
+ */
+void AccountServiceModel::setApplicationId(const QString &applicationId)
+{
+    Q_D(AccountServiceModel);
+
+    if (applicationId == d->application.name()) return;
+    if (applicationId.isEmpty()) {
+        d->application = Accounts::Application();
+    } else {
+        d->application = SharedManager::instance()->application(applicationId);
+    }
+    d->applicationIdChanged = true;
+    d->queueUpdate();
+    Q_EMIT applicationIdChanged();
+}
+
+QString AccountServiceModel::applicationId() const
+{
+    Q_D(const AccountServiceModel);
+    return d->application.name();
+}
+
+/*!
  * \qmlproperty string AccountServiceModel::provider
  * If set, the model will list only those accounts services provided by this provider.
  */

=== modified file 'src/account-service-model.h'
--- src/account-service-model.h	2013-06-24 09:12:35 +0000
+++ src/account-service-model.h	2014-05-12 08:03:03 +0000
@@ -38,6 +38,8 @@
                NOTIFY accountIdChanged)
     Q_PROPERTY(QObject *account READ account WRITE setAccount \
                NOTIFY accountChanged)
+    Q_PROPERTY(QString applicationId READ applicationId \
+               WRITE setApplicationId NOTIFY applicationIdChanged)
     Q_PROPERTY(QString provider READ provider WRITE setProvider \
                NOTIFY providerChanged)
     Q_PROPERTY(QString serviceType READ serviceType WRITE setServiceType \
@@ -70,6 +72,9 @@
     void setAccount(QObject *account);
     QObject *account() const;
 
+    void setApplicationId(const QString &applicationId);
+    QString applicationId() const;
+
     void setProvider(const QString &providerId);
     QString provider() const;
 
@@ -94,6 +99,7 @@
     void includeDisabledChanged();
     void accountIdChanged();
     void accountChanged();
+    void applicationIdChanged();
     void providerChanged();
     void serviceTypeChanged();
     void serviceChanged();

=== modified file 'tests/tst_plugin.cpp'
--- tests/tst_plugin.cpp	2014-01-30 13:25:22 +0000
+++ tests/tst_plugin.cpp	2014-05-12 08:03:03 +0000
@@ -261,6 +261,21 @@
     QCOMPARE(model->property("account").value<QObject*>(), account2);
     model->setProperty("account", QVariant::fromValue<QObject*>(0));
 
+    /* Test the application filter */
+    model->setProperty("applicationId", QString("mailer"));
+    QCOMPARE(model->property("applicationId").toString(), QString("mailer"));
+    QTest::qWait(10);
+    QCOMPARE(model->rowCount(), 2);
+    QSet<QString> services;
+    services.insert(get(model, 0, "serviceName").toString());
+    services.insert(get(model, 1, "serviceName").toString());
+    QSet<QString> expectedServices;
+    expectedServices.insert("Cool Mail");
+    expectedServices.insert("Bad Mail");
+    QCOMPARE(services, expectedServices);
+    /* Reset the application filter */
+    model->setProperty("applicationId", QString());
+
     /* Test the provider filter */
     model->setProperty("provider", QString("bad"));
     QCOMPARE(model->property("provider").toString(), QString("bad"));