Merge lp:~mardy/webbrowser-app/no-content-hub into lp:webbrowser-app

[Alberto Mardegan]

Don't use the ContentHub-based downloader if the service is not available

This change makes use of the "valid" property added to the ContentHub singleton in
https://code.launchpad.net/~mardy/content-hub/valid-1676893/+merge/322091

Don't use the ContentHub-based downloader if the service is not available

This change makes use of the "valid" property added to the ContentHub singleton in
https://code.launchpad.net/~mardy/content-hub/valid-1676893/+merge/322091

[system-apps-ci-bot (system-apps-ci-bot)]

PASSED: Continuous integration, rev:1587
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/5/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2472
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2472
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2283
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2283/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2283
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2283/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2283
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2283/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2283
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2283/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2283
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2283/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2283
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2283/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/5/rebuild

review: Approve (continuous-integration)

Unmerged revisions

1587. By Alberto Mardegan on 2017-04-05

Don't use ContentHub APIs if service unavailable

=== modified file 'src/app/Downloader.qml'
--- src/app/Downloader.qml	2016-09-22 15:12:01 +0000
+++ src/app/Downloader.qml	2017-04-06 08:42:59 +0000
@@ -29,6 +29,7 @@
 
     property string filename
     property string mimeType
+    property bool valid: ContentHub.valid
 
     signal showDownloadDialog(string downloadId, var contentType, var downloader, string filename, string mimeType)
 

=== modified file 'src/app/WebViewImpl.qml'
--- src/app/WebViewImpl.qml	2016-09-22 15:12:01 +0000
+++ src/app/WebViewImpl.qml	2017-04-06 08:42:59 +0000
@@ -53,7 +53,8 @@
             return
         }
 
-        if (downloadLoader.status == Loader.Ready) {
+        if (downloadLoader.status == Loader.Ready &&
+            downloadLoader.item.valid) {
             var headers = { }
             if (request.cookies.length > 0) {
                 headers["Cookie"] = request.cookies.join(";")