fix(electron):Respect desktopSharingSources option

modules/RTC/RTCUtils.js

@@ -443,11 +443,12 @@ class RTCUtils extends Listenable {
      * logic compared to use screenObtainer versus normal device capture logic
      * in RTCUtils#_getUserMedia.
      *
+     * @param {Object} options - Optional parameters.
      * @returns {Promise} A promise which will be resolved with an object which
      * contains the acquired display stream. If desktop sharing is not supported
      * then a rejected promise will be returned.
      */
-    _getDesktopMedia() {
+    _getDesktopMedia(options) {
         if (!screenObtainer.isSupported()) {
             return Promise.reject(new Error('Desktop sharing is not supported!'));
         }
@@ -459,7 +460,8 @@ class RTCUtils extends Listenable {
                 },
                 error => {
                     reject(error);
-                });
+                },
+                options);
         });
     }
 
@@ -509,6 +511,8 @@ class RTCUtils extends Listenable {
      * @param {Object} options.desktopSharingFrameRate.max - Maximum fps
      * @param {String} options.desktopSharingSourceDevice - The device id or
      * label for a video input source that should be used for screensharing.
+     * @param {Array<string>} options.desktopSharingSources - The types of sources ("screen", "window", etc)
+     * from which the user can select what to share.
      * @returns {Promise} The promise, when successful, will return an array of
      * meta data for the requested device type, which includes the stream and
      * track. If an error occurs, it will be deferred to the caller for
@@ -542,7 +546,8 @@ class RTCUtils extends Listenable {
             }
 
             const {
-                desktopSharingSourceDevice
+                desktopSharingSourceDevice,
+                desktopSharingSources
             } = otherOptions;
 
             // Attempt to use a video input device as a screenshare source if
@@ -580,7 +585,7 @@ class RTCUtils extends Listenable {
                     });
             }
 
-            return this._getDesktopMedia();
+            return this._getDesktopMedia({ desktopSharingSources });
         }.bind(this);
 
         /**

modules/RTC/ScreenObtainer.js

@@ -124,14 +124,16 @@ const ScreenObtainer = {
      *
      * @param onSuccess - Success callback.
      * @param onFailure - Failure callback.
+     * @param {Object} options - Optional parameters.
      */
-    obtainScreenOnElectron(onSuccess, onFailure) {
+    obtainScreenOnElectron(onSuccess, onFailure, options = {}) {
         if (window.JitsiMeetScreenObtainer && window.JitsiMeetScreenObtainer.openDesktopPicker) {
             const { desktopSharingFrameRate, desktopSharingSources } = this.options;
 
             window.JitsiMeetScreenObtainer.openDesktopPicker(
                 {
-                    desktopSharingSources: desktopSharingSources || [ 'screen', 'window' ]
+                    desktopSharingSources:
+                        options.desktopSharingSources || desktopSharingSources || [ 'screen', 'window' ]
                 },
                 (streamId, streamType, screenShareAudio = false) => {
                     if (streamId) {

types/auto/modules/RTC/RTCUtils.d.ts

@@ -40,11 +40,12 @@ declare class RTCUtils extends Listenable {
      * logic compared to use screenObtainer versus normal device capture logic
      * in RTCUtils#_getUserMedia.
      *
+     * @param {Object} options - Optional parameters.
      * @returns {Promise} A promise which will be resolved with an object which
      * contains the acquired display stream. If desktop sharing is not supported
      * then a rejected promise will be returned.
      */
-    _getDesktopMedia(): Promise<any>;
+    _getDesktopMedia(options: any): Promise<any>;
     /**
      * Private utility for determining if the passed in MediaStream contains
      * tracks of the type(s) specified in the requested devices.
@@ -70,6 +71,8 @@ declare class RTCUtils extends Listenable {
      * @param {Object} options.desktopSharingFrameRate.max - Maximum fps
      * @param {String} options.desktopSharingSourceDevice - The device id or
      * label for a video input source that should be used for screensharing.
+     * @param {Array<string>} options.desktopSharingSources - The types of sources ("screen", "window", etc)
+     * from which the user can select what to share.
      * @returns {Promise} The promise, when successful, will return an array of
      * meta data for the requested device type, which includes the stream and
      * track. If an error occurs, it will be deferred to the caller for
@@ -82,6 +85,7 @@ declare class RTCUtils extends Listenable {
             max: any;
         };
         desktopSharingSourceDevice: string;
+        desktopSharingSources: Array<string>;
     }): Promise<any>;
     /**
      * Checks whether it is possible to enumerate available cameras/microphones.

types/auto/modules/RTC/ScreenObtainer.d.ts

@@ -64,15 +64,17 @@ declare namespace ScreenObtainer {
      *
      * @param onSuccess - Success callback.
      * @param onFailure - Failure callback.
+     * @param {Object} options - Optional parameters.
      */
-    function obtainScreenOnElectron(onSuccess: any, onFailure: any): void;
+    function obtainScreenOnElectron(onSuccess: any, onFailure: any, options?: any): void;
     /**
      * Obtains a screen capture stream on Electron.
      *
      * @param onSuccess - Success callback.
      * @param onFailure - Failure callback.
+     * @param {Object} options - Optional parameters.
      */
-    function obtainScreenOnElectron(onSuccess: any, onFailure: any): void;
+    function obtainScreenOnElectron(onSuccess: any, onFailure: any, options?: any): void;
     /**
      * Obtains a screen capture stream using getDisplayMedia.
      *