From 3081b41d0d6f5b13ffddadbda1460f3548ceefbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Tue, 22 Nov 2022 12:28:30 +0100 Subject: [PATCH] fix(android) temporarily disable P2P For some reason one of the users gets a black screen when doing Android to Android calls. If iOS is involved things Just Work (TM). It seems to be related to the use of H.264, but since it works with iOS there must be something else to it. --- react/features/base/config/middleware.ts | 3 ++- react/features/base/config/reducer.ts | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/react/features/base/config/middleware.ts b/react/features/base/config/middleware.ts index 9f5fc3bf4..584273e41 100644 --- a/react/features/base/config/middleware.ts +++ b/react/features/base/config/middleware.ts @@ -2,6 +2,7 @@ import { AnyAction } from 'redux'; import { IStore } from '../../app/types'; import { getFeatureFlag } from '../flags/functions'; +import Platform from '../react/Platform'; import MiddlewareRegistry from '../redux/MiddlewareRegistry'; import { updateSettings } from '../settings/actions'; @@ -52,7 +53,7 @@ function _setConfig({ dispatch, getState }: IStore, next: Function, action: AnyA const settings = state['features/base/settings']; const config: IConfig = {}; - if (typeof settings.disableP2P !== 'undefined') { + if (Platform.OS !== 'android' && typeof settings.disableP2P !== 'undefined') { config.p2p = { enabled: !settings.disableP2P }; } diff --git a/react/features/base/config/reducer.ts b/react/features/base/config/reducer.ts index 7f475d74e..82c313053 100644 --- a/react/features/base/config/reducer.ts +++ b/react/features/base/config/reducer.ts @@ -1,6 +1,7 @@ import _ from 'lodash'; import { CONFERENCE_INFO } from '../../conference/components/constants'; +import Platform from '../react/Platform'; import ReducerRegistry from '../redux/ReducerRegistry'; import { equals } from '../redux/functions'; @@ -48,6 +49,8 @@ const INITIAL_RN_STATE: IConfig = { disableAudioLevels: true, p2p: { + // Temporarily disable P2P on Android while we sort out some (codec?) issues. + ...(Platform.OS === 'android' ? { enabled: false } : {}), // eslint-disable-line no-extra-parens preferredCodec: 'h264' },