Ubuntu Document Viewer App

Merge lp://staging/~verzegnassi-stefano/ubuntu-docviewer-app/desktop-support2 into lp://staging/ubuntu-docviewer-app

  1. desktop-support2
  2. Merge into lo-viewer
Proposed by Stefano Verzegnassi
Status: Rejected
Rejected by: Stefano Verzegnassi
Proposed branch: lp://staging/~verzegnassi-stefano/ubuntu-docviewer-app/desktop-support2
Merge into: lp://staging/ubuntu-docviewer-app
Diff against target: 2206 lines (+1637/-262)
31 files modified
README-Developers.md (+4/-1)
click/docviewer.apparmor (+3/-2)
debian/control (+3/-1)
src/app/qml/common/ContentHubProxy.qml (+5/-5)
src/app/qml/common/DetailsPage.qml (+2/-2)
src/app/qml/common/PickImportedDialog.qml (+1/-1)
src/app/qml/loView/LOViewDefaultHeader.qml (+1/-1)
src/app/qml/loView/LOViewPage.qml (+1/-1)
src/app/qml/pdfView/PdfPresentation.qml (+1/-1)
src/app/qml/pdfView/PdfView.qml (+1/-1)
src/app/qml/textView/TextView.qml (+1/-1)
src/app/qml/ubuntu-docviewer-app.qml (+8/-1)
src/plugin/file-qml-plugin/CMakeLists.txt (+27/-2)
src/plugin/file-qml-plugin/InputInfo/CMakeLists.txt (+39/-0)
src/plugin/file-qml-plugin/InputInfo/linux/qinputdeviceinfo_linux.cpp (+288/-0)
src/plugin/file-qml-plugin/InputInfo/linux/qinputdeviceinfo_linux_p.h (+98/-0)
src/plugin/file-qml-plugin/InputInfo/plugin.cpp (+32/-0)
src/plugin/file-qml-plugin/InputInfo/plugin.h (+30/-0)
src/plugin/file-qml-plugin/InputInfo/qdeclarativeinputdevicemodel.cpp (+196/-0)
src/plugin/file-qml-plugin/InputInfo/qdeclarativeinputdevicemodel_p.h (+102/-0)
src/plugin/file-qml-plugin/InputInfo/qinputinfo.cpp (+270/-0)
src/plugin/file-qml-plugin/InputInfo/qinputinfo.h (+143/-0)
src/plugin/file-qml-plugin/InputInfo/qmldir (+3/-0)
src/plugin/file-qml-plugin/backend.cpp (+22/-11)
src/plugin/file-qml-plugin/documentmodel.cpp (+2/-2)
src/plugin/file-qml-plugin/docviewerutils.cpp (+0/-184)
src/plugin/file-qml-plugin/docviewerutils.h (+0/-45)
src/plugin/file-qml-plugin/fileutils.cpp (+174/-0)
src/plugin/file-qml-plugin/fileutils.h (+42/-0)
src/plugin/file-qml-plugin/ubuntuconvergenceutils.cpp (+82/-0)
src/plugin/file-qml-plugin/ubuntuconvergenceutils.h (+56/-0)
To merge this branch: bzr merge lp://staging/~verzegnassi-stefano/ubuntu-docviewer-app/desktop-support2
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 🦄 (community) Needs Fixing
Jenkins Bot continuous-integration Needs Fixing
Stefano Verzegnassi Needs Fixing
Nicholas Skaggs Pending
Review via email: mp+284901@code.staging.launchpad.net

Commit message

Better desktop/pocket-desktop support, by detecting the number of mice and touchpads connected to the device. This uses QInputInfo, available in the Qt snapshots - imported version from unity 8 trunk (rev.2080).

WORKAROUND: This makes new BottomEdge component fully working on desktop

Description of the change

Better desktop/pocket-desktop support, by detecting the number of mice and touchpads connected to the device. This uses QInputInfo, available in the Qt snapshots - imported version from unity 8 trunk (rev.2080).

WORKAROUND: This makes new BottomEdge component fully working on desktop

To post a comment you must log in.
Revision history for this message
Stefano Verzegnassi (verzegnassi-stefano) wrote :

Moved the MP to a new branch

review: Abstain
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:289
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/212/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/543/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/212/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~verzegnassi-stefano/ubuntu-docviewer-app/desktop-support2 updated
290. By Stefano Verzegnassi

Forgot to 'bzr add' new files

291. By Stefano Verzegnassi

...and again

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:291
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/214/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/544/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/214/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~verzegnassi-stefano/ubuntu-docviewer-app/desktop-support2 updated
292. By Stefano Verzegnassi

* Updated README
* Use 'unconfined' template. Apparently there's no other way to get this working...

Revision history for this message
Stefano Verzegnassi (verzegnassi-stefano) wrote :

Ok, this requires an unconfined AppArmor template.

No urge to add the missing packages to Jenkins, nor to merge this branch. I hope the bottom edge will be fixed upstream, because it's not currently usable with a mouse (unless we decide to run unconfined)

review: Needs Fixing
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:292
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/215/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/546/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/215/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

I'm concerned about the unconfined nature of this. Normally for some core apps where there's no other way, I'd probably be okay with this. However, as we're now carrying all of LibreOffice, I'm concerned that we're opening ourselves up by having an unconfined copy of LibreOffice potentially able to be exploited by a dodgy document. That's quite a significantly sized attack surface. Especially when we don't generally roll out new builds of the docviewer with security updated LibreOffice builds very regularly.

What do you think? Should we push this feature back until we have a non-unconfined solution?

Should we bring this up with platform team to find some other way to do this?

review: Needs Fixing
Revision history for this message
Stefano Verzegnassi (verzegnassi-stefano) wrote :

I think so too.
To be fair, we shouldn't have exceptions for accessing to the user's folders too, because of this.

Ideally the platform should provide some service that creates a database with a list of documents, and docviewer should be authorized to access only that database, by default.
When the application asks to access to a specific file, content-hub should mediate the request and ensure that only the single file (or a copy of that file) is accessible.

Anyway, I created this branch a month ago because I thought we were able to release a new version in the store earlier. Also, it wasn't meant to require an unconfined template, but then I discovered that it was broken on the UT platform.

So we can reject this merge proposal.
Let's wait for a fix in the ubuntu-sdk project, it should come soon I guess...

https://code.launchpad.net/~zsombi/ubuntu-ui-toolkit/device_detection/+merge/284282

P.S. If you can ask to the platform team when they expect to release the fix, that would be great. Anyway, all the SDK apps (except addressbook-app) are in the same situation, so I'm not that much worried.

Unmerged revisions

292. By Stefano Verzegnassi

* Updated README
* Use 'unconfined' template. Apparently there's no other way to get this working...

291. By Stefano Verzegnassi

...and again

290. By Stefano Verzegnassi

Forgot to 'bzr add' new files

289. By Stefano Verzegnassi

Added ConvergenceUtils singleton. Improved desktop/pocket desktop support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches