From ef674a5934ab6c36bca7e366b7832113f94fcd49 Mon Sep 17 00:00:00 2001
From: Preston Bezos <preston@highfidelity.io>
Date: Fri, 28 Jun 2019 15:23:50 -0700
Subject: [PATCH] removed permission for qml to access webcam and mic

---
 interface/resources/qml/+webengine/BrowserWebView.qml  | 10 ----------
 interface/resources/qml/+webengine/TabletBrowser.qml   |  2 +-
 .../qml/controls/+webengine/FlickableWebViewCore.qml   |  2 +-
 .../qml/controlsUit/+webengine/BaseWebView.qml         |  4 ++++
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/interface/resources/qml/+webengine/BrowserWebView.qml b/interface/resources/qml/+webengine/BrowserWebView.qml
index 5c5cf2cfb9..137531f517 100644
--- a/interface/resources/qml/+webengine/BrowserWebView.qml
+++ b/interface/resources/qml/+webengine/BrowserWebView.qml
@@ -29,16 +29,6 @@ WebView {
 
     userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard ]
 
-    onFeaturePermissionRequested: {
-        if (feature == 2) { // QWebEnginePage::MediaAudioCapture
-            grantFeaturePermission(securityOrigin, feature, true);
-        } else {
-            permissionsBar.securityOrigin = securityOrigin;
-            permissionsBar.feature = feature;
-            parentRoot.showPermissionsBar();
-        }
-    }
-
     onLoadingChanged: {
         if (loadRequest.status === WebEngineView.LoadSucceededStatus) {
             addressBar.text = loadRequest.url
diff --git a/interface/resources/qml/+webengine/TabletBrowser.qml b/interface/resources/qml/+webengine/TabletBrowser.qml
index 720a904231..3bb2c17ba6 100644
--- a/interface/resources/qml/+webengine/TabletBrowser.qml
+++ b/interface/resources/qml/+webengine/TabletBrowser.qml
@@ -84,7 +84,7 @@ Item {
         }
 
         onFeaturePermissionRequested: {
-            grantFeaturePermission(securityOrigin, feature, true);
+            grantFeaturePermission(securityOrigin, feature, false);
         }
 
         onLoadingChanged: {
diff --git a/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml b/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml
index 823d0107a2..56eecf3f46 100644
--- a/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml
+++ b/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml
@@ -141,7 +141,7 @@ Item {
         }
 
         onFeaturePermissionRequested: {
-            grantFeaturePermission(securityOrigin, feature, true);
+            grantFeaturePermission(securityOrigin, feature, false);
         }
 
         //disable popup
diff --git a/interface/resources/qml/controlsUit/+webengine/BaseWebView.qml b/interface/resources/qml/controlsUit/+webengine/BaseWebView.qml
index fdd9c12220..faf80b2b11 100644
--- a/interface/resources/qml/controlsUit/+webengine/BaseWebView.qml
+++ b/interface/resources/qml/controlsUit/+webengine/BaseWebView.qml
@@ -35,4 +35,8 @@ WebEngineView {
     }
 
     WebSpinner { }
+
+    onFeaturePermissionRequested: {
+        grantFeaturePermission(securityOrigin, feature, false);
+    }
 }