Merge lp:~stolowski/unity8/shareData-rename into lp:unity8

[Paweł Stołowski]

Changes 'shareData' and 'contentType' attributes to 'share-data' and 'content-type', to match existing naming schema.

Whilst documenting the new attributes related to content sharing with Content hub, I realized we were not consistent with the new names and should be following "foo-bar" naming, not camel case. This MR changes 'shareData' and 'contentType' attributes to match existing naming schema.

Note: I tested that nothing breaks after this change, but wasn't actually able to test actual functionality, cause it wasn't working already - see https://code.launchpad.net/~cimi/unity8/preview-sharing-fix-broken-binding/+merge/280875 which fixes it.

* Are there any related MPs required for this MP to build/function as expected? Please list.
n
 * Did you perform an exploratory manual test run of your code change and any related functionality?
n/a
 * Did you make sure that your branch does not contain spurious tags?
y
 * 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?
n/a

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2081
http://jenkins.qa.ubuntu.com/job/unity8-ci/6978/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5862
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/393/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1688
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/391
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1583
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1583
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/390
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/389
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4519
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5873
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5873/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26214
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/154/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/391
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/391/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26215

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6978/rebuild

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

Is there a related content-hub branch that does the rename on that side? (Maybe I'm misunderstanding how this works, but I'd assume just renaming on our side isn't enough.)

review: Needs Information

[Paweł Stołowski (stolowski)]

> Is there a related content-hub branch that does the rename on that side?
> (Maybe I'm misunderstanding how this works, but I'd assume just renaming on
> our side isn't enough.)

No, there is no change needed in content-hub; this is just renaming of the attributes exposed by scopes and consumed by unity8. How they are futher exposed to content-hub remains unaffected.

[Michael Terry (mterry)]

Alright, looks good then. No scopes use this functionality yet either. So safe to rename in isolation.

review: Approve

=== modified file 'qml/Dash/Previews/PreviewSharing.qml'
--- qml/Dash/Previews/PreviewSharing.qml	2015-10-26 18:32:19 +0000
+++ qml/Dash/Previews/PreviewSharing.qml	2015-12-15 15:10:41 +0000
@@ -25,7 +25,7 @@
 
     property var shareData
     readonly property bool isUrlExternal: url && url.indexOf("file:///") != 0 && url.indexOf("/") != 0
-    readonly property string contentType: shareData ? shareData["contentType"] : ""
+    readonly property string contentType: shareData ? shareData["content-type"] : ""
     readonly property var url: shareData ? shareData["uri"] : ""
     readonly property Item rootItem: QuickUtils.rootItem(root)
 

=== modified file 'qml/Dash/Previews/PreviewVideoPlayback.qml'
--- qml/Dash/Previews/PreviewVideoPlayback.qml	2015-11-04 14:57:13 +0000
+++ qml/Dash/Previews/PreviewVideoPlayback.qml	2015-12-15 15:10:41 +0000
@@ -81,7 +81,7 @@
                 right: parent.right
                 bottom: parent.bottom
             }
-            shareData: widgetData["shareData"]
+            shareData: widgetData["share-data"]
         }
     }
 }

=== modified file 'qml/Dash/Previews/PreviewZoomableImage.qml'
--- qml/Dash/Previews/PreviewZoomableImage.qml	2015-11-04 14:57:13 +0000
+++ qml/Dash/Previews/PreviewZoomableImage.qml	2015-12-15 15:10:41 +0000
@@ -72,7 +72,7 @@
                 right: parent.right
                 bottom: parent.bottom
             }
-            shareData: widgetData["shareData"]
+            shareData: widgetData["share-data"]
         }
     }
 

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewSharing.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewSharing.qml	2015-10-26 18:32:19 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewSharing.qml	2015-12-15 15:10:41 +0000
@@ -32,12 +32,12 @@
                     "text here 2",
                     "text here 3"
                 ],
-        "contentType": "text"
+        "content-type": "text"
     }
 
     property var shareDataNoUri: {
         "uri": "",
-        "contentType": "text"
+        "content-type": "text"
     }
 
     PreviewSharing {