camera-app

Merge lp://qastaging/~uriboni/camera-app/share-multiple-items into lp://qastaging/camera-app/staging

share-multiple-items
Merge into staging

Proposed by Ugo Riboni on 2016-03-03

Status:

Merged

Approved by:

Florian Boucault on 2016-03-10

Approved revision:

670

Merged at revision:

665

Proposed branch:

lp://qastaging/~uriboni/camera-app/share-multiple-items

Merge into:

lp://qastaging/camera-app/staging

Diff against target:

396 lines (+243/-20)

8 files modified

GalleryView.qml (+1/-3)
PhotogridView.qml (+30/-4)
UnableShareDialog.qml (+34/-0)
camera-app.qml (+1/-1)
debian/control (+3/-0)
tests/autopilot/camera_app/tests/test_gallery_view.py (+85/-11)
tests/unittests/CMakeLists.txt (+1/-1)
tests/unittests/tst_PhotogridView.qml (+88/-0)

To merge this branch:

bzr merge lp://qastaging/~uriboni/camera-app/share-multiple-items

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2016-03-10
Florian Boucault (community)		2016-03-03	Needs Fixing on 2016-03-03
Review via email: mp+287895@code.qastaging.launchpad.net

Commit message

Allow sharing multiple files, except if they are mixed content

Description of the change

Allow sharing multiple files, except if they are mixed content

Revision history for this message

Florian Boucault (fboucault) wrote on 2016-03-03:

code in PhotogridView.qml/onTriggered could be written in a clearer way, for example:

onTriggered: {
  if (selectedFilesMixedTypes()) {
    PopupUtils.open(unableShareDialogComponent).parent = photogridView;
  } else {
    PopupUtils.open(sharePopoverComponent).parent = photogridView;
  }
}

review: Needs Fixing

Revision history for this message

Florian Boucault (fboucault) wrote on 2016-03-03:

In some cases when selecting 3 photos camera thinks I have mixed type contents. The function selectedFilesMixedTypes() should be unit tested to root out these bugs.

review: Needs Fixing

Revision history for this message

Florian Boucault (fboucault) wrote on 2016-03-03:

Going to messaging app and trying to share pictures via the camera app: unable to tick more than 1 picture. Without this patch, it works fine.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-03-03:

FAILED: Continuous integration, rev:662
http://jenkins.qa.ubuntu.com/job/camera-app-staging-ci/45/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/45/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/422
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1092
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/1021
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27970

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-staging-ci/45/rebuild

review: Needs Fixing (continuous-integration)

lp://qastaging/~uriboni/camera-app/share-multiple-items updated on 2016-03-07

663. By Ugo Riboni on 2016-03-07: Fix and simplify mixed media detection, add unit tests for it
664. By Ugo Riboni on 2016-03-07: Use single selection mode only in grid view if the content hub explicitly asks for it
665. By Ugo Riboni on 2016-03-07: Filter the grid view according to the content type requested by content hub