Merge lp:~bfiller/gallery-app/gallery-app-share-handler into lp:gallery-app

[Bill Filler]

Switch to using the content-hub for sharing. When selecting the share action, the ContentPeerPicker will be shown with a list of apps that provide sharing.

Switch to using the content-hub for sharing. When selecting the share action, the ContentPeerPicker will be shown with a list of apps that provide sharing.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:929
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/876/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/51
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/51/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/51
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/103
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/961
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/143
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8676
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/829
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1104
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1104/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/876/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:929
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/882/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/57/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/132
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1231
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/281
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/189
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9115
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1014
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1377
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1377/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/882/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:931
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/885/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/60
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/60/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/60
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/138
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1278
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/287
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/196
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9178
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1052
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1426
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1426/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/885/rebuild

review: Needs Fixing (continuous-integration)

[lp:~bfiller/gallery-app/gallery-app-share-handler]

932. By Bill Filler on 2014-07-02

fix import

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:932
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/886/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/61
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/61/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/61
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/140
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1288
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/289
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/198
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9187
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1061
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1436
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1436/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/886/rebuild

review: Needs Fixing (continuous-integration)

[lp:~bfiller/gallery-app/gallery-app-share-handler]

933. By Bill Filler on 2014-07-02

fix test

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:933
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/887/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/62
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/62/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/147
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1303
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/296
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/206
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9211
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1074
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1453
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1453/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/887/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

went through the test plan, all working
Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
yes

Did CI run pass? If not, please explain why.
yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
yes

review: Approve

=== modified file 'po/gallery-app.pot'
--- po/gallery-app.pot	2014-05-09 19:52:57 +0000
+++ po/gallery-app.pot	2014-07-02 22:11:28 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gallery-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-09 16:45-0300\n"
+"POT-Creation-Date: 2014-06-05 11:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,7 +17,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: desktop/gallery-app.desktop.in:3 rc/qml/MediaViewer/PopupPhotoViewer.qml:65
+#: desktop/gallery-app.desktop.in:3 rc/qml/MediaViewer/PopupPhotoViewer.qml:64
 msgid "Gallery"
 msgstr ""
 
@@ -34,16 +34,16 @@
 msgstr ""
 
 #: rc/qml/AlbumEditor/AlbumEditMenu.qml:50
-#: rc/qml/AlbumViewer/AlbumViewer.qml:439
-#: rc/qml/MediaViewer/MediaViewer.qml:488
-#: rc/qml/MediaViewer/MediaViewer.qml:494
-#: rc/qml/MediaViewer/MediaViewer.qml:548 rc/qml/Utility/EditingHUD.qml:67
+#: rc/qml/AlbumViewer/AlbumViewer.qml:438
+#: rc/qml/MediaViewer/MediaViewer.qml:479
+#: rc/qml/MediaViewer/MediaViewer.qml:485
+#: rc/qml/MediaViewer/MediaViewer.qml:538 rc/qml/Utility/EditingHUD.qml:67
 #: rc/qml/Utility/SelectionToolbarAction.qml:51
 msgid "Delete"
 msgstr ""
 
 #: rc/qml/AlbumEditor/AlbumEditor.qml:40
-#: rc/qml/Components/MediaSelector.qml:90 rc/qml/PickerScreen.qml:114
+#: rc/qml/Components/MediaSelector.qml:92 rc/qml/PickerScreen.qml:114
 #: rc/qml/Utility/SelectionToolbarAction.qml:66
 msgid "Cancel"
 msgstr ""
@@ -68,42 +68,42 @@
 msgid "Red"
 msgstr ""
 
-#: rc/qml/AlbumViewer/AlbumViewer.qml:84
+#: rc/qml/AlbumViewer/AlbumViewer.qml:90
 msgid "Album"
 msgstr ""
 
-#: rc/qml/AlbumViewer/AlbumViewer.qml:428
+#: rc/qml/AlbumViewer/AlbumViewer.qml:427
 msgid "Add to album"
 msgstr ""
 
-#: rc/qml/AlbumViewer/AlbumViewer.qml:434
-#: rc/qml/MediaViewer/MediaViewer.qml:483
-#: rc/qml/MediaViewer/MediaViewer.qml:538 rc/qml/Utility/EditingHUD.qml:77
+#: rc/qml/AlbumViewer/AlbumViewer.qml:433
+#: rc/qml/MediaViewer/MediaViewer.qml:474
+#: rc/qml/MediaViewer/MediaViewer.qml:528 rc/qml/Utility/EditingHUD.qml:77
 #: rc/qml/Utility/SelectionToolbarAction.qml:44
 msgid "Add"
 msgstr ""
 
-#: rc/qml/AlbumViewer/AlbumViewer.qml:448
-#: rc/qml/MediaViewer/MediaViewer.qml:512
-#: rc/qml/MediaViewer/MediaViewer.qml:567
+#: rc/qml/AlbumViewer/AlbumViewer.qml:447
+#: rc/qml/MediaViewer/MediaViewer.qml:502
+#: rc/qml/MediaViewer/MediaViewer.qml:557
 msgid "Back"
 msgstr ""
 
-#: rc/qml/AlbumsOverview.qml:186 rc/qml/Components/PopupAlbumPicker.qml:91
+#: rc/qml/AlbumsOverview.qml:197 rc/qml/Components/PopupAlbumPicker.qml:91
 msgid "Add new album"
 msgstr ""
 
-#: rc/qml/AlbumsOverview.qml:204 rc/qml/Utility/PhotosToolbarActions.qml:46
+#: rc/qml/AlbumsOverview.qml:215 rc/qml/Utility/PhotosToolbarActions.qml:46
 msgid "Camera"
 msgstr ""
 
 #: rc/qml/Components/DeleteDialog.qml:36
-#: rc/qml/MediaViewer/MediaViewer.qml:297
+#: rc/qml/MediaViewer/MediaViewer.qml:288
 msgid "Yes"
 msgstr ""
 
 #: rc/qml/Components/DeleteDialog.qml:45
-#: rc/qml/MediaViewer/MediaViewer.qml:308
+#: rc/qml/MediaViewer/MediaViewer.qml:299
 msgid "No"
 msgstr ""
 
@@ -115,8 +115,8 @@
 msgid "Delete album + contents"
 msgstr ""
 
-#: rc/qml/Components/MediaSelector.qml:56
-#: rc/qml/Components/MediaSelector.qml:78
+#: rc/qml/Components/MediaSelector.qml:59
+#: rc/qml/Components/MediaSelector.qml:80
 msgid "Add to Album"
 msgstr ""
 
@@ -128,21 +128,21 @@
 msgid "Loading…"
 msgstr ""
 
-#: rc/qml/MainScreen.qml:80
+#: rc/qml/MainScreen.qml:96
 msgid "Albums"
 msgstr ""
 
-#: rc/qml/MainScreen.qml:97 rc/qml/MainScreen.qml:120
+#: rc/qml/MainScreen.qml:113 rc/qml/MainScreen.qml:136
 #: rc/qml/PickerScreen.qml:54
 msgid "Events"
 msgstr ""
 
-#: rc/qml/MainScreen.qml:118 rc/qml/MainScreen.qml:162
+#: rc/qml/MainScreen.qml:134 rc/qml/MainScreen.qml:178
 #: rc/qml/Utility/PhotosToolbarActions.qml:33
 msgid "Select"
 msgstr ""
 
-#: rc/qml/MainScreen.qml:130 rc/qml/MainScreen.qml:164
+#: rc/qml/MainScreen.qml:146 rc/qml/MainScreen.qml:180
 #: rc/qml/PickerScreen.qml:74
 msgid "Photos"
 msgstr ""
@@ -172,37 +172,33 @@
 msgid "Revert to original"
 msgstr ""
 
-#: rc/qml/MediaViewer/MediaViewer.qml:234
-msgid "Configure Facebook for photo sharing..."
-msgstr ""
-
-#: rc/qml/MediaViewer/MediaViewer.qml:286 rc/qml/PhotosOverview.qml:75
+#: rc/qml/MediaViewer/MediaViewer.qml:277 rc/qml/PhotosOverview.qml:75
 msgid "Delete a photo"
 msgstr ""
 
-#: rc/qml/MediaViewer/MediaViewer.qml:464
+#: rc/qml/MediaViewer/MediaViewer.qml:455
 msgid "Edit"
 msgstr ""
 
-#: rc/qml/MediaViewer/MediaViewer.qml:475
+#: rc/qml/MediaViewer/MediaViewer.qml:466
 msgid "Add photo to album"
 msgstr ""
 
-#: rc/qml/MediaViewer/MediaViewer.qml:501
+#: rc/qml/MediaViewer/MediaViewer.qml:492
 msgid "Share photo"
 msgstr ""
 
-#: rc/qml/MediaViewer/MediaViewer.qml:507
-#: rc/qml/MediaViewer/MediaViewer.qml:558 rc/qml/Utility/EditingHUD.qml:72
+#: rc/qml/MediaViewer/MediaViewer.qml:498
+#: rc/qml/MediaViewer/MediaViewer.qml:548 rc/qml/Utility/EditingHUD.qml:72
 #: rc/qml/Utility/SelectionToolbarAction.qml:58
 msgid "Share"
 msgstr ""
 
-#: rc/qml/MediaViewer/MediaViewer.qml:525
+#: rc/qml/MediaViewer/MediaViewer.qml:515
 msgid "Pause"
 msgstr ""
 
-#: rc/qml/MediaViewer/MediaViewer.qml:525
+#: rc/qml/MediaViewer/MediaViewer.qml:515
 msgid "Play"
 msgstr ""
 

=== modified file 'rc/qml/MediaViewer/MediaViewer.qml'
--- rc/qml/MediaViewer/MediaViewer.qml	2014-06-17 03:23:39 +0000
+++ rc/qml/MediaViewer/MediaViewer.qml	2014-07-02 22:11:28 +0000
@@ -23,7 +23,7 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
-import Ubuntu.Components.Extras 0.1
+import Ubuntu.Content 0.1
 import "../Components"
 import "../Utility"
 import "../../js/Gallery.js" as Gallery
@@ -224,42 +224,32 @@
                      !editHUD.actionActive
 
         Component {
-            id: shareConfigurePopover
-
-            ActionSelectionPopover {
-                objectName: "shareConfigurePopover"
-                visible: false
-                actions: ActionList {
-                    Action {
-                        text: i18n.tr("Configure Facebook for photo sharing...")
-                        onTriggered: {
-                            Qt.openUrlExternally("settings:///system/online-accounts");
-                        }
-                    }
-                }
-            }
+            id: contentItemComp
+            ContentItem {}
         }
 
-        FacebookAccount {
-            id: facebook
-
-            property ActionSelectionPopover _lastPopover: null
-
-            function configureOrStartSharing(button) {
-                if (_lastPopover) {
-                    PopupUtils.close(_lastPopover);
-                    _lastPopover = null;
-                } else {
-                    if (facebook.id == -1) {
-                        _lastPopover = PopupUtils.open(shareConfigurePopover, button);
-                    } else {
-                        sharePanel.fileToShare = viewerWrapper.media.path;
-                        sharePanel.userAccountId = facebook.id;
-                        sharePanel.visible = true;
-                        viewerWrapper.tools.opened = false;
-                        _lastPopover = null;
+        Rectangle {
+            id: sharePicker
+            anchors.fill: parent
+            visible: false
+
+            ContentPeerPicker {
+                objectName: "sharePicker"
+                anchors.fill: parent
+                visible: parent.visible
+                contentType: galleryPhotoViewer.media.type === MediaSource.Video ? ContentType.Videos : ContentType.Pictures
+                handler: ContentHandler.Share
+
+                onPeerSelected: {
+                    parent.visible = false;
+                    var curTransfer = peer.request();
+                    if (curTransfer.state === ContentTransfer.InProgress)
+                    {
+                        curTransfer.items = [ contentItemComp.createObject(parent, {"url": viewerWrapper.media.path}) ];
+                        curTransfer.state = ContentTransfer.Charged;
                     }
                 }
+                onCancelPressed: parent.visible = false;
             }
         }
 
@@ -546,7 +536,7 @@
                     text: i18n.tr("Share photo")
                     iconSource: "../../img/share.png"
                     onTriggered: {
-                        facebook.configureOrStartSharing(photoShareButton);
+                        sharePicker.visible = true;
                     }
                 }
                 text: i18n.tr("Share")
@@ -602,7 +592,7 @@
                 text: i18n.tr("Share")
                 iconSource: "../../img/share.png"
                 onTriggered: {
-                    facebook.configureOrStartSharing(videoShareButton);
+                    sharePicker.visible = true;
                 }
             }
 
@@ -617,24 +607,4 @@
             }
         }
     }
-
-    Loader {
-        id: sharePanel
-        anchors.fill: parent
-        visible: false
-        sourceComponent: (fileToShare !== "" && userAccountId !== "") ? component_sharePanel : null
-
-        property string fileToShare
-        property string userAccountId
-
-        Component {
-            id: component_sharePanel
-            Share {
-                fileToShare: sharePanel.fileToShare
-                userAccountId: sharePanel.userAccountId
-                onUploadCompleted: sharePanel.visible = false;
-                onCanceled: sharePanel.visible = false;
-            }
-        }
-    }
 }

=== modified file 'tests/autopilot/gallery_app/emulators/photo_viewer.py'
--- tests/autopilot/gallery_app/emulators/photo_viewer.py	2014-06-13 13:57:20 +0000
+++ tests/autopilot/gallery_app/emulators/photo_viewer.py	2014-07-02 22:11:28 +0000
@@ -29,10 +29,15 @@
         return self.app.wait_select_single("PopupAlbumPicker",
                                            objectName="popupAlbumPicker")
 
-    def get_share_dialog(self):
-        """Returns the photo viewer share dialog."""
-        return self.app.wait_select_single("SharePopover",
-                                           objectName="sharePopover")
+    def get_content_peer_picker_cancel_button(self):
+        """Returns the ContentPeerPicker cancel button."""
+        return self.app.wait_select_single("Button",
+                                           objectName="contentPeerPickerCancelButton")
+
+    def get_share_peer_picker(self):
+        """Returns the photo viewer share picker."""
+        return self.app.wait_select_single("ContentPeerPicker",
+                                           objectName="sharePicker")
 
     def get_photo_edit_dialog(self):
         """Returns the photo edit dialog."""

=== modified file 'tests/autopilot/gallery_app/tests/test_photo_viewer.py'
--- tests/autopilot/gallery_app/tests/test_photo_viewer.py	2014-05-20 15:19:35 +0000
+++ tests/autopilot/gallery_app/tests/test_photo_viewer.py	2014-07-02 22:11:28 +0000
@@ -10,6 +10,8 @@
 
 from testtools.matchers import Equals, NotEquals, GreaterThan, Is
 from autopilot.matchers import Eventually
+from testtools import skipIf
+from autopilot.platform import model
 
 from gallery_app.emulators.photo_viewer import PhotoViewer
 from gallery_app.emulators.media_viewer import MediaViewer
@@ -109,6 +111,17 @@
         photo_viewer = self.photo_viewer.get_main_photo_viewer()
         self.assertThat(photo_viewer.visible, Eventually(Equals(False)))
 
+    @skipIf(model() == 'Desktop', 'Share not supported on desktop')
+    def test_share_button(self):
+        """Clicking the share button must show the ContentPeerPicker."""
+        photo_viewer = self.photo_viewer.get_main_photo_viewer()
+        self.main_view.open_toolbar().click_button("shareButton")
+        share_picker = self.photo_viewer.get_share_peer_picker()
+        self.assertThat(share_picker.visible, Eventually(Equals(True)))
+        cancel_button = self.photo_viewer.get_content_peer_picker_cancel_button()
+        self.click_item(cancel_button)
+        self.assertThat(share_picker.visible, Eventually(Equals(False)))
+
     def delete_one_picture(self):
         self.main_view.open_toolbar().click_button("deleteButton")
         self.get_delete_dialog()