Merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-1544149 into lp:ubuntu-docviewer-app

[Stefano Verzegnassi]

Fixed ContentTransferHint being visible during an export

Fixed ContentTransferHint being visible during an export

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:297
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1016/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/568/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1016/rebuild

review: Approve (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:297
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1018/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/570/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1018/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Tested this on OTA-9. It brings up the document selector, and I can select a document to transfer. However when I then press the tick in the header, nothing happens. I get a vibrate so it did notice I pressed the tick, but it never transfers the file. The document selector still works, I can select and unselect documents, but I can never transfer them.

review: Needs Fixing

[lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-1544149]

298. By Stefano Verzegnassi on 2016-02-12

Fixed DocumentPagePickModeHeader:
* Use UCListItem 1.2+ APIs
* Use content-hub properly

299. By Stefano Verzegnassi on 2016-02-12

Restore the browse mode when the content transfer is completed or aborted

[Stefano Verzegnassi (verzegnassi-stefano)]

Fixed!

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:298
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1027/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/579/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1027/rebuild

review: Approve (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:299
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1028/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/580/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1028/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Yup! Fixed! Thank you!

review: Approve

=== modified file 'src/app/qml/common/ContentHubProxy.qml'
--- src/app/qml/common/ContentHubProxy.qml	2015-10-10 12:03:30 +0000
+++ src/app/qml/common/ContentHubProxy.qml	2016-02-12 13:03:03 +0000
@@ -23,11 +23,12 @@
 Item {
     id: contentHubProxy
 
-    property var activeTransfer
+    property var activeImportTransfer
+    property var activeExportTransfer
 
     // This property is used in ../documentPage/Document(Grid|List)View.qml
     // so that we avoid to import Ubuntu.Content module outside this proxy.
-    property bool multipleSelectionType: !activeTransfer || activeTransfer.selectionType == ContentTransfer.Multiple
+    property bool multipleSelectionType: !activeExportTransfer || activeExportTransfer.selectionType == ContentTransfer.Multiple
 
     property alias rejectedDocuments: rejectedDocsModel
     property alias importedDocuments: importedDocsModel
@@ -36,22 +37,22 @@
     ListModel { id: importedDocsModel }
 
     ContentTransferHint {
-        activeTransfer: contentHubProxy.activeTransfer
+        activeTransfer: contentHubProxy.activeImportTransfer
     }
 
     Connections {
         target: ContentHub
 
         onImportRequested: {
-             activeTransfer = transfer
+             activeImportTransfer = transfer
 
-            if (activeTransfer.state === ContentTransfer.Charged) {
+            if (activeImportTransfer.state === ContentTransfer.Charged) {
                 mainView.switchToBrowseMode()
 
                 internal.clearModels()
 
-                for (var i=0; i<activeTransfer.items.length; i++) {
-                    var sourcePath = internal.getPathFromUrl(activeTransfer.items[i].url)
+                for (var i=0; i<activeImportTransfer.items.length; i++) {
+                    var sourcePath = internal.getPathFromUrl(activeImportTransfer.items[i].url)
 
                     if (DocumentViewer.isFileSupported(sourcePath)) {
                         var documentsLocation = DocumentViewer.getXdgDocumentsLocation()
@@ -84,7 +85,7 @@
         }
 
         onExportRequested: {
-            activeTransfer = transfer
+            activeExportTransfer = transfer
             mainView.switchToPickMode()
         }
     }
@@ -125,7 +126,7 @@
         }
 
         function finalizeImport() {
-            activeTransfer.finalize()
+            activeImportTransfer.finalize()
         }
 
         function handleNotifications() {

=== modified file 'src/app/qml/documentPage/DocumentListView.qml'
--- src/app/qml/documentPage/DocumentListView.qml	2015-11-01 16:50:23 +0000
+++ src/app/qml/documentPage/DocumentListView.qml	2016-02-12 13:03:03 +0000
@@ -24,7 +24,7 @@
 
     function isMultipleSelection() {
         // No active transfer, then we're in selection mode.
-        if (!contentHubProxy.activeTransfer)
+        if (!contentHubProxy.activeExportTransfer)
             return true
 
         // We have an active transfer, get the value from the content hub proxy

=== modified file 'src/app/qml/documentPage/DocumentPagePickModeHeader.qml'
--- src/app/qml/documentPage/DocumentPagePickModeHeader.qml	2015-10-23 14:10:47 +0000
+++ src/app/qml/documentPage/DocumentPagePickModeHeader.qml	2016-02-12 13:03:03 +0000
@@ -29,10 +29,13 @@
         objectName: "cancelButton"
         iconName: "close"
         onTriggered: {
-            if (!contentHubProxy.activeTransfer)
-                return;
-
-            contentHubProxy.activeTransfer.state = ContentTransfer.Aborted;
+            if (!contentHubProxy.activeExportTransfer)
+                return
+
+            contentHubProxy.activeExportTransfer.items = []
+            contentHubProxy.activeExportTransfer.state = ContentTransfer.Aborted
+
+            mainView.switchToBrowseMode()
         }
     }
 
@@ -48,23 +51,32 @@
         Action {
             text: i18n.tr("Pick")
             objectName: "pickButton"
-            enabled: viewLoader.item.selectedItems.count > 0
+            enabled: viewLoader.item.ViewItems.selectedIndices.length > 0
             iconName: "ok"
             onTriggered: {
-                if (!enabled || !contentHubProxy.activeTransfer)
+                if (!enabled || !contentHubProxy.activeExportTransfer)
                     return;
 
-                var urlList = []
-                var indices = documentPage.view.item.selectedIndices;
+                var contentList = []
+                var indices = viewLoader.item.ViewItems.selectedIndices
+
+                console.log("[content-hub] Following files will be exported:")
 
                 for (var i=0; i < indices.length; i++) {
-                    urlList.push("file://" + folderModel.get(i).path);
+                    var filePath = "file://" + folderModel.get(i).path
+                    console.log(filePath)
+
+                    contentList.push(contentItem.createObject(rootItem, { "url": filePath }))
                 }
 
-                contentHubProxy.activeTransfer.items = urlList
-                contentHubProxy.activeTransfer.state = ContentTransfer.Charged
+                contentHubProxy.activeExportTransfer.items = contentList
+                contentHubProxy.activeExportTransfer.state = ContentTransfer.Charged
+
+                mainView.switchToBrowseMode()
             }
         }
     ]
+
+    property Component contentItem: Component { ContentItem {} }
 }