Unity 8

Merge lp:~lukas-kde/unity8/wizardSystemUpdate into lp:unity8

wizardSystemUpdate
Merge into trunk

Proposed by Lukáš Tinkl on 2016-07-15

Status:

Merged

Approved by:

Michał Sawicz on 2016-07-29

Approved revision:

2555

Merged at revision:

2590

Proposed branch:

lp:~lukas-kde/unity8/wizardSystemUpdate

Merge into:

lp:unity8

Diff against target:

835 lines (+477/-29)

17 files modified

plugins/Ubuntu/SystemImage/CMakeLists.txt (+5/-0)
plugins/Ubuntu/SystemImage/SystemImage.cpp (+127/-5)
plugins/Ubuntu/SystemImage/SystemImage.h (+52/-2)
plugins/Ubuntu/SystemImage/plugin.cpp (+3/-9)
plugins/Ubuntu/SystemImage/plugin.h (+1/-1)
plugins/Wizard/PageList.cpp (+16/-1)
plugins/Wizard/System.cpp (+9/-1)
plugins/Wizard/System.h (+5/-1)
qml/Wizard/Page.qml (+1/-1)
qml/Wizard/Pages/30-wifi.qml (+8/-4)
qml/Wizard/Pages/77-system-update.qml (+156/-0)
tests/mocks/Ubuntu/SystemImage/MockSystemImage.cpp (+24/-1)
tests/mocks/Ubuntu/SystemImage/MockSystemImage.h (+22/-2)
tests/mocks/Wizard/MockSystem.cpp (+8/-0)
tests/mocks/Wizard/MockSystem.h (+4/-0)
tests/plugins/Wizard/tst_pagelist.cpp (+30/-1)
tests/qmltests/Wizard/tst_Wizard.qml (+6/-0)

To merge this branch:

bzr merge lp:~lukas-kde/unity8/wizardSystemUpdate

Wishlist

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Michał Sawicz		2016-07-15	Approve on 2016-07-29
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-07-28
Daniel d'Andrada (community)			Abstain on 2016-07-28
Review via email: mp+300182@code.launchpad.net

Commit Message

Implement an optional system update feature during OOBE wizard

Description of the Change

Implement a new page with the possibility to invoke a system update during the course of the OOBE wizard

Extends the SystemImage plugin with methods to talk to the respective DBUS daemon that performs the background check and download of the update. If the update is downloaded by the time the user arrives to the 77-system-update.qml, they will get presented with an option to install it. The device will then apply the update and automatically reboot.

The Wizard plugin adds a feature to skip until the last page, to greet the user with "Welcome to Ubuntu" slide on the next boot after a system update had been installed.

Design: https://docs.google.com/presentation/d/1UzzPkKDhU4GaMCzTE7pkaxFyF62G_DUv9jJXhE540Qg/edit#slide=id.g1554a0d5d0_0_53

Checklist:
* Are there any related MPs required for this MP to build/function as expected? Please list.

* Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

* If you changed the UI, has there been a design review?

Yes, reviewed by Paty and Grazina

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-22:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1783/rebuild

review: Needs Fixing (continuous-integration)

Michał Sawicz (saviq) wrote on 2016-07-27:

Do we want all the qDebugs? Should we maybe use something category-based instead of exclamation marks? ;)

Do we want a test for the system update page?

review: Needs Information

Michał Sawicz (saviq) on 2016-07-27:

lp:~lukas-kde/unity8/wizardSystemUpdate updated on 2016-07-28

2552. By Lukáš Tinkl on 2016-07-28: merge trunk
2553. By Lukáš Tinkl on 2016-07-28: address review comments

Lukáš Tinkl (lukas-kde) wrote on 2016-07-28:

Replies inline, fixed what I could

Michał Sawicz (saviq) wrote on 2016-07-28:

Poke about a few remaining comments (note in previous diff - click "Show diff comments" or select the previous "Preview Diff" below).

review: Needs Information

Daniel d'Andrada (dandrader) wrote on 2016-07-28:

"""
+ qDebug() << "!!! Rebooting:" << status;
"""

Still need to either remove them or use categorized logging (disabled by default, probably).

review: Needs Fixing

lp:~lukas-kde/unity8/wizardSystemUpdate updated on 2016-07-28

2554. By Lukáš Tinkl on 2016-07-28: convert to categorized logging

Lukáš Tinkl (lukas-kde) wrote on 2016-07-28:

> """
> + qDebug() << "!!! Rebooting:" << status;
> """
>
> Still need to either remove them or use categorized logging (disabled by
> default, probably).

Converted to categorized logging

Daniel d'Andrada (dandrader) wrote on 2016-07-28:

> > """
> > + qDebug() << "!!! Rebooting:" << status;
> > """
> >
> > Still need to either remove them or use categorized logging (disabled by
> > default, probably).
>
> Converted to categorized logging

Thanks!

review: Abstain

Lukáš Tinkl (lukas-kde) wrote on 2016-07-28:

Replies inline

lp:~lukas-kde/unity8/wizardSystemUpdate updated on 2016-07-28

2555. By Lukáš Tinkl on 2016-07-28: simplify the layout, as per Saviq's suggestion

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-28:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1835/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-28:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1840/rebuild

review: Needs Fixing (continuous-integration)

Michał Sawicz (saviq) wrote on 2016-07-29:

* Did you perform an exploratory manual test run of the code change and any related functionality?
Y
* Did CI run pass? If not, please explain why.
Unrelated failures - flaky and/or bug #1607686 on yakkety

review: Approve

lp:~lukas-kde/unity8/wizardSystemUpdate updated on 2016-08-08

2556. By Lukáš Tinkl on 2016-08-03

partially revert the string change

causing endless loops / freezes in QtQuick

2557. By Lukáš Tinkl on 2016-08-08

merge trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Lukáš Tinkl

Mohammad Rakibul Hasan

Unity Team

 === modified file 'plugins/Ubuntu/SystemImage/CMakeLists.txt'
 --- plugins/Ubuntu/SystemImage/CMakeLists.txt	2014-07-30 11:08:29 +0000
 +++ plugins/Ubuntu/SystemImage/CMakeLists.txt	2016-08-08 10:17:50 +0000
@@ -1,3 +1,7 @@
++include_directories(
++    ${GLIB_INCLUDE_DIRS}
++)
++
  set(SYSTEMIMAGE_SOURCES
      plugin.cpp
      SystemImage.cpp
@@ -6,5 +10,6 @@
  add_library(SystemImage MODULE ${SYSTEMIMAGE_SOURCES})
  qt5_use_modules(SystemImage Qml DBus Core)
++target_link_libraries(SystemImage ${GLIB_LIBRARIES})
  add_unity8_plugin(Ubuntu.SystemImage 0.1 Ubuntu/SystemImage TARGETS SystemImage)
 === modified file 'plugins/Ubuntu/SystemImage/SystemImage.cpp'
 --- plugins/Ubuntu/SystemImage/SystemImage.cpp	2015-09-14 09:11:08 +0000
 +++ plugins/Ubuntu/SystemImage/SystemImage.cpp	2016-08-08 10:17:50 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2014 Canonical, Ltd.
++ * Copyright (C) 2014-2016 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -14,20 +14,142 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--#include "SystemImage.h"
  #include <QDBusConnection>
  #include <QDBusPendingCall>
++#include <QDBusReply>
++#include <QDebug>
++
++#include <glib.h>
++
++#include "SystemImage.h"
++
++#define SYSTEMIMAGE_SERVICE QStringLiteral("com.canonical.SystemImage")
++#define SYSTEMIMAGE_PATH QStringLiteral("/Service")
++#define SYSTEMIMAGE_IFACE QStringLiteral("com.canonical.SystemImage")
++
++Q_LOGGING_CATEGORY(SYSTEMIMAGEPLUGIN, "unity8.systemimage", QtWarningMsg)
++
++#define DEBUG_MSG qCDebug(SYSTEMIMAGEPLUGIN).nospace().noquote() << Q_FUNC_INFO
++#define WARNING_MSG qCWarning(SYSTEMIMAGEPLUGIN).nospace().noquote() << Q_FUNC_INFO
  SystemImage::SystemImage(QObject *parent)
      : QObject(parent)
+ {
++    QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("UpdateAvailableStatus"),
++                                         this, SLOT(onUpdateAvailableStatus(bool,bool,QString,int,QString,QString)));
++    QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("UpdateDownloaded"),
++                                         this, SLOT(onUpdateDownloaded()));
++    QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("UpdateFailed"),
++                                         this, SLOT(onUpdateFailed(int,QString)));
++    QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("Applied"),
++                                         this, SLOT(onUpdateApplied(bool)));
++    QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("Rebooting"),
++                                         this, SLOT(onRebooting(bool)));
++}
++
++void SystemImage::checkForUpdate()
++{
++    DEBUG_MSG << "Checking for update";
++    const QDBusMessage msg = QDBusMessage::createMethodCall(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE,
++                                                            QStringLiteral("CheckForUpdate"));
++    QDBusConnection::systemBus().asyncCall(msg);
++}
++
++void SystemImage::applyUpdate()
++{
++    DEBUG_MSG << "Applying update";
++    setUpdateApplying(true);
++
++    const QDBusMessage msg = QDBusMessage::createMethodCall(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE,
++                                                            QStringLiteral("ApplyUpdate"));
++    QDBusConnection::systemBus().asyncCall(msg);
+ }
  void SystemImage::factoryReset()
+ {
--    const QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("com.canonical.SystemImage"),
--                                                            QStringLiteral("/Service"),
--                                                            QStringLiteral("com.canonical.SystemImage"),
++    const QDBusMessage msg = QDBusMessage::createMethodCall(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE,
                                                              QStringLiteral("FactoryReset"));
      QDBusConnection::systemBus().asyncCall(msg);
+ }
++
++void SystemImage::onUpdateAvailableStatus(bool is_available, bool downloading, const QString &available_version, int update_size,
++                                          const QString &last_update_date, const QString &error_reason)
++{
++    DEBUG_MSG << "A new update is " << (is_available ? "" : "NOT") << "available";
++
++    if (is_available == m_updateAvailable) {
++        return;
++    }
++
++    m_updateAvailable = is_available;
++    m_downloading = downloading;
++    m_availableVersion = available_version;
++    m_updateSize = formatSize(update_size);
++    m_lastUpdateDate = last_update_date;
++    m_errorReason = error_reason;
++    Q_EMIT updateAvailableStatus();
++
++    DEBUG_MSG << "Downloading: " << downloading << ", version: " << available_version << ", last update: " << last_update_date <<
++                ", size: " << m_updateSize;
++}
++
++void SystemImage::onUpdateDownloaded()
++{
++    DEBUG_MSG << "Update downloaded";
++
++    m_downloaded = true;
++    Q_EMIT updateDownloadedChanged();
++}
++
++void SystemImage::onUpdateFailed(int /*consecutive_failure_count*/, const QString &last_reason)
++{
++    WARNING_MSG << "System Update failed: " << last_reason;
++    setUpdateApplying(false);
++}
++
++void SystemImage::onUpdateApplied(bool applied)
++{
++    DEBUG_MSG << "System Update applied with status: " << applied;
++    setUpdateApplying(false);
++    if (applied) {
++        resetUpdateStatus();
++        Q_EMIT updateAvailableStatus();
++    }
++}
++
++void SystemImage::onRebooting(bool status)
++{
++    setUpdateApplying(false);
++    DEBUG_MSG << "Rebooting: " << status;
++}
++
++void SystemImage::setUpdateApplying(bool status)
++{
++    if (status != m_updateApplying) {
++        m_updateApplying = status;
++        Q_EMIT updateApplyingChanged();
++    }
++}
++
++void SystemImage::resetUpdateStatus()
++{
++    m_updateAvailable = false;
++    m_updateApplying = false;
++    m_downloading = false;
++    m_downloaded = false;
++    m_availableVersion.clear();
++    m_updateSize.clear();
++    m_lastUpdateDate.clear();
++    m_errorReason.clear();
++}
++
++QString SystemImage::formatSize(quint64 size) const
++{
++    guint64 g_size = size;
++
++    gchar * formatted_size = g_format_size(g_size);
++    QString q_formatted_size = QString::fromLocal8Bit(formatted_size);
++    g_free(formatted_size);
++
++    return q_formatted_size;
++}
 === modified file 'plugins/Ubuntu/SystemImage/SystemImage.h'
 --- plugins/Ubuntu/SystemImage/SystemImage.h	2015-06-11 23:45:12 +0000
 +++ plugins/Ubuntu/SystemImage/SystemImage.h	2016-08-08 10:17:50 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2014 Canonical, Ltd.
++ * Copyright (C) 2014-2016 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -18,17 +18,67 @@
  #define SYSTEMIMAGE_H
  #include <QObject>
++#include <QLoggingCategory>
++
++Q_DECLARE_LOGGING_CATEGORY(SYSTEMIMAGEPLUGIN)
  class SystemImage : public QObject
+ {
      Q_OBJECT
      Q_DISABLE_COPY(SystemImage)
++    Q_PROPERTY(bool updateAvailable READ updateAvailable NOTIFY updateAvailableStatus)
++    Q_PROPERTY(bool updateDownloading READ updateDownloading NOTIFY updateAvailableStatus)
++    Q_PROPERTY(QString availableVersion READ availableVersion NOTIFY updateAvailableStatus)
++    Q_PROPERTY(QString updateSize READ updateSize NOTIFY updateAvailableStatus)
++    Q_PROPERTY(bool updateApplying READ updateApplying NOTIFY updateApplyingChanged)
++    Q_PROPERTY(bool updateDownloaded READ updateDownloaded NOTIFY updateDownloadedChanged)
++
  public:
--    explicit SystemImage(QObject *parent = 0);
++    explicit SystemImage(QObject *parent = nullptr);
      ~SystemImage() = default;
++    bool updateAvailable() const { return m_updateAvailable; }
++    bool updateDownloading() const { return m_downloading; }
++    QString availableVersion() const { return m_availableVersion; }
++    QString updateSize() const { return m_updateSize; }
++    bool updateApplying() const { return m_updateApplying; }
++    bool updateDownloaded() const { return m_downloaded; }
++
++public Q_SLOTS:
++    Q_INVOKABLE void checkForUpdate();
++    Q_INVOKABLE void applyUpdate();
      Q_INVOKABLE void factoryReset();
++
++private Q_SLOTS:
++    void onUpdateAvailableStatus(bool is_available, bool updateDownloading, const QString &available_version,
++                                 int update_size, const QString &last_update_date, const QString &error_reason);
++    void onUpdateDownloaded();
++    void onUpdateFailed(int consecutive_failure_count, const QString & last_reason);
++    void onUpdateApplied(bool applied);
++    void onRebooting(bool status);
++
++Q_SIGNALS:
++    void updateAvailableStatus();
++    void updateDownloadedChanged();
++    void updateApplyingChanged();
++
++private Q_SLOTS:
++    void setUpdateApplying(bool status);
++
++private:
++    void resetUpdateStatus();
++    QString formatSize(quint64 size) const;
++
++private:
++    bool m_updateAvailable = false;
++    bool m_updateApplying = false;
++    bool m_downloading = false;
++    bool m_downloaded = false;
++    QString m_availableVersion;
++    QString m_updateSize;
++    QString m_lastUpdateDate;
++    QString m_errorReason;
  };
  #endif // SYSTEMIMAGE_H
 === modified file 'plugins/Ubuntu/SystemImage/plugin.cpp'
 --- plugins/Ubuntu/SystemImage/plugin.cpp	2014-07-30 11:08:29 +0000
 +++ plugins/Ubuntu/SystemImage/plugin.cpp	2016-08-08 10:17:50 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2014 Canonical, Ltd.
++ * Copyright (C) 2014-2016 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -19,16 +19,10 @@
  #include <QtQml>
--static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
--{
--    Q_UNUSED(engine)
--    Q_UNUSED(scriptEngine)
--    return new SystemImage();
--}
--
  void BackendPlugin::registerTypes(const char *uri)
+ {
      Q_ASSERT(uri == QLatin1String("Ubuntu.SystemImage"));
--    qmlRegisterSingletonType<SystemImage>(uri, 0, 1, "SystemImage", service_provider);
++    qmlRegisterSingletonType<SystemImage>(uri, 0, 1, "SystemImage",
++                                          [](QQmlEngine*, QJSEngine*) -> QObject* { return new SystemImage; });
+ }
 === modified file 'plugins/Ubuntu/SystemImage/plugin.h'
 --- plugins/Ubuntu/SystemImage/plugin.h	2015-04-30 09:31:51 +0000
 +++ plugins/Ubuntu/SystemImage/plugin.h	2016-08-08 10:17:50 +0000
@@ -22,7 +22,7 @@
  class BackendPlugin : public QQmlExtensionPlugin
+ {
      Q_OBJECT
--    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
++    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
  public:
      void registerTypes(const char *uri) override;
 === modified file 'plugins/Wizard/PageList.cpp'
 --- plugins/Wizard/PageList.cpp	2016-03-29 03:47:39 +0000
 +++ plugins/Wizard/PageList.cpp	2016-08-08 10:17:50 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2014 Canonical Ltd.
++ * Copyright (C) 2014-2016 Canonical Ltd.
+  *
   * 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
@@ -34,6 +34,7 @@
  #include <QDir>
  #include <QSet>
  #include <QStandardPaths>
++#include <QSettings>
  PageList::PageList(QObject *parent)
      : QObject(parent),
@@ -66,6 +67,20 @@
      Q_FOREACH(const QString &page, disabledPages) {
          m_pages.remove(page);
+     }
++
++    // If there was a system update installed, skip until the last page to just greet the user
++    QSettings settings;
++    if (settings.value(QStringLiteral("Wizard/SkipUntilFinishedPage")).toBool()) {
++        const QString lastPage = m_pages.lastKey();
++        Q_FOREACH(const QString &page, m_pages.keys()) {
++            if (Q_UNLIKELY(page != lastPage)) {
++                m_pages.remove(page);
++            }
++        }
++
++        // ... and reset it again for the next run
++        settings.remove(QStringLiteral("Wizard/SkipUntilFinishedPage"));
++    }
+ }
  QStringList PageList::entries() const
 === modified file 'plugins/Wizard/System.cpp'
 --- plugins/Wizard/System.cpp	2016-06-21 09:51:41 +0000
 +++ plugins/Wizard/System.cpp	2016-08-08 10:17:50 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2014-2015 Canonical Ltd.
++ * Copyright (C) 2014-2016 Canonical Ltd.
+  *
   * 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
@@ -26,6 +26,7 @@
  #include <QMap>
  #include <QProcess>
  #include <QDebug>
++#include <QSettings>
  System::System()
      : QObject()
@@ -110,3 +111,10 @@
                                       initctl restart --no-wait indicator-messages; \
                                       initctl restart --no-wait unity8-dash\""));
+ }
++
++void System::skipUntilFinishedPage()
++{
++    QSettings settings;
++    settings.setValue(QStringLiteral("Wizard/SkipUntilFinishedPage"), true);
++    settings.sync();
++}
 === modified file 'plugins/Wizard/System.h'
 --- plugins/Wizard/System.h	2016-03-29 03:47:39 +0000
 +++ plugins/Wizard/System.h	2016-08-08 10:17:50 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2014-2015 Canonical Ltd.
++ * Copyright (C) 2014-2016 Canonical Ltd.
+  *
   * 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
@@ -35,6 +35,10 @@
  public Q_SLOTS:
      void updateSessionLocale(const QString &locale);
++    /**
++     * Mark the wizard to skip all the pages and just show the last (welcome to ubuntu) page
++     */
++    void skipUntilFinishedPage();
  Q_SIGNALS:
      void wizardEnabledChanged();
 === modified file 'qml/Wizard/Page.qml'
 --- qml/Wizard/Page.qml	2016-03-29 03:47:39 +0000
 +++ qml/Wizard/Page.qml	2016-08-08 10:17:50 +0000
@@ -21,7 +21,7 @@
  Item {
      readonly property real maximumContentWidth: units.gu(50)
      readonly property bool wideMode: width > units.gu(90) && width > height
--    readonly property bool contentAnimationRunning: contentAnimation.running
++    readonly property alias contentAnimationRunning: contentAnimation.running
      readonly property real buttonMargin: units.gu(3)
      readonly property real buttonWidth: (width - buttonMargin * 2) / 2 -
 === modified file 'qml/Wizard/Pages/30-wifi.qml'
 --- qml/Wizard/Pages/30-wifi.qml	2016-03-29 03:47:39 +0000
 +++ qml/Wizard/Pages/30-wifi.qml	2016-08-08 10:17:50 +0000
@@ -20,6 +20,7 @@
  import Ubuntu.Components 1.3
  import Wizard 0.1
  import Ubuntu.Connectivity 1.0
++import Ubuntu.SystemImage 0.1
  import ".." as LocalComponents
  LocalComponents.Page {
@@ -158,7 +159,7 @@
              anchors.right: parent.right
              anchors.leftMargin: column.anchors.leftMargin == 0 ? staticMargin : 0
              font.weight: Font.Light
--            color: "#68064d"
++            color: textColor
              wrapMode: Text.Wrap
              text: listview.count > 0 ? i18n.tr("Available Wi-Fi networks")
                                       : i18n.tr("No available Wi-Fi networks")
@@ -173,8 +174,6 @@
              Layout.fillHeight: true
              delegate: Loader {
--                id: loader
--
                  readonly property bool isAccessPoint: model.type === "unity.widgets.systemsettings.tablet.accesspoint"
                  readonly property bool isConnected: item && item.menuData && item.menuData.actionState
                  readonly property bool isEnterprise: item && item.isEnterprise
@@ -204,7 +203,12 @@
          id: forwardButton
          LocalComponents.StackButton {
              text: (connected || listview.count === 0) ? i18n.tr("Next") : i18n.tr("Skip")
--            onClicked: pageStack.next()
++            onClicked: {
++                if (connected) {
++                    SystemImage.checkForUpdate(); // initiate the background check for System Update
++                }
++                pageStack.next();
++            }
+         }
+     }
+ }
 === added file 'qml/Wizard/Pages/77-system-update.qml'
 --- qml/Wizard/Pages/77-system-update.qml	1970-01-01 00:00:00 +0000
 +++ qml/Wizard/Pages/77-system-update.qml	2016-08-08 10:17:50 +0000
@@ -0,0 +1,156 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY 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/>.
++ */
++
++import QtQuick 2.4
++import QtQuick.Layouts 1.1
++import Ubuntu.Components 1.3
++import Ubuntu.SystemImage 0.1
++import Wizard 0.1
++import ".." as LocalComponents
++
++LocalComponents.Page {
++    id: systemUpdatePage
++    objectName: "systemUpdatePage"
++
++    title: i18n.tr("Update Device")
++    forwardButtonSourceComponent: forwardButton
++
++    skip: !SystemImage.updateDownloaded // skip the page when the system update is not ready to install
++
++    Column {
++        id: column
++        anchors {
++            fill: content
++            leftMargin: systemUpdatePage.leftMargin
++            rightMargin: systemUpdatePage.rightMargin
++            topMargin: systemUpdatePage.customMargin
++        }
++        spacing: units.gu(3)
++        opacity: spinner.running ? 0.5 : 1
++        Behavior on opacity {
++            UbuntuNumberAnimation {}
++        }
++
++        Label {
++            anchors.left: parent.left
++            anchors.right: parent.right
++            anchors.leftMargin: column.anchors.leftMargin == 0 ? staticMargin : 0
++            font.weight: Font.Light
++            color: textColor
++            wrapMode: Text.Wrap
++            fontSize: "small"
++            text: i18n.tr("There is a system update available and ready to install. Afterwards, the device will automatically restart.")
++        }
++
++        GridLayout {
++            rows: 3
++            columns: 2
++            rowSpacing: units.gu(1)
++            columnSpacing: units.gu(2)
++
++            Image {
++                Layout.rowSpan: 3
++                Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
++                sourceSize: Qt.size(units.gu(3), units.gu(3))
++                fillMode: Image.PreserveAspectFit
++                source: "image://theme/distributor-logo"
++            }
++
++            Label {
++                color: textColor
++                font.weight: Font.Normal
++                fontSize: "small"
++                text: i18n.ctr("string identifying name of the update", "Ubuntu system")
++            }
++
++            Label {
++                font.weight: Font.Light
++                fontSize: "small"
++                color: textColor
++                text: i18n.ctr("version of the system update", "Version %1").arg(SystemImage.availableVersion)
++            }
++
++            Label {
++                font.weight: Font.Light
++                fontSize: "small"
++                color: textColor
++                text: SystemImage.updateSize
++            }
++        }
++
++        Label {
++            anchors.left: parent.left
++            anchors.right: parent.right
++            anchors.leftMargin: column.anchors.leftMargin == 0 ? staticMargin : 0
++            font.weight: Font.Light
++            color: textColor
++            wrapMode: Text.Wrap
++            fontSize: "small"
++            text: i18n.tr("This could take a few minutes...")
++        }
++
++        Rectangle {
++            anchors.left: parent.left
++            anchors.leftMargin: column.anchors.leftMargin == 0 ? staticMargin : 0
++            color: theme.palette.normal.foreground
++            radius: units.dp(4)
++            width: buttonLabel.paintedWidth + units.gu(3)
++            height: buttonLabel.paintedHeight + units.gu(1.8)
++
++            Label {
++                id: buttonLabel
++                color: textColor
++                text: i18n.tr("Install and restart now")
++                font.weight: Font.Light
++                anchors.centerIn: parent
++            }
++
++            AbstractButton {
++                id: button
++                objectName: "installButton"
++                anchors.fill: parent
++                onClicked: {
++                    System.skipUntilFinishedPage();
++                    SystemImage.applyUpdate();
++                }
++            }
++
++            transformOrigin: Item.Top
++            scale: button.pressed ? 0.98 : 1.0
++            Behavior on scale {
++                ScaleAnimator {
++                    duration: UbuntuAnimation.SnapDuration
++                    easing.type: Easing.Linear
++                }
++            }
++        }
++    }
++
++    ActivityIndicator {
++        id: spinner
++        anchors.centerIn: systemUpdatePage
++        running: SystemImage.updateApplying
++        visible: running
++    }
++
++    Component {
++        id: forwardButton
++        LocalComponents.StackButton {
++            text: i18n.tr("Skip")
++            onClicked: pageStack.next()
++        }
++    }
++}
 === modified file 'tests/mocks/Ubuntu/SystemImage/MockSystemImage.cpp'
 --- tests/mocks/Ubuntu/SystemImage/MockSystemImage.cpp	2014-07-30 11:08:29 +0000
 +++ tests/mocks/Ubuntu/SystemImage/MockSystemImage.cpp	2016-08-08 10:17:50 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2014 Canonical, Ltd.
++ * Copyright (C) 2014-2016 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -14,6 +14,9 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
++#include <QDebug>
++#include <QTimer>
++
  #include "MockSystemImage.h"
  MockSystemImage::MockSystemImage(QObject *parent)
@@ -21,7 +24,27 @@
+ {
+ }
++void MockSystemImage::checkForUpdate()
++{
++    qDebug() << "Doing a fake system update check";
++}
++
++void MockSystemImage::applyUpdate()
++{
++    qDebug() << "Applying a fake system update";
++    setUpdateApplying(true);
++    QTimer::singleShot(3000, [this] {setUpdateApplying(false);});
++}
++
  void MockSystemImage::factoryReset()
+ {
      Q_EMIT resettingDevice();
+ }
++
++void MockSystemImage::setUpdateApplying(bool status)
++{
++    if (status != m_updateApplying) {
++        m_updateApplying = status;
++        Q_EMIT updateApplyingChanged();
++    }
++}
 === modified file 'tests/mocks/Ubuntu/SystemImage/MockSystemImage.h'
 --- tests/mocks/Ubuntu/SystemImage/MockSystemImage.h	2014-07-30 11:08:29 +0000
 +++ tests/mocks/Ubuntu/SystemImage/MockSystemImage.h	2016-08-08 10:17:50 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2014 Canonical, Ltd.
++ * Copyright (C) 2014-2016 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -24,13 +24,33 @@
      Q_OBJECT
      Q_DISABLE_COPY(MockSystemImage)
++    Q_PROPERTY(bool updateDownloaded READ updateDownloaded CONSTANT)
++    Q_PROPERTY(QString availableVersion READ availableVersion CONSTANT)
++    Q_PROPERTY(QString updateSize READ updateSize CONSTANT)
++    Q_PROPERTY(bool updateApplying READ updateApplying NOTIFY updateApplyingChanged)
++
  public:
--    explicit MockSystemImage(QObject *parent = 0);
++    explicit MockSystemImage(QObject *parent = nullptr);
++    Q_INVOKABLE void checkForUpdate();
++    Q_INVOKABLE void applyUpdate();
      Q_INVOKABLE void factoryReset();
++    bool updateApplying() const { return m_updateApplying; }
++    // these are const only in mock
++    bool updateDownloaded() const { return true; }
++    QString availableVersion() const { return QStringLiteral("42"); }
++    QString updateSize() const { return QStringLiteral("4.2 MB"); }
++
  Q_SIGNALS:
      void resettingDevice(); // only for mock
++    void updateApplyingChanged();
++
++private Q_SLOTS:
++    void setUpdateApplying(bool status);
++
++private:
++    bool m_updateApplying = false;
  };
  #endif // MOCK_SYSTEMIMAGE_H
 === modified file 'tests/mocks/Wizard/MockSystem.cpp'
 --- tests/mocks/Wizard/MockSystem.cpp	2016-03-29 03:47:39 +0000
 +++ tests/mocks/Wizard/MockSystem.cpp	2016-08-08 10:17:50 +0000
@@ -15,6 +15,7 @@
   */
  #include <QDebug>
++#include <QSettings>
  #include "MockSystem.h"
@@ -39,3 +40,10 @@
+ {
      Q_EMIT updateSessionLocaleCalled(locale);
+ }
++
++void MockSystem::skipUntilFinishedPage()
++{
++    QSettings settings;
++    settings.setValue(QStringLiteral("Wizard/SkipUntilFinishedPage"), true);
++    settings.sync();
++}
 === modified file 'tests/mocks/Wizard/MockSystem.h'
 --- tests/mocks/Wizard/MockSystem.h	2016-03-29 03:47:39 +0000
 +++ tests/mocks/Wizard/MockSystem.h	2016-08-08 10:17:50 +0000
@@ -33,6 +33,10 @@
  public Q_SLOTS:
      void updateSessionLocale(const QString &locale);
++    /**
++     * Mark the wizard to skip all the pages and just show the last (welcome to ubuntu) page
++     */
++    void skipUntilFinishedPage();
  Q_SIGNALS:
      void wizardEnabledChanged();
 === modified file 'tests/plugins/Wizard/tst_pagelist.cpp'
 --- tests/plugins/Wizard/tst_pagelist.cpp	2015-09-30 13:09:38 +0000
 +++ tests/plugins/Wizard/tst_pagelist.cpp	2016-08-08 10:17:50 +0000
@@ -20,6 +20,7 @@
  #include <QObject>
  #include <QTemporaryDir>
  #include <QTest>
++#include <QSettings>
  #define PAGES_PATH "Wizard/Pages"
@@ -28,7 +29,7 @@
      Q_OBJECT
  public:
--    PageListTest() {};
++    PageListTest() {}
  private Q_SLOTS:
      void testCollect();
@@ -37,6 +38,7 @@
      void testIgnoreNonQml();
      void testIgnoreDuplicates();
      void testDisabled();
++    void testSkipUntilLastPage();
  private:
      void fillRoot(const QTemporaryDir &root);
@@ -150,5 +152,32 @@
      QCOMPARE(pageList.entries(), QStringList() << "4.qml");
+ }
++void PageListTest::testSkipUntilLastPage() {
++    PageList * pageList = nullptr;
++    QTemporaryDir root;
++    fillRoot(root);
++
++    makeFile(root, "a", "1.qml");
++    makeFile(root, "a", "2.qml");
++    makeFile(root, "a", "3.qml");
++
++    // normal run
++    pageList = new PageList;
++    QCOMPARE(pageList->numPages(), 3);
++    delete pageList; pageList = nullptr;
++
++    // after system update had been installed, have the last page only
++    QSettings settings;
++    settings.setValue(QStringLiteral("Wizard/SkipUntilFinishedPage"), true);
++    pageList = new PageList;
++    QCOMPARE(pageList->entries(), {QStringLiteral("3.qml")}); // only the last page should be in the list
++    delete pageList; pageList = nullptr;
++
++    // normal run again
++    pageList = new PageList;
++    QCOMPARE(pageList->numPages(), 3);
++    delete pageList; pageList = nullptr;
++}
++
  QTEST_MAIN(PageListTest)
  #include "tst_pagelist.moc"
 === modified file 'tests/qmltests/Wizard/tst_Wizard.qml'
 --- tests/qmltests/Wizard/tst_Wizard.qml	2016-06-29 14:44:41 +0000
 +++ tests/qmltests/Wizard/tst_Wizard.qml	2016-08-08 10:17:50 +0000
@@ -319,6 +319,8 @@
              // now finish up
              page = waitForPage("reportingPage");
              tap(findChild(page, "forwardButton"));
++            page = waitForPage("systemUpdatePage");
++            tap(findChild(page, "forwardButton"));
              page = waitForPage("finishedPage");
              waitUntilTransitionsEnd(page);
              tap(findChild(page, "finishButton"));
@@ -359,6 +361,8 @@
              // now finish up
              page = waitForPage("reportingPage");
              tap(findChild(page, "forwardButton"));
++            page = waitForPage("systemUpdatePage");
++            tap(findChild(page, "forwardButton"));
              page = waitForPage("finishedPage");
              waitUntilTransitionsEnd(page);
              tap(findChild(page, "finishButton"));
@@ -377,6 +381,8 @@
              tap(findChild(page, "forwardButton"));
              page = waitForPage("reportingPage");
              tap(findChild(page, "forwardButton"));
++            page = waitForPage("systemUpdatePage");
++            tap(findChild(page, "forwardButton"));
              page = waitForPage("finishedPage");
              waitUntilTransitionsEnd(page);
              tap(findChild(page, "finishButton"));