Merge lp:~uriboni/camera-app/no-permissions-dialog into lp:camera-app/staging

[Ugo Riboni]

Notify the user when camera permissions have been revoked, and provide shortcut to change them again

Notify the user when camera permissions have been revoked, and provide shortcut to change them again

Needs https://code.launchpad.net/~phablet-team/ubuntu-system-settings/permission-page-url/+merge/279883 to be merged in content-hub to allow going directly the right settings page. Without it just goes to the Security&Privacy page (two levels down from where the user needs to go)

[lp:~uriboni/camera-app/no-permissions-dialog]

620. By Ugo Riboni on 2015-12-08

Allow reaching the camera permissions page directly. Fix some text.

621. By Ugo Riboni on 2015-12-08

Better text, including suggestions to reboot if permissions are ok

[Florian Boucault (fboucault)]

semi columns at end of JS lines please.

review: Needs Fixing

[Florian Boucault (fboucault)]

Would not a better solution be for the trust prompt that requests access to the camera to reappear as it does the first time you launch the camera app?

[Ugo Riboni (uriboni)]

> Would not a better solution be for the trust prompt that requests access to
> the camera to reappear as it does the first time you launch the camera app?

Probably, but I think there is a difference in removing the app from the trust store (which causes a prompt on next launch) and disabling it (which causes the app to silently be denied access).

The control panel just disables the app but it leaves the entry in trust store, so that the user can go there and re-enable it if needed.
If we change the control panel's logic to actually remove the app from the store, then the only way to re-enable it would be to launch it again.

All other services (GPS, microphone) also work in this way, so we either change all or none.

[lp:~uriboni/camera-app/no-permissions-dialog]

622. By Ugo Riboni on 2015-12-10

Merge changes from trunk

623. By Ugo Riboni on 2015-12-10

Fix end of line semicolons

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:623
http://jenkins.qa.ubuntu.com/job/camera-app-staging-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/2
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/347/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1010/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/869
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26100

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:623
http://jenkins.qa.ubuntu.com/job/camera-app-staging-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/5/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/351/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1013/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/873
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26117

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

review: Needs Fixing (continuous-integration)

=== modified file 'ViewFinderOverlay.qml'
--- ViewFinderOverlay.qml	2015-12-08 15:14:04 +0000
+++ ViewFinderOverlay.qml	2015-12-10 10:13:33 +0000
@@ -964,4 +964,48 @@
              }
          }
     }
+
+    Connections {
+        id: permissionErrorMonitor
+        property var currentPermissionsDialog: null
+        target: camera
+        onError: {
+            // Camera.CameraError is very generic, but at the moment this is the only
+            // kind of notification that we receive when permissions have been revoked.
+            if (errorCode == Camera.CameraError && currentPermissionsDialog == null) {
+                currentPermissionsDialog = PopupUtils.open(noPermissionsDialogComponent);
+            }
+        }
+        onCameraStateChanged: {
+            if (camera.cameraState != Camera.UnloadedState && currentPermissionsDialog != null) {
+                PopupUtils.close(currentPermissionsDialog);
+                currentPermissionsDia   log = null;
+            }
+        }
+    }
+
+    Component {
+         id: noPermissionsDialogComponent
+         Dialog {
+             id: noPermissionsDialog
+             objectName: "noPermissionsDialog"
+             title: i18n.tr("Cannot access camera")
+             text: i18n.tr("Camera app doesn't have permission to access the camera hardware or another error occurred.\n\nIf granting permission does not resolve this problem, reboot your phone.")
+             Button {
+                 text: i18n.tr("Cancel")
+                 onClicked: {
+                     PopupUtils.close(noPermissionsDialog);
+                     permissionErrorMonitor.currentDialog = null;
+                 }
+             }
+             Button {
+                 text: i18n.tr("Edit Permissions")
+                 onClicked: {
+                     Qt.openUrlExternally("settings:///system/security-privacy?service=camera");
+                     PopupUtils.close(noPermissionsDialog);
+                     permissionErrorMonitor.currentDialog = null;
+                 }
+             }
+         }
+    }
 }