Merge lp:~vthompson/music-app/fix-1478162 into lp:music-app

[Victor Thompson]

* Fix to allow the LibraryEmptyState to work again

* Fix to allow the LibraryEmptyState to work again

A minor bug in the ContentHubHelper was causing the LibraryEmptyState to not work properly. It may have been causing other issues that we were working around. So things related to ContentHub should probably be retested for surface level failures.

I want this to land prior to releasing the next revision of the app to the app store.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:889
http://91.189.93.70:8080/job/music-app-ci/1349/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/201

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1349/rebuild

review: Approve (continuous-integration)

[lp:~vthompson/music-app/fix-1478162]

890. By Victor Thompson on 2015-07-25

update changelog

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:890
http://91.189.93.70:8080/job/music-app-ci/1350/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/202

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1350/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Woops! Wonder how that happened. LGTM :-)

review: Approve

=== modified file 'app/components/Helpers/ContentHubHelper.qml'
--- app/components/Helpers/ContentHubHelper.qml	2015-06-29 23:50:12 +0000
+++ app/components/Helpers/ContentHubHelper.qml	2015-07-25 04:43:04 +0000
@@ -28,7 +28,7 @@
     property var activeTransfer
     property int importId: 0
     property list<ContentItem> importItems
-    property bool processing: contentHubWaitForFile !== -1
+    property bool processing: contentHubWaitForFile.processId !== -1
 
     ContentTransferHint {
         anchors {

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-24 02:09:59 +0000
+++ debian/changelog	2015-07-25 04:43:04 +0000
@@ -1,7 +1,8 @@
 music-app (2.2ubuntu1) UNRELEASED; urgency=medium
 
   [ Victor Thompson ]
-  * Fix SongsView album art for albums and genres
+  * Fix SongsView album art for albums and genres (LP: #1477366)
+  * Fix to allow the LibraryEmptyState to work again (LP: #1478162)
 
  -- Victor Thompson <[e-mail]>  Thu, 23 Jul 2015 21:08:38 -0500