ref(client) simplify code in av-utils

- enumerateDevices already checks for permissions - inline hasPermissions
jitsi · May 31, 2024 · 963dd54 · 963dd54
1 parent 0c4da04
commit 963dd54
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 22 deletions.
diff --git a/spot-client/src/common/media/av-utils.js b/spot-client/src/common/media/av-utils.js
@@ -91,7 +91,7 @@ export default {
         const JitsiMeetJS = JitsiMeetJSProvider.get();
 
         // TODO: implementing handling of gum permissions being denied
-        return this.hasDevicePermission()
+        return JitsiMeetJS.mediaDevices.isDevicePermissionGranted()
             .then(hasPermission => {
                 if (hasPermission) {
                     return Promise.resolve();
@@ -128,18 +128,6 @@ export default {
         return JitsiMeetJSProvider.get().events.track;
     },
 
-    /**
-     * Returns whether or not permission has been granted to use audio and
-     * video.
-     *
-     * @returns {boolean}
-     */
-    hasDevicePermission() {
-        const JitsiMeetJS = JitsiMeetJSProvider.get();
-
-        return JitsiMeetJS.mediaDevices.isDevicePermissionGranted();
-    },
-
     /**
      * Be notified when a new camera device has been connected or disconnected.
      *

diff --git a/spot-client/src/spot-tv/ui/components/setup/select-media/select-media.js b/spot-client/src/spot-tv/ui/components/setup/select-media/select-media.js
@@ -229,15 +229,7 @@ class SelectMedia extends React.Component {
      * @returns {void}
      */
     _getDevices() {
-        avUtils.hasDevicePermission()
-            .then(hasPermission => {
-                if (!hasPermission) {
-                    // Force device permission request.
-                    return avUtils.createLocalTracks()
-                        .then(tracks => tracks.forEach(track => track.dispose()));
-                }
-            })
-            .then(() => avUtils.enumerateDevices())
+        avUtils.enumerateDevices()
             .then(this._onDeviceListChange);
     }