ubuntu-system-settings

Merge lp:~diegosarmentero/ubuntu-system-settings/display-errors into lp:ubuntu-system-settings

display-errors
Merge into trunk

Proposed by Diego Sarmentero on 2014-09-17

Status:	Merged
Approved by:	Ken VanDine on 2014-10-08
Approved revision:	1057
Merged at revision:	1119
Proposed branch:	lp:~diegosarmentero/ubuntu-system-settings/display-errors
Merge into:	lp:ubuntu-system-settings
Diff against target:	448 lines (+156/-88) 5 files modified plugins/system-update/PageComponent.qml (+70/-3) plugins/system-update/network/network.cpp (+59/-69) plugins/system-update/network/network.h (+15/-4) plugins/system-update/update_manager.cpp (+9/-11) plugins/system-update/update_manager.h (+3/-1)
To merge this branch:	bzr merge lp:~diegosarmentero/ubuntu-system-settings/display-errors
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-10-08
Ken VanDine			Approve on 2014-10-08
Sebastien Bacher (community)		2014-09-17	Needs Fixing on 2014-10-07
Review via email: mp+235037@code.launchpad.net

Commit message

- Improves in network backend.
- Detect network connection and show "Connect to the internet..." message or retry on netword detected.

Description of the change

This branch fix partially this issue:
https://bugs.launchpad.net/ubuntu/+source/ubuntu-system-settings/+bug/1215901
(Next branch will fix the remaining problems)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-18:

FAILED: Continuous integration, rev:1047
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1498/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4938/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3602/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/690/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6190/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3911/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-18:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-19:

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

review: Needs Fixing (continuous-integration)

lp:~diegosarmentero/ubuntu-system-settings/display-errors updated on 2014-09-23

1050. By Diego Sarmentero on 2014-09-23: retry on button press and connection state change

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-23:

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

review: Needs Fixing (continuous-integration)

lp:~diegosarmentero/ubuntu-system-settings/display-errors updated on 2014-09-23

1051. By Diego Sarmentero on 2014-09-23: fix alignment

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-23:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-09-24:

Good work, some review comments though

* don't we have an api to check online status? it seems weird to have to query it from the indicator like that

*
> title: i18n.tr("Installation Failed")

should be "failed" (lowercase) since we use sentence casing

The design on the wiki seems also use different strings, e.g "Sorry, the system update failed.", where did you find the one you are using?

* do we have a design for the strings used?
neither https://wiki.ubuntu.com/SoftwareUpdates#Phone nor https://bugs.launchpad.net/ubuntu/+source/ubuntu-system-settings/+bug/1215901 include "Update process failed." for example

review: Needs Fixing

lp:~diegosarmentero/ubuntu-system-settings/display-errors updated on 2014-09-25

1052. By Diego Sarmentero on 2014-09-25: branch updated

Revision history for this message

Diego Sarmentero (diegosarmentero) wrote on 2014-09-25:

> Good work, some review comments though
>
> * don't we have an api to check online status? it seems weird to have to query
> it from the indicator like that
>
>
> *
> > title: i18n.tr("Installation Failed")
>
> should be "failed" (lowercase) since we use sentence casing
>
> The design on the wiki seems also use different strings, e.g "Sorry, the
> system update failed.", where did you find the one you are using?
>
>
> * do we have a design for the strings used?
> neither https://wiki.ubuntu.com/SoftwareUpdates#Phone nor
> https://bugs.launchpad.net/ubuntu/+source/ubuntu-system-settings/+bug/1215901
> include "Update process failed." for example

Fixed

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-09-25:

thanks, but "fixed" doesn't reply to some of the question, like the one about the api to check if the device is online...

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-25:

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

review: Approve (continuous-integration)

Revision history for this message

Diego Sarmentero (diegosarmentero) wrote on 2014-09-26:

> thanks, but "fixed" doesn't reply to some of the question, like the one about
> the api to check if the device is online...

I'm using the same that is being used in the WiFi plugin of System Settings.

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-10-02:

looks ok to me, would be nice to have another review from somebody knowing that code a bit better as well though ... Ken? ;-)

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-02:

FAILED: Continuous integration, rev:1052
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1594/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5425
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3889
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/786
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6677
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6677/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14065
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3266
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4206
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4206/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-10-07:

To check if the device is online you should be using the new bindings doing that
http://developer.ubuntu.com/api/qml/sdk-14.10/Ubuntu.Connectivity.index/

(unity8 is starting using that as well)

review: Needs Fixing

lp:~diegosarmentero/ubuntu-system-settings/display-errors updated on 2014-10-07

1053. By Diego Sarmentero on 2014-10-07: using network status component
1054. By Diego Sarmentero on 2014-10-07: remove unused attribute signal
1055. By Diego Sarmentero on 2014-10-07: fix typo

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-07:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-10-07:

I'm getting this error:

2014-10-07 13:00:37,246 - WARNING - file:///usr/lib/arm-linux-gnueabihf/qt5/qml/Ubuntu/Components/PageWrapperUtils.js:42: Error: Error while loading page: file:///usr/share/ubuntu/settings/system/qml-plugins/system-update/PageComponent.qml:60 Element is not creatable.

That's the NetworkingStatus component

review: Needs Fixing

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-10-07:

The error in the previous comment was from running the debs created by the account-detected branch which includes this branch. It looks like it does include the latest revision of this branch.

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-10-07:

There is likely a missing depends on qml-module-ubuntu-connectivity with the update

lp:~diegosarmentero/ubuntu-system-settings/display-errors updated on 2014-10-07

1056. By Diego Sarmentero on 2014-10-07: change usage of network status plugin

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-07:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-07:

FAILED: Continuous integration, rev:1056
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1618/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5623
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3979
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/810
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5314
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6875
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6875/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14296
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3350
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4306
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4306/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-10-08:

When the updates page is loaded, there is a reference error if online status changes. See inline comment.

review: Needs Fixing

lp:~diegosarmentero/ubuntu-system-settings/display-errors updated on 2014-10-08

1057. By Diego Sarmentero on 2014-10-08: fix access to online attribute

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-10-08:

Looks good now, thanks!

review: Approve

lp:~diegosarmentero/ubuntu-system-settings/display-errors updated on 2014-10-08

1058. By Diego Sarmentero on 2014-10-08: [ jonas-drange ]
* [wifi/phone] dynamically chooses what SIM to use when there's only
  one present. (LP: #1375832)
[ Iain Lane ]
* [storage/about] Use a QSharedPointer to manage freeing of the
  counter which we use to display all of the collected sizes at once.
  If the measuring process was cancelled, we were freeing it multiple
  times - once for each outstanding size measurement. This led to a
  crash. (LP: #1375988)
* [security-privacy] Link with gobject, uses symbols from this
  library. Prevents "[…]libUbuntuSecurityPrivacyPanel.so contains an
  unresolvable reference to symbol
  g_signal_handlers_disconnect_matched: it's probably a plugin"
  warnings.
[ jonas-drange ]
* [cellular] react to application.state changes and update potential
  out-of-date default SIM settings (LP: #1364103)
* [wifi] let removed networks update the previous network model so
  that we can reuse the model (and not pop the pagestack twice,
  causing this ux issue) (LP: #1370389)
[ Sebastien Bacher ]
* [location] use a flickable so the list can be scrolled (LP:
  #1374017)
* [security] get localized application names from the trust-store (LP:
  #1374018)
[ Ken VanDine ]
* Fixed handling of the Downloading/Installing label based on actual
  state. . Forward updateProgress signals for system updates. Layout
  fixes (LP: #1312587)
* Use new splash screen (LP: #1376242)
* Improved tracking download states
* Use new target_build_number from system-image-dbus to determine
  visibility of the update notification (LP: #1355803)
[ CI bot ]
* Resync trunk
[ Sebastien Bacher ]
* [storage] use libclick rather than calling the command line (LP:
  #1368967)
* [storage] tweaks to the disk informations, limit the free space to
  the user available one (excluding the system partitions), don't list
  the external mounts, that's described in the design and is going to
  require work on the categories computation to give correct values
  (LP: #1284247)
* [about] display the free space value next to the storage label (LP:
  #1335144)
[ Albert Astals ]
* Add i18n.tr
[ jonas-drange ]
* [wifi] connect to hidden network is now a dialog (LP: #1366005)
[ Ken VanDine ]
* Provide more keywords to make search useful (LP: #1370219) (LP:
  #1370219)
* [background] set sourceSize in the image preview to work around an
  issue loading large images (LP: #1373462)
[ CI bot ]
* Resync trunk
[ Mathieu Trudel-Lapierre ]
* [bluetooth] Properly handle device types for connection and
  disconnection. (LP: #1369964)
[ Michael Terry ]
* Add a translator comment for what HERE means. (LP: #1368838) (LP:
  #1368838)
* Prevent a crash in unity8 when the wizard also crashes or stops
  early. (LP: #1355892) (LP: #1355892)
[ Michael Terry ]
* Prevent the buttons of the wizard's password page from overlapping
  its content when the OSK appears. (LP: #1368346) (LP: #1368346)
[ Ken VanDine ]
* Set the version information in the SystemUpdate constructor (LP:
  #1371810) (LP: #1371810)
* [reset] Don't bail out on an isValid() check on the SystemImage
  QDBusInterface, the docs say isValid() may not be reliable for
  remote interfaces (LP: #1370815) (LP: #1370815)
* Fixed reference error for count on the various device models (LP:
  #1362517) (LP: #1362517)
* [background] Use the ContentPeerPicker to select sources for
  backgrounds (LP: #1356542) (LP: #1356542)
[ Iain Lane ]
* Don't check if the timedated interface is valid before calling
  SetTime on it, it might have timed out and we should reactivate it
  in that case.
* [about] Fix developerMode property to be QMLish - read & write
  instead of separate "read" and "toggle" properties.
* [about] Don't display a frame for icons that can't be found,
  improving the visual appearance. Also return the correct path for
  click packages which use the icon theme.
[ Sebastien Bacher ]
* [storage] handle the scope click .ini and get the correct icons (LP:
  #1368920)
[ Albert Astals ]
* make pot
[ Oliver Grawert ]
* fix LP: #1365903, add a watch to Developer Mode page so the page
  gets refreshed when going back through the page stack, also fix the
  page id and bounds (LP: #1365903)
* Some packaging fixes
  - > is not a valid relationship. It should be >>
  - Don't recommend suru-icon-theme since we also depend on it
  - Bump S-V to 3.9.6 which for example allows the images we ship in
    /usr/lib/
  - Override binary-no-manpage lintian warnings. We're not going to get man
    pages for u-s-s any time soon
[ Ken VanDine ]
* Make UpdateManager a singleton and refresh the availableUpdates
  count when the model updates (LP: #1325629) (LP: #1325629)
[ Ken VanDine ]
* Include an icon instead of using the themed icon (LP: #1365408) (LP:
  #1365408)
[ Mathieu Trudel-Lapierre ]
* [bluetooth] don't try to enable Discoverable if the device isn't
  powered yet. (LP: #1355904)
[ Ken VanDine ]
* When activated by a url request for a specific panel, clear the
  pageStack to maintain the natural navigation instead of pushing a
  new page on top of a page from a the previous panel (LP: #1362025)
  (LP: #1362025, #1359953)
[ Lars Uebernickel ]
* Use Icon instead of StatusIcon
[ CI bot ]
* Resync trunk
[ John R. Lenton ]
* Take the system settings push helper closer to implementing the spec
  at https://wiki.ubuntu.com/SoftwareUpdates#Prompting (LP: #1363972)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-08:

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

review: Approve (continuous-integration)

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:

Diego Sarmentero

Ubuntu Touch System Settings

 === modified file 'plugins/system-update/PageComponent.qml'
 --- plugins/system-update/PageComponent.qml	2014-10-01 15:42:37 +0000
 +++ plugins/system-update/PageComponent.qml	2014-10-08 15:50:25 +0000
@@ -28,6 +28,7 @@
  import Ubuntu.Components.Popups 0.1
  import Ubuntu.OnlineAccounts.Client 0.1
  import Ubuntu.SystemSettings.Update 1.0
++import Ubuntu.Connectivity 1.0
  ItemPage {
@@ -45,6 +46,7 @@
      property bool batterySafeForUpdate: isCharging || chargeLevel > 25
      property var chargeLevel: indicatorPower.batteryLevel || 0
      property var notificationAction;
++    property string errorDialogText: ""
      QDBusActionGroup {
          id: indicatorPower
@@ -55,6 +57,21 @@
          Component.onCompleted: start()
+     }
++    Connections {
++        id: networkingStatus
++        target: NetworkingStatus
++        onOnlineChanged: {
++            if (NetworkingStatus.online) {
++                activity.running = true;
++                root.state = "SEARCHING";
++                UpdateManager.checkUpdates();
++            } else {
++                activity.running = false;
++            }
++        }
++    }
++
++
      DeviceInfo {
          id: deviceInfo
+     }
@@ -122,6 +139,23 @@
+          }
+     }
++    Component {
++         id: dialogErrorComponent
++         Dialog {
++             id: dialogueError
++             title: i18n.tr("Installation failed")
++             text: root.errorDialogText
++
++             Button {
++                 text: i18n.tr("OK")
++                 color: UbuntuColors.orange
++                 onClicked: {
++                     PopupUtils.close(dialogueError);
++                 }
++             }
++         }
++    }
++
      //states
      states: [
          State {
@@ -129,6 +163,7 @@
              PropertyChanges { target: installAllButton; visible: false}
              PropertyChanges { target: checkForUpdatesArea; visible: true}
              PropertyChanges { target: updateNotification; visible: false}
++            PropertyChanges { target: activity; running: true}
          },
          State {
              name: "NOUPDATES"
@@ -191,10 +226,22 @@
          onSystemUpdateFailed: {
              root.state = "SYSTEMUPDATEFAILED";
++            root.errorDialogText = i18n.tr("Sorry, the system update failed.");
++            PopupUtils.open(dialogErrorComponent);
+         }
          onUpdateProcessFailed: {
              root.state = "SYSTEMUPDATEFAILED";
++            root.errorDialogText = i18n.tr("Sorry, the system update failed.");
++            PopupUtils.open(dialogErrorComponent);
++        }
++
++        onServerError: {
++            activity.running = false;
++        }
++
++        onNetworkError: {
++            activity.running = false;
+         }
          onRebooting: {
@@ -237,22 +284,42 @@
                      anchors {
                          left: parent.left
                          top: parent.top
--                        rightMargin: units.gu(2)
+                     }
                      height: parent.height
+                 }
                  Label {
--                    text: i18n.tr("Checking for updates…")
++                    text: activity.running ? i18n.tr("Checking for updates…") : i18n.tr("Connect to the Internet to check for updates")
                      verticalAlignment: Text.AlignVCenter
                      elide: Text.ElideRight
                      anchors {
--                        left: activity.right
++                        left: activity.running ? activity.right : parent.left
                          top: parent.top
++                        right: btnRetry.left
++                        rightMargin: units.gu(2)
                          leftMargin: units.gu(2)
+                     }
                      height: parent.height
+                 }
++
++                Button {
++                    id: btnRetry
++                    text: i18n.tr("Retry")
++                    color: UbuntuColors.orange
++                    anchors {
++                        right: parent.right
++                        top: parent.top
++                        bottom: parent.bottom
++                        margins: units.gu(1)
++                    }
++                    visible: !activity.visible
++
++                    onClicked: {
++                        activity.running = true;
++                        root.state = "SEARCHING";
++                        UpdateManager.checkUpdates();
++                    }
++                }
+             }
              ListItem.SingleControl {
 === modified file 'plugins/system-update/network/network.cpp'
 --- plugins/system-update/network/network.cpp	2014-07-23 13:53:48 +0000
 +++ plugins/system-update/network/network.cpp	2014-10-08 15:50:25 +0000
@@ -26,7 +26,8 @@
  #include <QProcessEnvironment>
  #define URL_APPS "https://myapps.developer.ubuntu.com/dev/api/click-metadata/"
--#define URL_PACKAGE "https://search.apps.ubuntu.com/api/v1/package/"
++
++#define APPS_DATA "APPS_DATA"
  namespace UpdatePlugin {
@@ -34,9 +35,6 @@
      QObject(parent),
      m_nam(this)
+ {
--    m_request.setHeader(QNetworkRequest::ContentTypeHeader,
--                              "application/json");
--
      QObject::connect(&m_nam, SIGNAL(finished(QNetworkReply*)),
                       this, SLOT(onReply(QNetworkReply*)));
+ }
@@ -57,12 +55,14 @@
      QByteArray content = doc.toJson();
      QString urlApps = getUrlApps();
--    m_request.setUrl(QUrl(urlApps));
--    m_nam.post(m_request, content);
++    QNetworkRequest request;
++    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
++    request.setUrl(QUrl(urlApps));
++    RequestObject* reqObject = new RequestObject(QString(APPS_DATA));
++    request.setOriginatingObject(reqObject);
++    m_nam.post(request, content);
+ }
--
--
  QString Network::getUrlApps()
+ {
      QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
@@ -70,85 +70,75 @@
      return command;
+ }
--QString Network::getUrlPackage()
--{
--    QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
--    QString command = environment.value("URL_PACKAGE", QString(URL_PACKAGE));
--    return command;
--}
--
  void Network::onReply(QNetworkReply *reply)
+ {
--    QVariant statusAttr = reply->attribute(
--                            QNetworkRequest::HttpStatusCodeAttribute);
--    if (!statusAttr.isValid()) {
--        Q_EMIT errorOccurred();
--        return;
--    }
--
--    int httpStatus = statusAttr.toInt();
--
--    if (httpStatus == 200 || httpStatus == 201) {
--        if (reply->hasRawHeader(X_CLICK_TOKEN)) {
--            Update* app = qobject_cast<Update*>(
--                        reply->request().originatingObject());
--            if (app != nullptr) {
--                QString header(reply->rawHeader(X_CLICK_TOKEN));
--                Q_EMIT clickTokenObtained(app, header);
--            }
--            reply->deleteLater();
++    if (reply->error() == QNetworkReply::NoError) {
++        QVariant statusAttr = reply->attribute(
++                                QNetworkRequest::HttpStatusCodeAttribute);
++        if (!statusAttr.isValid()) {
++            Q_EMIT errorOccurred();
              return;
+         }
--        QByteArray payload = reply->readAll();
--        QJsonDocument document = QJsonDocument::fromJson(payload);
--
--        if (document.isArray()) {
--            QJsonArray array = document.array();
--            int i;
--            bool updates = false;
--            for (i = 0; i < array.size(); i++) {
--                QJsonObject object = array.at(i).toObject();
--                QString name = object.value("name").toString();
--                QString version = object.value("version").toString();
--                QString icon_url = object.value("icon_url").toString();
--                int size = object.value("binary_filesize").toVariant().toInt();
--                if (m_apps.contains(name)) {
--                    m_apps[name]->setRemoteVersion(version);
--                    if (m_apps[name]->updateRequired()) {
--                        m_apps[name]->setIconUrl(icon_url);
--                        m_apps[name]->setBinaryFilesize(size);
--                        updates = true;
++        int httpStatus = statusAttr.toInt();
++
++        if (httpStatus == 200 || httpStatus == 201) {
++            if (reply->hasRawHeader(X_CLICK_TOKEN)) {
++                Update* app = qobject_cast<Update*>(
++                            reply->request().originatingObject());
++                if (app != nullptr) {
++                    QString header(reply->rawHeader(X_CLICK_TOKEN));
++                    Q_EMIT clickTokenObtained(app, header);
++                }
++                reply->deleteLater();
++                return;
++            }
++
++            QByteArray payload = reply->readAll();
++            QJsonDocument document = QJsonDocument::fromJson(payload);
++
++            RequestObject* state = qobject_cast<RequestObject*>(reply->request().originatingObject());
++            if (state != nullptr && state->operation.contains(APPS_DATA) && document.isArray()) {
++                QJsonArray array = document.array();
++                bool updates = false;
++                for (int i = 0; i < array.size(); i++) {
++                    QJsonObject object = array.at(i).toObject();
++                    QString name = object.value("name").toString();
++                    QString version = object.value("version").toString();
++                    QString icon_url = object.value("icon_url").toString();
++                    QString url = object.value("download_url").toString();
++                    int size = object.value("binary_filesize").toVariant().toInt();
++                    if (m_apps.contains(name)) {
++                        m_apps[name]->setRemoteVersion(version);
++                        if (m_apps[name]->updateRequired()) {
++                            m_apps[name]->setIconUrl(icon_url);
++                            m_apps[name]->setDownloadUrl(url);
++                            m_apps[name]->setBinaryFilesize(size);
++                            updates = true;
++                        }
+                     }
+                 }
--            }
--            if (updates) {
--                Q_EMIT updatesFound();
++                if (updates) {
++                    Q_EMIT updatesFound();
++                } else {
++                    Q_EMIT updatesNotFound();
++                }
              } else {
--                Q_EMIT updatesNotFound();
++                Q_EMIT errorOccurred();
+             }
--        } else if (document.isObject()) {
--            QJsonObject object = document.object();
--            QString url = object.value("download_url").toString();
--            QString name = object.value("name").toString();
--            Q_EMIT downloadUrlFound(name, url);
          } else {
              Q_EMIT errorOccurred();
+         }
++    } else if (reply->error() == QNetworkReply::TemporaryNetworkFailureError ||
++               reply->error() == QNetworkReply::UnknownNetworkError) {
++        Q_EMIT networkError();
      } else {
--        Q_EMIT errorOccurred();
++        Q_EMIT serverError();
+     }
      reply->deleteLater();
+ }
--void Network::getResourceUrl(const QString &packagename)
--{
--    QString urlPackage = getUrlPackage();
--    m_request.setUrl(QUrl(urlPackage + packagename));
--    m_nam.get(m_request);
--}
--
  void Network::getClickToken(Update *app, const QString &url,
                              const QString &authHeader)
+ {
 === modified file 'plugins/system-update/network/network.h'
 --- plugins/system-update/network/network.h	2014-02-25 20:27:51 +0000
 +++ plugins/system-update/network/network.h	2014-10-08 15:50:25 +0000
@@ -29,6 +29,19 @@
  namespace UpdatePlugin {
++class RequestObject : public QObject
++{
++    Q_OBJECT
++public:
++    explicit RequestObject(QString oper, QObject *parent = 0) :
++        QObject(parent)
++    {
++        operation = oper;
++    }
++
++    QString operation;
++};
++
  class Network : public QObject
+ {
      Q_OBJECT
@@ -36,7 +49,6 @@
      explicit Network(QObject *parent = 0);
      void checkForNewVersions(QHash<QString, Update*> &apps);
--    void getResourceUrl(const QString &packagename);
      void getClickToken(Update *app, const QString &url,
                         const QString &authHeader);
@@ -44,7 +56,8 @@
      void updatesFound();
      void updatesNotFound();
      void errorOccurred();
--    void downloadUrlFound(const QString &packagename, const QString &url);
++    void networkError();
++    void serverError();
      void clickTokenObtained(Update *app, const QString &clickToken);
  private Q_SLOTS:
@@ -52,11 +65,9 @@
  private:
      QNetworkAccessManager m_nam;
--    QNetworkRequest m_request;
      QHash<QString, Update*> m_apps;
      QString getUrlApps();
--    QString getUrlPackage();
  };
+ }
 === modified file 'plugins/system-update/update_manager.cpp'
 --- plugins/system-update/update_manager.cpp	2014-09-19 04:26:10 +0000
 +++ plugins/system-update/update_manager.cpp	2014-10-08 15:50:25 +0000
@@ -63,12 +63,13 @@
                    this, SLOT(clickUpdateNotAvailable()));
      QObject::connect(&m_network, SIGNAL(errorOccurred()),
                    this, SIGNAL(errorFound()));
++    QObject::connect(&m_network, SIGNAL(networkError()),
++                  this, SIGNAL(networkError()));
++    QObject::connect(&m_network, SIGNAL(serverError()),
++                  this, SIGNAL(serverError()));
      QObject::connect(&m_network,
                       SIGNAL(clickTokenObtained(Update*, const QString&)),
                       this, SLOT(clickTokenReceived(Update*, const QString&)));
--    QObject::connect(&m_network,
--                     SIGNAL(downloadUrlFound(const QString&, const QString&)),
--                     this, SLOT(downloadUrlObtained(const QString&, const QString&)));
      // SYSTEM UPDATE
      QObject::connect(&m_systemUpdate, SIGNAL(updateAvailable(const QString&, Update*)),
                    this, SLOT(registerSystemUpdate(const QString&, Update*)));
@@ -281,7 +282,7 @@
      if (m_apps[packagename]->systemUpdate()) {
          m_systemUpdate.downloadUpdate();
      } else {
--        m_network.getResourceUrl(packagename);
++        downloadApp(m_apps[packagename]);
+     }
+ }
@@ -305,16 +306,13 @@
      m_systemUpdate.pauseDownload();
+ }
--void UpdateManager::downloadUrlObtained(const QString &packagename,
--                                        const QString &url)
++void UpdateManager::downloadApp(Update *app)
+ {
      if (m_token.isValid()) {
--        QString authHeader = m_token.signUrl(url, QStringLiteral("HEAD"), true);
--        Update *app = m_apps[packagename];
--        app->setClickUrl(url);
--        m_network.getClickToken(app, url, authHeader);
++        QString authHeader = m_token.signUrl(app->downloadUrl(), QStringLiteral("HEAD"), true);
++        app->setClickUrl(app->downloadUrl());
++        m_network.getClickToken(app, app->downloadUrl(), authHeader);
      } else {
--        Update *app = m_apps[packagename];
          app->setError("Invalid User Token");
+     }
+ }
 === modified file 'plugins/system-update/update_manager.h'
 --- plugins/system-update/update_manager.h	2014-09-18 19:57:03 +0000
 +++ plugins/system-update/update_manager.h	2014-10-08 15:50:25 +0000
@@ -70,6 +70,8 @@
      void credentialsNotFound();
      void updateAvailableFound(bool downloading);
      void errorFound();
++    void networkError();
++    void serverError();
      void downloadModeChanged();
      void systemUpdateDownloaded();
      void updateProcessFailed(QString message);
@@ -121,7 +123,7 @@
      void systemUpdateProgress(int value, double eta);
      void processOutput();
      void processUpdates();
--    void downloadUrlObtained(const QString &packagename, const QString &url);
++    void downloadApp(Update *app);
      void handleCredentialsFound(Token token);
      void clickTokenReceived(Update *app, const QString &clickToken);