Merge lp:~mardy/online-accounts-api/ready-1513075 into lp:online-accounts-api

[Alberto Mardegan]

Add a property to signal when the account model is ready.

Add a property to signal when the account model is ready.

=== modified file 'src/lib/Ubuntu/OnlineAccounts.2/account_model.cpp'
--- src/lib/Ubuntu/OnlineAccounts.2/account_model.cpp	2015-10-30 15:35:40 +0000
+++ src/lib/Ubuntu/OnlineAccounts.2/account_model.cpp	2016-01-18 12:31:53 +0000
@@ -60,6 +60,7 @@
     QList<Account*> m_accounts;
     QString m_applicationId;
     QString m_serviceId;
+    bool m_isReady;
     bool m_updateQueued;
     bool m_applicationIdChanged;
     bool m_serviceIdChanged;
@@ -71,6 +72,7 @@
 AccountModelPrivate::AccountModelPrivate(AccountModel *q):
     QObject(q),
     m_manager(0),
+    m_isReady(false),
     m_updateQueued(true), // because componentComplete will be called
     m_applicationIdChanged(false),
     m_serviceIdChanged(false),
@@ -87,10 +89,17 @@
 
 void AccountModelPrivate::queueUpdate()
 {
+    Q_Q(AccountModel);
+
     if (m_updateQueued) return;
 
     m_updateQueued = true;
     QMetaObject::invokeMethod(this, "update", Qt::QueuedConnection);
+
+    if (m_isReady) {
+        m_isReady = false;
+        Q_EMIT q->isReadyChanged();
+    }
 }
 
 void AccountModelPrivate::updateAccountList()
@@ -106,6 +115,9 @@
     }
     q->endResetModel();
     Q_EMIT q->accountListChanged();
+
+    m_isReady = true;
+    Q_EMIT q->isReadyChanged();
 }
 
 Account *AccountModelPrivate::handleAccount(OnlineAccounts::Account *account)
@@ -296,6 +308,21 @@
 }
 
 /*!
+ * \qmlproperty bool AccountModel::ready
+ *
+ * Whether the model is up to date: retrieving the account list is an
+ * asynchronous operation, and therefore short delays are expected between
+ * changing one model parameter and receiving the updated account list.
+ * Applications should not rely on the model contents while this property is
+ * false.
+ */
+bool AccountModel::isReady() const
+{
+    Q_D(const AccountModel);
+    return d->m_isReady;
+}
+
+/*!
  * \qmlproperty string AccountModel::applicationId
  *
  * The short application identifier (that is, the \c APP_ID minus the version

=== modified file 'src/lib/Ubuntu/OnlineAccounts.2/account_model.h'
--- src/lib/Ubuntu/OnlineAccounts.2/account_model.h	2015-09-23 08:23:49 +0000
+++ src/lib/Ubuntu/OnlineAccounts.2/account_model.h	2016-01-18 12:31:53 +0000
@@ -36,6 +36,7 @@
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
     Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
+    Q_PROPERTY(bool ready READ isReady NOTIFY isReadyChanged)
     Q_PROPERTY(QString applicationId READ applicationId \
                WRITE setApplicationId NOTIFY applicationIdChanged)
     Q_PROPERTY(QString serviceId READ serviceId \
@@ -57,6 +58,8 @@
     explicit AccountModel(QObject *parent = 0);
     ~AccountModel();
 
+    bool isReady() const;
+
     void setApplicationId(const QString &applicationId);
     QString applicationId() const;
 
@@ -79,6 +82,7 @@
     void componentComplete() Q_DECL_OVERRIDE;
 
 Q_SIGNALS:
+    void isReadyChanged();
     void countChanged();
     void applicationIdChanged();
     void serviceIdChanged();

=== modified file 'tests/lib/qml_module/tst_qml_module.cpp'
--- tests/lib/qml_module/tst_qml_module.cpp	2015-10-30 15:35:40 +0000
+++ tests/lib/qml_module/tst_qml_module.cpp	2016-01-18 12:31:53 +0000
@@ -151,6 +151,8 @@
     QVERIFY(object->setProperty("serviceId", "bar"));
     QCOMPARE(object->property("serviceId").toString(), QString("bar"));
 
+    QCOMPARE(object->property("ready").toBool(), false);
+
     delete object;
 }
 
@@ -201,7 +203,13 @@
     QAbstractListModel *model = qobject_cast<QAbstractListModel*>(object);
     QVERIFY(model != 0);
 
-    QTRY_COMPARE(model->rowCount(), 1);
+    QCOMPARE(object->property("ready").toBool(), false);
+    QSignalSpy ready(object, SIGNAL(isReadyChanged()));
+
+    ready.wait();
+    QCOMPARE(object->property("ready").toBool(), true);
+
+    QCOMPARE(model->rowCount(), 1);
     QCOMPARE(model->data(model->index(0), Qt::DisplayRole).toString(),
              QString("%1 - %2").arg(displayName).arg(serviceId));
     QCOMPARE(get(model, 0, "displayName").toString(), displayName);