Revert "drop: debug."

This reverts commit 7d48ea1bca.

conference.js

@@ -2069,7 +2069,8 @@ export default {
     _initDeviceList(setDeviceListChangeHandler = false) {
         const { mediaDevices } = JitsiMeetJS;
 
-        if (mediaDevices.isDeviceChangeAvailable()) {
+        if (mediaDevices.isDeviceListAvailable()
+                && mediaDevices.isDeviceChangeAvailable()) {
             if (setDeviceListChangeHandler) {
                 this.deviceChangeListener = devices =>
                     window.setTimeout(() => this._onDeviceListChanged(devices), 0);

modules/API/external/external_api.js

@@ -11,6 +11,7 @@ import {
     getAvailableDevices,
     getCurrentDevices,
     isDeviceChangeAvailable,
+    isDeviceListAvailable,
     isMultipleAudioInputSupported,
     setAudioInputDevice,
     setAudioOutputDevice,
@@ -988,15 +989,10 @@ export default class JitsiMeetExternalAPI extends EventEmitter {
      * Returns Promise that resolves with true if the device list is available
      * and with false if not.
      *
-     * @deprecated
-     *
      * @returns {Promise}
      */
     isDeviceListAvailable() {
-        console.warn('isDeviceListAvailable is deprecated and will be removed in the future. '
-                     + 'It always returns true');
-
-        return Promise.resolve(true);
+        return isDeviceListAvailable(this._transport);
     }
 
     /**

modules/API/external/functions.js

@@ -56,6 +56,21 @@ export function isDeviceChangeAvailable(transport, deviceType) {
     });
 }
 
+/**
+ * Returns Promise that resolves with true if the device list is available
+ * and with false if not.
+ *
+ * @param {Transport} transport - The @code{Transport} instance responsible for
+ * the external communication.
+ * @returns {Promise}
+ */
+export function isDeviceListAvailable(transport) {
+    return transport.sendRequest({
+        type: 'devices',
+        name: 'isDeviceListAvailable'
+    });
+}
+
 /**
  * Returns Promise that resolves with true if multiple audio input is supported
  * and with false if not.

package-lock.json

@@ -61,7 +61,7 @@
         "js-md5": "0.6.1",
         "js-sha512": "0.8.0",
         "jwt-decode": "2.2.0",
-        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1982.0.0+cec2a2e6/lib-jitsi-meet.tgz",
+        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1980.0.0+34a32e86/lib-jitsi-meet.tgz",
         "lodash-es": "4.17.21",
         "moment": "2.29.4",
         "moment-duration-format": "2.2.2",
@@ -16982,8 +16982,8 @@
     },
     "node_modules/lib-jitsi-meet": {
       "version": "0.0.0",
-      "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1982.0.0+cec2a2e6/lib-jitsi-meet.tgz",
-      "integrity": "sha512-lptKoClX5zMGocOJwTllNcV7BalPlWyeaTWixCeuiOp/03JTXgIVAJJ0fG/s4BhP4YRd1YBqttnKBo/ly7NZWw==",
+      "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1980.0.0+34a32e86/lib-jitsi-meet.tgz",
+      "integrity": "sha512-NmjVrkhBgUhAHe84oEVGi5keXmO92RtVznchdPep6vJz9O2A6GPN9Ap+DZOoiK693bm9lRdzDIEIFn5GnlLfQg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@jitsi/js-utils": "2.2.1",
@@ -37440,8 +37440,8 @@
       }
     },
     "lib-jitsi-meet": {
-      "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1982.0.0+cec2a2e6/lib-jitsi-meet.tgz",
-      "integrity": "sha512-lptKoClX5zMGocOJwTllNcV7BalPlWyeaTWixCeuiOp/03JTXgIVAJJ0fG/s4BhP4YRd1YBqttnKBo/ly7NZWw==",
+      "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1980.0.0+34a32e86/lib-jitsi-meet.tgz",
+      "integrity": "sha512-NmjVrkhBgUhAHe84oEVGi5keXmO92RtVznchdPep6vJz9O2A6GPN9Ap+DZOoiK693bm9lRdzDIEIFn5GnlLfQg==",
       "requires": {
         "@jitsi/js-utils": "2.2.1",
         "@jitsi/logger": "2.0.2",

package.json

@@ -67,7 +67,7 @@
     "js-md5": "0.6.1",
     "js-sha512": "0.8.0",
     "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1982.0.0+cec2a2e6/lib-jitsi-meet.tgz",
+    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1980.0.0+34a32e86/lib-jitsi-meet.tgz",
     "lodash-es": "4.17.21",
     "moment": "2.29.4",
     "moment-duration-format": "2.2.2",

react/features/base/connection/actions.native.ts

@@ -1,13 +1,10 @@
 import { appNavigate } from '../../app/actions.native';
 import { IStore } from '../../app/types';
-import { getCustomerDetails } from '../../jaas/actions.any';
-import { isVpaasMeeting, getJaasJWT } from '../../jaas/functions';
 import { navigateRoot } from '../../mobile/navigation/rootNavigationContainerRef';
 import { screen } from '../../mobile/navigation/routes';
-import { setJWT } from '../jwt/actions';
 import { JitsiConnectionErrors } from '../lib-jitsi-meet';
 
-import { _connectInternal } from './actions.native';
+import { _connectInternal } from './actions.any';
 
 export * from './actions.any';
 
@@ -19,32 +16,12 @@ export * from './actions.any';
  * @returns {Function}
  */
 export function connect(id?: string, password?: string) {
-    return (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
-        const state = getState();
-        const { jwt } = state['features/base/jwt'];
-
-        if (isVpaasMeeting(state)) {
-            return dispatch(getCustomerDetails())
-                .then(() => {
-                    if (!jwt) {
-                        return getJaasJWT(state);
-                    }
-                })
-                .then(j => {
-                    j && dispatch(setJWT(j));
-
-                    return dispatch(_connectInternal(id, password));
-                });
-        }
-
-        dispatch(_connectInternal(id, password))
-
+    return (dispatch: IStore['dispatch']) => dispatch(_connectInternal(id, password))
         .catch(error => {
             if (error === JitsiConnectionErrors.NOT_LIVE_ERROR) {
                 navigateRoot(screen.visitorsQueue);
             }
         });
-    };
 }
 
 /**

react/features/base/devices/actions.web.ts

@@ -150,7 +150,8 @@ export function getAvailableDevices() {
     return (dispatch: IStore['dispatch'], getState: IStore['getState']) => new Promise(resolve => {
         const { mediaDevices } = JitsiMeetJS;
 
-        if (mediaDevices.isDeviceChangeAvailable()) {
+        if (mediaDevices.isDeviceListAvailable()
+                && mediaDevices.isDeviceChangeAvailable()) {
             mediaDevices.enumerateDevices((devices: MediaDeviceInfo[]) => {
                 const { filteredDevices, ignoredDevices } = filterIgnoredDevices(devices);
                 const oldDevices = flattenAvailableDevices(getState()['features/base/devices'].availableDevices);

react/features/device-selection/functions.web.ts

@@ -163,8 +163,7 @@ export function processExternalDeviceRequest( // eslint-disable-line max-params
 
     switch (request.name) {
     case 'isDeviceListAvailable':
-        // TODO(saghul): remove this, eventually.
-        responseCallback(true);
+        responseCallback(JitsiMeetJS.mediaDevices.isDeviceListAvailable());
         break;
     case 'isDeviceChangeAvailable':
         responseCallback(

react/features/recording/actionTypes.ts

@@ -8,16 +8,6 @@
  */
 export const CLEAR_RECORDING_SESSIONS = 'CLEAR_RECORDING_SESSIONS';
 
-/**
- * The type of Redux action which marks a session ID as consent requested.
- *
- * {
- *     type: MARK_CONSENT_REQUESTED,
- *     sessionId: string
- * }
- */
-export const MARK_CONSENT_REQUESTED = 'MARK_CONSENT_REQUESTED';
-
 /**
  * The type of Redux action which updates the current known state of a recording
  * session.

react/features/recording/actions.any.ts

@@ -20,7 +20,6 @@ import { isRecorderTranscriptionsRunning } from '../transcribing/functions';
 
 import {
     CLEAR_RECORDING_SESSIONS,
-    MARK_CONSENT_REQUESTED,
     RECORDING_SESSION_UPDATED,
     SET_MEETING_HIGHLIGHT_BUTTON_STATE,
     SET_PENDING_RECORDING_NOTIFICATION_UID,
@@ -477,17 +476,3 @@ export function showStartRecordingNotificationWithCallback(openRecordingDialog:
         }, NOTIFICATION_TIMEOUT_TYPE.EXTRA_LONG));
     };
 }
-
-/**
- * Marks the given session as consent requested. No further consent requests will be
- * made for this session.
- *
- * @param {string} sessionId - The session id.
- * @returns {Object}
- */
-export function markConsentRequested(sessionId: string) {
-    return {
-        type: MARK_CONSENT_REQUESTED,
-        sessionId
-    };
-}

react/features/recording/functions.ts

@@ -442,7 +442,6 @@ export function shouldRequireRecordingConsent(recorderSession: any, state: IRedu
     const { requireRecordingConsent } = state['features/dynamic-branding'] || {};
     const { requireConsent } = state['features/base/config'].recordings || {};
     const { iAmRecorder } = state['features/base/config'];
-    const { consentRequested } = state['features/recording'];
 
     if (iAmRecorder) {
         return false;
@@ -456,15 +455,10 @@ export function shouldRequireRecordingConsent(recorderSession: any, state: IRedu
         return false;
     }
 
-    if (consentRequested.has(recorderSession.getID())) {
+    if (!recorderSession.getInitiator()
+        || recorderSession.getStatus() === JitsiRecordingConstants.status.OFF) {
         return false;
     }
 
-    const initiator = recorderSession.getInitiator();
-
-    if (!initiator || recorderSession.getStatus() === JitsiRecordingConstants.status.OFF) {
-        return false;
-    }
-
-    return initiator !== getLocalParticipant(state)?.id;
+    return recorderSession.getInitiator() !== getLocalParticipant(state)?.id;
 }

react/features/recording/middleware.ts

@@ -36,7 +36,6 @@ import { isRecorderTranscriptionsRunning } from '../transcribing/functions';
 import { RECORDING_SESSION_UPDATED, START_LOCAL_RECORDING, STOP_LOCAL_RECORDING } from './actionTypes';
 import {
     clearRecordingSessions,
-    markConsentRequested,
     hidePendingRecordingNotification,
     showPendingRecordingNotification,
     showRecordingError,
@@ -421,7 +420,6 @@ function _showExplicitConsentDialog(recorderSession: any, dispatch: IStore['disp
     }
 
     batch(() => {
-        dispatch(markConsentRequested(recorderSession.getID()));
         dispatch(setAudioUnmutePermissions(true, true));
         dispatch(setVideoUnmutePermissions(true, true));
         dispatch(setAudioMuted(true));

react/features/recording/reducer.ts

@@ -2,7 +2,6 @@ import ReducerRegistry from '../base/redux/ReducerRegistry';
 
 import {
     CLEAR_RECORDING_SESSIONS,
-    MARK_CONSENT_REQUESTED,
     RECORDING_SESSION_UPDATED,
     SET_MEETING_HIGHLIGHT_BUTTON_STATE,
     SET_PENDING_RECORDING_NOTIFICATION_UID,
@@ -12,7 +11,6 @@ import {
 } from './actionTypes';
 
 const DEFAULT_STATE = {
-    consentRequested: new Set(),
     disableHighlightMeetingMoment: false,
     pendingNotificationUids: {},
     selectedRecordingService: '',
@@ -31,7 +29,6 @@ export interface ISessionData {
 }
 
 export interface IRecordingState {
-    consentRequested: Set<any>;
     disableHighlightMeetingMoment: boolean;
     pendingNotificationUids: {
         [key: string]: string | undefined;
@@ -60,15 +57,6 @@ ReducerRegistry.register<IRecordingState>(STORE_NAME,
                 sessionDatas: []
             };
 
-        case MARK_CONSENT_REQUESTED:
-            return {
-                ...state,
-                consentRequested: new Set([
-                    ...state.consentRequested,
-                    action.sessionId
-                ])
-            };
-
         case RECORDING_SESSION_UPDATED:
             return {
                 ...state,