Merge lp:~justinmcp/media-hub/1487925 into lp:media-hub

[Justin McPherson]

Add https to allowed URI schemes for contained applications.

Add https to allowed URI schemes.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:151
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~justinmcp/media-hub/1487925/+merge/268861/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/media-hub-ci/376/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/216
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/216
        deb: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/216/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/216

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/media-hub-ci/376/rebuild

review: Needs Fixing (continuous-integration)

[Jim Hodapp (jhodapp)]

Looks good, thanks.

review: Approve (code)

=== modified file 'src/core/media/apparmor/ubuntu.cpp'
--- src/core/media/apparmor/ubuntu.cpp	2014-11-26 16:23:19 +0000
+++ src/core/media/apparmor/ubuntu.cpp	2015-08-24 00:46:51 +0000
@@ -177,7 +177,9 @@
     {
         return Result{true, "Client can access content in /usr/share/sounds"};
     }
-    else if (parsed_uri.scheme == "http" || parsed_uri.scheme == "rtsp")
+    else if (parsed_uri.scheme == "http" ||
+             parsed_uri.scheme == "https" ||
+             parsed_uri.scheme == "rtsp")
     {
         return Result{true, "Client can access streaming content"};
     }