Write image update date earlier (#159)

Write updated date already when an image update is downloaded to prevent wrong image update dates
ubports · May 31, 2019 · cf10aa1 · cf10aa1
1 parent 98ff8a1
commit cf10aa1
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 1 deletion.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+ubuntu-system-settings (0.4.3~0ubports1) xenial; urgency=medium
+
+  * Fix image updates not showing correct date (ubuntu-touch #1139)
+
+ -- Florian Leeber <florian@ubports.com>  Tue, 28 May 2019 23:49:12 +0200
+
 ubuntu-system-settings (0.4.3~0ubports0) xenial; urgency=medium
 
   * Add settings for on-screen keyboard themes

diff --git a/plugins/system-update/updatemodel.cpp b/plugins/system-update/updatemodel.cpp
@@ -394,7 +394,9 @@ void UpdateModel::setInstalled(const QString &id, const uint &rev)
     if (!update.isNull()) {
         update->setInstalled(true);
         update->setState(Update::State::StateInstallFinished);
-        update->setUpdatedAt(QDateTime::currentDateTimeUtc());
+        if (update->kind() != Update::Kind::KindImage) {
+            update->setUpdatedAt(QDateTime::currentDateTimeUtc());
+        }
         update->setDownloadId("");
         update->setError("");
         m_db->update(update);
@@ -443,6 +445,9 @@ void UpdateModel::setDownloaded(const QString &id, const uint &rev)
     if (!update.isNull()) {
         update->setError("");
         update->setState(Update::State::StateDownloaded);
+        if (update->kind() == Update::Kind::KindImage) {
+            update->setUpdatedAt(QDateTime::currentDateTimeUtc());
+        }
         m_db->update(update);
     }
 }

diff --git a/tests/plugins/system-update/tst_updatemodel.cpp b/tests/plugins/system-update/tst_updatemodel.cpp
@@ -392,6 +392,35 @@ private slots:
         QCOMPARE(update1->state(), Update::State::StateInstallFinished);
         QCOMPARE(update1->downloadId(), QString(""));
     }
+
+    //Test if the updated_at information is set after install only for click updates
+    void testClickUpdatedAtSetLate() {
+        auto update = createUpdate("id", 42);
+        update->setKind(Update::Kind::KindClick);
+        m_db->add(update);
+        m_model->setDownloaded(update->identifier(), update->revision());
+        auto update1 = m_db->get(update->identifier(), update->revision());
+        QCOMPARE(update1->updatedAt(), QDateTime());
+        m_model->setInstalled(update->identifier(), update->revision());
+        update1 = m_db->get(update->identifier(), update->revision());
+        QVERIFY(update1->updatedAt() != QDateTime());
+    }
+
+    //Test if the updated_at information is set after download already for image updates
+    void testImageUpdatedAtSetEarly()
+    {
+        auto update = createUpdate("id", 42);
+        update->setKind(Update::Kind::KindImage);
+        m_db->add(update);
+        m_model->setDownloaded(update->identifier(), update->revision());
+        auto update1 = m_db->get(update->identifier(), update->revision());
+        QDateTime firstDateTime = update1->updatedAt();
+        QVERIFY(firstDateTime != QDateTime());
+        m_model->setInstalled(update->identifier(), update->revision());
+        update1 = m_db->get(update->identifier(), update->revision());
+        QCOMPARE(update1->updatedAt(), firstDateTime);
+    }
+
     void testSetError()
     {
         auto update = createUpdate("id", 42);