ios: fix SDK build after dropping iOS 10

Since we only support iOS 11, 32 bit architectures must not be built.

.gitignore

@@ -61,8 +61,14 @@ buck-out/
 
 # fastlane
 #
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/
+
 */fastlane/report.xml
 */fastlane/Preview.html
+*/fastlane/screenshots
 
 # Build artifacts
 *.jsbundle

android/app/build.gradle

@@ -32,23 +32,12 @@ android {
         }
     }
 
-    signingConfigs {
-        debug {
-            storeFile file('debug.keystore')
-            storePassword 'android'
-            keyAlias 'androiddebugkey'
-            keyPassword 'android'
-        }
-    }
-
     buildTypes {
         debug {
             buildConfigField "boolean", "GOOGLE_SERVICES_ENABLED", "${googleServicesEnabled}"
             buildConfigField "boolean", "LIBRE_BUILD", "${rootProject.ext.libreBuild}"
         }
         release {
-            // Uncomment the following line for singing a test release build.
-            //signingConfig signingConfigs.debug
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules-release.pro'
             buildConfigField "boolean", "GOOGLE_SERVICES_ENABLED", "${googleServicesEnabled}"

android/app/proguard-rules.pro

@@ -85,8 +85,4 @@
 # ^^^ We added the above when we switched minifyEnabled on.
 
 # Rule to avoid build errors related to SVGs.
--keep public class com.horcrux.svg.** {*;}
-
-# Hermes
--keep class com.facebook.hermes.unicode.** { *; }
-
+-keep public class com.horcrux.svg.** {*;}

android/build.gradle

@@ -27,6 +27,8 @@ allprojects {
         jcenter()
         // React Native (JS, Obj-C sources, Android binaries) is installed from npm.
         maven { url "$rootDir/../node_modules/react-native/android" }
+        // Android JSC is installed from npm.
+        maven { url("$rootDir/../node_modules/jsc-android/dist") }
     }
 
     // Make sure we use the react-native version in node_modules and not the one

android/gradle.properties

@@ -20,5 +20,5 @@
 android.useAndroidX=true
 android.enableJetifier=true
 
-appVersion=20.0.0
-sdkVersion=2.6.1
+appVersion=19.5.0
+sdkVersion=2.5.0

android/scripts/release-sdk.sh

@@ -9,8 +9,8 @@ THE_MVN_REPO=${MVN_REPO:-${1:-$DEFAULT_MVN_REPO}}
 MVN_HTTP=0
 DEFAULT_SDK_VERSION=$(grep sdkVersion ${THIS_DIR}/../gradle.properties | cut -d"=" -f2)
 SDK_VERSION=${OVERRIDE_SDK_VERSION:-${DEFAULT_SDK_VERSION}}
-RN_VERSION=$(jq -r '.version' ${THIS_DIR}/../../node_modules/react-native/package.json)
-HERMES_VERSION=$(jq -r '.dependencies."hermes-engine"' ${THIS_DIR}/../../node_modules/react-native/package.json | cut -c 2-)
+RN_VERSION=$(jq -r '.dependencies."react-native"' ${THIS_DIR}/../../package.json)
+JSC_VERSION="r"$(jq -r '.dependencies."jsc-android"' ${THIS_DIR}/../../node_modules/react-native/package.json | cut -d . -f 1 | cut -c 2-)
 DO_GIT_TAG=${GIT_TAG:-0}
 
 if [[ $THE_MVN_REPO == http* ]]; then
@@ -38,19 +38,17 @@ if [[ $MVN_HTTP == 1 ]]; then
         -DgeneratePom=false \
         -DpomFile=react-native-${RN_VERSION}.pom || true
     popd
-    # Push Hermes
-    echo "Pushing Hermes ${HERMES_VERSION} to the Maven repo"
-    pushd ${THIS_DIR}/../../node_modules/hermes-engine/android/
+    # Push JSC
+    echo "Pushing JSC ${JSC_VERSION} to the Maven repo"
+    pushd ${THIS_DIR}/../../node_modules/jsc-android/dist/org/webkit/android-jsc/${JSC_VERSION}
     mvn \
         deploy:deploy-file \
         -Durl=${MVN_REPO} \
         -DrepositoryId=${MVN_REPO_ID} \
-        -Dfile=hermes-release.aar \
+        -Dfile=android-jsc-${JSC_VERSION}.aar \
         -Dpackaging=aar \
-        -DgroupId=com.facebook \
-        -DartifactId=hermes \
-        -Dversion=${HERMES_VERSION} \
-        -DgeneratePom=true || true
+        -DgeneratePom=false \
+        -DpomFile=android-jsc-${JSC_VERSION}.pom || true
     popd
 else
     # Push React Native, if necessary
@@ -67,19 +65,17 @@ else
         popd
     fi
 
-    # Push Hermes, if necessary
-    if [[ ! -d ${MVN_REPO}/com/facebook/hermes/${HERMES_VERSION} ]]; then
-        echo "Pushing Hermes ${HERMES_VERSION} to the Maven repo"
-        pushd ${THIS_DIR}/../../node_modules/hermes-engine/android/
+    # Push JSC, if necessary
+    if [[ ! -d ${MVN_REPO}/org/webkit/android-jsc/${JSC_VERSION} ]]; then
+        echo "Pushing JSC ${JSC_VERSION} to the Maven repo"
+        pushd ${THIS_DIR}/../../node_modules/jsc-android/dist/org/webkit/android-jsc/${JSC_VERSION}
         mvn \
             deploy:deploy-file \
             -Durl=${MVN_REPO} \
-            -Dfile=hermes-release.aar \
+            -Dfile=android-jsc-${JSC_VERSION}.aar \
             -Dpackaging=aar \
-            -DgroupId=com.facebook \
-            -DartifactId=hermes \
-            -Dversion=${HERMES_VERSION} \
-            -DgeneratePom=true
+            -DgeneratePom=false \
+            -DpomFile=android-jsc-${JSC_VERSION}.pom
         popd
     fi
 

android/sdk/build.gradle

@@ -1,5 +1,3 @@
-import groovy.json.JsonSlurper
-
 apply plugin: 'com.android.library'
 apply plugin: 'maven-publish'
 
@@ -33,10 +31,6 @@ android {
             }
         }
     }
-
-    packagingOptions {
-        pickFirst '**/libc++_shared.so'
-    }
 }
 
 dependencies {
@@ -44,15 +38,12 @@ dependencies {
 
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.fragment:fragment:1.2.0'
+    implementation 'androidx.fragment:fragment:1.1.0'
 
     //noinspection GradleDynamicVersion
     api 'com.facebook.react:react-native:+'
-
-    // Hermes JS engine
-    def hermesPath = "../../node_modules/hermes-engine/android/"
-    debugImplementation files(hermesPath + "hermes-debug.aar")
-    releaseImplementation files(hermesPath + "hermes-release.aar")
+    //noinspection GradleDynamicVersion
+    implementation 'org.webkit:android-jsc:+'
 
     implementation 'com.dropbox.core:dropbox-core-sdk:3.0.8'
     implementation 'com.jakewharton.timber:timber:4.7.1'
@@ -224,14 +215,6 @@ publishing {
                     dependency.appendNode('artifactId', artifactId)
                     dependency.appendNode('version', it.moduleVersion)
                 }
-
-                // Add Hermes dependency.
-                def hermesPkg = new File("$rootDir/../node_modules/hermes-engine/package.json")
-                def hermesVersion = new JsonSlurper().parseText(hermesPkg.text).version
-                def hermesDependency = dependencies.appendNode('dependency')
-                hermesDependency.appendNode('groupId', "com.facebook")
-                hermesDependency.appendNode('artifactId', "hermes")
-                hermesDependency.appendNode('version', hermesVersion)
             }
         }
 

android/sdk/src/main/java/org/jitsi/meet/sdk/AmplitudeModule.java

@@ -16,10 +16,6 @@
 
 package org.jitsi.meet.sdk;
 
-import android.annotation.SuppressLint;
-import android.provider.Settings;
-import android.text.TextUtils;
-
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
@@ -53,16 +49,8 @@ class AmplitudeModule
      * @param apiKey The API_KEY of the Amplitude project.
      */
     @ReactMethod
-    @SuppressLint("HardwareIds")
     public void init(String instanceName, String apiKey) {
         Amplitude.getInstance(instanceName).initialize(getCurrentActivity(), apiKey);
-
-        // Set the device ID to something consistent.
-        String android_id
-            = Settings.Secure.getString(getReactApplicationContext().getContentResolver(), Settings.Secure.ANDROID_ID);
-        if (!TextUtils.isEmpty(android_id)) {
-            Amplitude.getInstance(instanceName).setDeviceId(android_id);
-        }
     }
 
     /**

android/sdk/src/main/java/org/jitsi/meet/sdk/AudioDeviceHandlerConnectionService.java

@@ -17,7 +17,6 @@
 package org.jitsi.meet.sdk;
 
 import android.content.Context;
-import android.media.AudioManager;
 import android.os.Build;
 import android.telecom.CallAudioState;
 import androidx.annotation.RequiresApi;
@@ -39,11 +38,6 @@ class AudioDeviceHandlerConnectionService implements
 
     private final static String TAG = AudioDeviceHandlerConnectionService.class.getSimpleName();
 
-    /**
-     * {@link AudioManager} instance used to interact with the Android audio subsystem.
-     */
-    private AudioManager audioManager;
-
     /**
      * Reference to the main {@code AudioModeModule}.
      */
@@ -140,8 +134,6 @@ class AudioDeviceHandlerConnectionService implements
         JitsiMeetLogger.i("Using " + TAG + " as the audio device handler");
 
         module = audioModeModule;
-        audioManager = (AudioManager)context.getSystemService(Context.AUDIO_SERVICE);
-
         RNConnectionService rcs = ReactInstanceManagerHolder.getNativeModule(RNConnectionService.class);
         if (rcs != null) {
             rcs.setCallAudioStateListener(this);
@@ -168,16 +160,6 @@ class AudioDeviceHandlerConnectionService implements
 
     @Override
     public boolean setMode(int mode) {
-        if (mode != AudioModeModule.DEFAULT) {
-            // This shouldn't be needed when using ConnectionService, but some devices have been
-            // observed not doing it.
-            try {
-                audioManager.setMicrophoneMute(false);
-            } catch (Throwable tr) {
-                JitsiMeetLogger.w(tr, TAG + " Failed to unmute the microphone");
-            }
-        }
-
         return true;
     }
 }

android/sdk/src/main/java/org/jitsi/meet/sdk/RNConnectionService.java

@@ -89,17 +89,9 @@ class RNConnectionService extends ReactContextBaseJavaModule {
         ReactApplicationContext ctx = getReactApplicationContext();
 
         Uri address = Uri.fromParts(PhoneAccount.SCHEME_SIP, handle, null);
-        PhoneAccountHandle accountHandle;
-
-        try {
-            accountHandle
-                = ConnectionService.registerPhoneAccount(getReactApplicationContext(), address, callUUID);
-        } catch (Throwable tr) {
-            JitsiMeetLogger.e(tr, TAG + " error in startCall");
-
-            promise.reject(tr);
-            return;
-        }
+        PhoneAccountHandle accountHandle
+            = ConnectionService.registerPhoneAccount(
+                    getReactApplicationContext(), address, callUUID);
 
         Bundle extras = new Bundle();
         extras.putParcelable(
@@ -118,18 +110,17 @@ class RNConnectionService extends ReactContextBaseJavaModule {
         try {
             tm = (TelecomManager) ctx.getSystemService(Context.TELECOM_SERVICE);
             tm.placeCall(address, extras);
-        } catch (Throwable tr) {
-            JitsiMeetLogger.e(tr, TAG + " error in startCall");
+        } catch (Exception e) {
+            JitsiMeetLogger.e(e, TAG + " error in startCall");
             if (tm != null) {
-                try {
-                    tm.unregisterPhoneAccount(accountHandle);
-                } catch (Throwable tr1) {
-                    // UnsupportedOperationException: System does not support feature android.software.connectionservice
-                    // was observed here. Ignore.
-                }
+                tm.unregisterPhoneAccount(accountHandle);
             }
             ConnectionService.unregisterStartCallPromise(callUUID);
-            promise.reject(tr);
+            if (e instanceof SecurityException) {
+                promise.reject("SECURITY_ERROR", "Required permissions not granted.");
+            } else {
+                promise.reject(e);
+            }
         }
     }
 

android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java

@@ -1,5 +1,6 @@
 /*
- * Copyright @ 2017-present 8x8, Inc.
+ * Copyright @ 2019-present 8x8, Inc.
+ * Copyright @ 2017-2018 Atlassian Pty Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +20,6 @@ package org.jitsi.meet.sdk;
 import android.app.Activity;
 import androidx.annotation.Nullable;
 
-import com.facebook.hermes.reactexecutor.HermesExecutorFactory;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.NativeModule;
@@ -27,16 +27,14 @@ import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.common.LifecycleState;
 import com.facebook.react.devsupport.DevInternalSettings;
+import com.facebook.react.jscexecutor.JSCExecutorFactory;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.uimanager.ViewManager;
 import com.facebook.soloader.SoLoader;
-
-import com.oney.WebRTCModule.EglUtils;
 import com.oney.WebRTCModule.RTCVideoViewManager;
 import com.oney.WebRTCModule.WebRTCModule;
 
-import org.webrtc.DefaultVideoDecoderFactory;
-import org.webrtc.EglBase;
+import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 import org.webrtc.SoftwareVideoDecoderFactory;
 import org.webrtc.SoftwareVideoEncoderFactory;
 import org.webrtc.VideoDecoderFactory;
@@ -87,19 +85,10 @@ class ReactInstanceManagerHolder {
 
         AudioDeviceModule adm = JavaAudioDeviceModule.builder(reactContext)
             .createAudioDeviceModule();
-        options.setAudioDeviceModule(adm);
-
+        VideoDecoderFactory videoDecoderFactory = new SoftwareVideoDecoderFactory();
         VideoEncoderFactory videoEncoderFactory = new SoftwareVideoEncoderFactory();
-        VideoDecoderFactory videoDecoderFactory;
-        // Initialize EGL context required for HW acceleration. We are only going to use it for
-        // decoding.
-        EglBase.Context eglContext = EglUtils.getRootEglBaseContext();
-        if (eglContext == null) {
-            // Fallback to the software decoder.
-            videoDecoderFactory = new SoftwareVideoDecoderFactory();
-        } else {
-            videoDecoderFactory = new DefaultVideoDecoderFactory(eglContext);
-        }
+
+        options.setAudioDeviceModule(adm);
         options.setVideoDecoderFactory(videoDecoderFactory);
         options.setVideoEncoderFactory(videoEncoderFactory);
 
@@ -230,8 +219,9 @@ class ReactInstanceManagerHolder {
             // Ignore any error, the module is not compiled when LIBRE_BUILD is enabled.
         }
 
-        // Use the Hermes JavaScript engine.
-        HermesExecutorFactory jsFactory = new HermesExecutorFactory();
+        // Keep on using JSC, the jury is out on Hermes.
+        JSCExecutorFactory jsFactory
+            = new JSCExecutorFactory("", "");
 
         reactInstanceManager
             = ReactInstanceManager.builder()

android/sdk/src/main/java/org/jitsi/meet/sdk/log/JitsiMeetLogger.java

@@ -24,24 +24,11 @@ public class JitsiMeetLogger {
     }
 
     public static void addHandler(JitsiMeetBaseLogHandler handler) {
-        if (!Timber.forest().contains(handler)) {
-            try {
-                Timber.plant(handler);
-            } catch (Throwable t) {
-                Timber.w(t, "Couldn't add log handler");
-            }
-
-        }
+        Timber.plant(handler);
     }
 
     public static void removeHandler(JitsiMeetBaseLogHandler handler) {
-        if (Timber.forest().contains(handler)) {
-            try {
-                Timber.uproot(handler);
-            } catch (Throwable t) {
-                Timber.w(t, "Couldn't remove log handler");
-            }
-        }
+        Timber.uproot(handler);
     }
 
     public static void v(String message, Object... args) {

conference.js

@@ -41,7 +41,6 @@ import {
     conferenceJoined,
     conferenceLeft,
     conferenceSubjectChanged,
-    conferenceTimestampChanged,
     conferenceWillJoin,
     conferenceWillLeave,
     dataChannelOpened,
@@ -122,7 +121,6 @@ import { setSharedVideoStatus } from './react/features/shared-video';
 import { createPresenterEffect } from './react/features/stream-effects/presenter';
 import { endpointMessageReceived } from './react/features/subtitles';
 import { createRnnoiseProcessorPromise } from './react/features/rnnoise';
-import { toggleScreenshotCaptureEffect } from './react/features/screenshot-capture';
 
 const logger = require('jitsi-meet-logger').getLogger(__filename);
 
@@ -131,15 +129,6 @@ const eventEmitter = new EventEmitter();
 let room;
 let connection;
 
-/**
- * This promise is used for chaining mutePresenterVideo calls in order to avoid  calling GUM multiple times if it takes
- * a while to finish.
- *
- * @type {Promise<void>}
- * @private
- */
-let _prevMutePresenterVideo = Promise.resolve();
-
 /*
  * Logic to open a desktop picker put on the window global for
  * lib-jitsi-meet to detect and invoke
@@ -457,7 +446,6 @@ export default {
 
     /**
      * The local presenter video track (if any).
-     * @type {JitsiLocalTrack|null}
      */
     localPresenterVideo: null,
 
@@ -869,10 +857,7 @@ export default {
         }
 
         if (this.isSharingScreen) {
-            // Chain _mutePresenterVideo calls
-            _prevMutePresenterVideo = _prevMutePresenterVideo.then(() => this._mutePresenterVideo(mute));
-
-            return;
+            return this._mutePresenterVideo(mute);
         }
 
         // If not ready to modify track's state yet adjust the base/media
@@ -1426,23 +1411,10 @@ export default {
 
         this._stopProxyConnection();
 
-        // It can happen that presenter GUM is in progress while screensharing is being turned off. Here it needs to
-        // wait for that GUM to be resolved in order to prevent leaking the presenter track(this.localPresenterVideo
-        // will be null when SS is being turned off, but it will initialize once GUM resolves).
-        let promise = _prevMutePresenterVideo = _prevMutePresenterVideo.then(() => {
-            // mute the presenter track if it exists.
-            if (this.localPresenterVideo) {
-                APP.store.dispatch(setVideoMuted(true, MEDIA_TYPE.PRESENTER));
-
-                return this.localPresenterVideo.dispose().then(() => {
-                    APP.store.dispatch(trackRemoved(this.localPresenterVideo));
-                    this.localPresenterVideo = null;
-                });
-            }
-        });
+        let promise = null;
 
         if (didHaveVideo) {
-            promise = promise.then(() => createLocalTracksF({ devices: [ 'video' ] }))
+            promise = createLocalTracksF({ devices: [ 'video' ] })
                 .then(([ stream ]) => this.useVideoStream(stream))
                 .then(() => {
                     sendAnalytics(createScreenSharingEvent('stopped'));
@@ -1458,10 +1430,17 @@ export default {
                     );
                 });
         } else {
-            promise = promise.then(() => this.useVideoStream(null));
+            promise = this.useVideoStream(null);
         }
-        if (config.enableScreenshotCapture) {
-            APP.store.dispatch(toggleScreenshotCaptureEffect(false));
+
+        // mute the presenter track if it exists.
+        if (this.localPresenterVideo) {
+            APP.store.dispatch(
+                setVideoMuted(true, MEDIA_TYPE.PRESENTER));
+            this.localPresenterVideo.dispose();
+            APP.store.dispatch(
+                trackRemoved(this.localPresenterVideo));
+            this.localPresenterVideo = null;
         }
 
         return promise.then(
@@ -1656,59 +1635,11 @@ export default {
             APP.store.dispatch(notifyCameraError(error));
         };
 
-        // Check for NO-OP
-        if (mute && (!this.localPresenterVideo || this.localPresenterVideo.isMuted())) {
-
-            return;
-        } else if (!mute && this.localPresenterVideo && !this.localPresenterVideo.isMuted()) {
-
-            return;
-        }
-
-        // Create a new presenter track and apply the presenter effect.
         if (!this.localPresenterVideo && !mute) {
-            let { aspectRatio, height } = this.localVideo.track.getSettings();
-            const { width } = this.localVideo.track.getSettings();
-            let desktopResizeConstraints = {};
-            let resizeDesktopStream = false;
-            const DESKTOP_STREAM_CAP = 720;
-
-            // Determine the constraints if the desktop track needs to be resized.
-            // Resizing is needed when the resolution cannot be determined or when
-            // the window is bigger than 720p.
-            if (height && width) {
-                aspectRatio = aspectRatio ?? (width / height).toPrecision(4);
-                const advancedConstraints = [ { aspectRatio } ];
-                const isPortrait = height >= width;
-
-                // Determine which dimension needs resizing and resize only that side
-                // keeping the aspect ratio same as before.
-                if (isPortrait && width > DESKTOP_STREAM_CAP) {
-                    resizeDesktopStream = true;
-                    advancedConstraints.push({ width: DESKTOP_STREAM_CAP });
-                } else if (!isPortrait && height > DESKTOP_STREAM_CAP) {
-                    resizeDesktopStream = true;
-                    advancedConstraints.push({ height: DESKTOP_STREAM_CAP });
-                }
-                desktopResizeConstraints.advanced = advancedConstraints;
-            } else {
-                resizeDesktopStream = true;
-                desktopResizeConstraints = {
-                    width: 1280,
-                    height: 720
-                };
-            }
-            if (resizeDesktopStream) {
-                try {
-                    await this.localVideo.track.applyConstraints(desktopResizeConstraints);
-                } catch (err) {
-                    logger.error('Failed to apply constraints on the desktop stream for presenter mode', err);
-
-                    return;
-                }
-                height = this.localVideo.track.getSettings().height ?? DESKTOP_STREAM_CAP;
-            }
-            const defaultCamera = getUserSelectedCameraDeviceId(APP.store.getState());
+            // create a new presenter track and apply the presenter effect.
+            const { height } = this.localVideo.track.getSettings();
+            const defaultCamera
+                = getUserSelectedCameraDeviceId(APP.store.getState());
             let effect;
 
             try {
@@ -1723,7 +1654,6 @@ export default {
             try {
                 await this.localVideo.setEffect(effect);
                 APP.store.dispatch(setVideoMuted(mute, MEDIA_TYPE.PRESENTER));
-                this.setVideoMuteStatus(mute);
             } catch (err) {
                 logger.error('Failed to apply the Presenter effect', err);
             }
@@ -1756,9 +1686,6 @@ export default {
             .then(stream => this.useVideoStream(stream))
             .then(() => {
                 this.videoSwitchInProgress = false;
-                if (config.enableScreenshotCapture) {
-                    APP.store.dispatch(toggleScreenshotCaptureEffect(true));
-                }
                 sendAnalytics(createScreenSharingEvent('started'));
                 logger.log('Screen sharing started');
             })
@@ -1872,10 +1799,7 @@ export default {
 
         room.on(
             JitsiConferenceEvents.CONFERENCE_LEFT,
-            (...args) => {
-                APP.store.dispatch(conferenceTimestampChanged(0));
-                APP.store.dispatch(conferenceLeft(room, ...args));
-            });
+            (...args) => APP.store.dispatch(conferenceLeft(room, ...args)));
 
         room.on(
             JitsiConferenceEvents.AUTH_STATUS_CHANGED,
@@ -2005,10 +1929,6 @@ export default {
             JitsiConferenceEvents.DOMINANT_SPEAKER_CHANGED,
             id => APP.store.dispatch(dominantSpeakerChanged(id, room)));
 
-        room.on(
-            JitsiConferenceEvents.CONFERENCE_CREATED_TIMESTAMP,
-            conferenceTimestamp => APP.store.dispatch(conferenceTimestampChanged(conferenceTimestamp)));
-
         room.on(JitsiConferenceEvents.CONNECTION_INTERRUPTED, () => {
             APP.store.dispatch(localParticipantConnectionStatusChanged(
                 JitsiParticipantConnectionStatus.INTERRUPTED));
@@ -2210,8 +2130,7 @@ export default {
 
                     // dispose the existing presenter track and create a new
                     // camera track.
-                    // FIXME JitsiLocalTrack.dispose is async and should be waited for
-                    this.localPresenterVideo && this.localPresenterVideo.dispose();
+                    this.localPresenterVideo.dispose();
                     this.localPresenterVideo = null;
 
                     return this._createPresenterStreamEffect(height, cameraDeviceId)
@@ -2231,9 +2150,7 @@ export default {
                     const { height } = this.localVideo.track.getSettings();
 
                     this._updateVideoDeviceId();
-
-                    // FIXME JitsiLocalTrack.dispose is async and should be waited for
-                    this.localPresenterVideo && this.localPresenterVideo.dispose();
+                    this.localPresenterVideo.dispose();
                     this.localPresenterVideo = null;
                     this._createPresenterStreamEffect(height, cameraDeviceId);
 

config.js

@@ -30,9 +30,6 @@ var config = {
     // BOSH URL. FIXME: use XEP-0156 to discover it.
     bosh: '//jitsi-meet.example.com/http-bind',
 
-    // Websocket URL
-    // websocket: 'wss://jitsi-meet.example.com/xmpp-websocket',
-
     // The name of client node advertised in XEP-0115 'c' stanza
     clientNode: 'http://jitsi.org/jitsimeet',
 
@@ -79,13 +76,7 @@ var config = {
     // Enabling this will run the lib-jitsi-meet no audio detection module which
     // will notify the user if the current selected microphone has no audio
     // input and will suggest another valid device if one is present.
-    enableNoAudioDetection: true,
-
-    // Enabling this will run the lib-jitsi-meet noise detection module which will
-    // notify the user if there is noise, other than voice, coming from the current
-    // selected microphone. The purpose it to let the user know that the input could
-    // be potentially unpleasant for other meeting participants.
-    enableNoisyMicDetection: true,
+    // enableNoAudioDetection: false
 
     // Start the conference in audio only mode (no video is being received nor
     // sent).
@@ -338,8 +329,6 @@ var config = {
 
         // The STUN servers that will be used in the peer to peer connections
         stunServers: [
-
-            // { urls: 'stun:jitsi-meet.example.com:443' },
             { urls: 'stun:stun.l.google.com:19302' },
             { urls: 'stun:stun1.l.google.com:19302' },
             { urls: 'stun:stun2.l.google.com:19302' }
@@ -388,20 +377,6 @@ var config = {
         // userRegion: "asia"
     }
 
-    // Information for the chrome extension banner
-    // chromeExtensionBanner: {
-    //     // The chrome extension to be installed address
-    //     url: 'https://chrome.google.com/webstore/detail/jitsi-meetings/kglhbbefdnlheedjiejgomgmfplipfeb',
-
-    //     // Extensions info which allows checking if they are installed or not
-    //     chromeExtensionsInfo: [
-    //         {
-    //             id: 'kglhbbefdnlheedjiejgomgmfplipfeb',
-    //             path: 'jitsi-logo-48x48.png'
-    //         }
-    //     ]
-    // }
-
     // Local Recording
     //
 

connection.js

@@ -75,15 +75,7 @@ function connect(id, password, roomName) {
     const connectionConfig = Object.assign({}, config);
     const { issuer, jwt } = APP.store.getState()['features/base/jwt'];
 
-    // Use Websocket URL for the web app if configured. Note that there is no 'isWeb' check, because there's assumption
-    // that this code executes only on web browsers/electron. This needs to be changed when mobile and web are unified.
-    let serviceUrl = connectionConfig.websocket || connectionConfig.bosh;
-
-    serviceUrl += `?room=${roomName}`;
-
-    // FIXME Remove deprecated 'bosh' option assignment at some point(LJM will be accepting only 'serviceUrl' option
-    //  in future). It's included for the time being for Jitsi Meet and lib-jitsi-meet versions interoperability.
-    connectionConfig.serviceUrl = connectionConfig.bosh = serviceUrl;
+    connectionConfig.bosh += `?room=${roomName}`;
 
     const connection
         = new JitsiMeetJS.JitsiConnection(

connection_optimization/do_external_connect.js

@@ -17,11 +17,10 @@ import parseURLParams from '../react/features/base/config/parseURLParams';
 
 if (typeof createConnectionExternally === 'function') {
     // URL params have higher priority than config params.
-    // Do not use external connect if websocket is enabled.
     let url
         = parseURLParams(window.location, true, 'hash')[
                 'config.externalConnectUrl']
-            || config.websocket ? undefined : config.externalConnectUrl;
+            || config.externalConnectUrl;
     const isRecorder
         = parseURLParams(window.location, true, 'hash')['config.iAmRecorder'];
 

css/_base.scss

@@ -37,11 +37,6 @@ body {
     fill: white;
 }
 
-.jitsi-icon.gray svg {
-    fill: #5E6D7A;
-    cursor: pointer;
-}
-
 /**
  * AtlasKitThemeProvider sets a background color on an app-wrapping div, thereby
  * preventing transparency in filmstrip-only mode. The selector chosen to
@@ -166,7 +161,6 @@ form {
 ::-webkit-scrollbar {
     background: transparent;
     width: 7px;
-    height: $scrollHeight;
 }
 
 ::-webkit-scrollbar-button {

css/_chrome-extension-banner.scss

@@ -1,93 +0,0 @@
-.chrome-extension-banner {
-  position: fixed;
-  width: 406px;
-  height: $chromeExtensionBannerHeight;
-  background: #FFF;
-  box-shadow: 0px 2px 48px rgba(0, 0, 0, 0.25);
-  border-radius: 4px;
-  z-index: 1000;
-  float: right;
-  display: flex;
-  flex-direction: column;
-  padding: 20px 20px;
-  top: $chromeExtensionBannerTop;
-  right: $chromeExtensionBannerRight;
-    &__pos_in_meeting {
-      top: $chromeExtensionBannerTopInMeeting;
-      right: $chromeExtensionBannerRightInMeeeting;
-    }
-
-    &__container {
-      display: flex;
-      justify-content: space-between;
-      margin-bottom: 16px;
-    }
-
-    &__button-container {
-      display: flex;
-    }
-
-    &__checkbox-container {
-        display: $chromeExtensionBannerDontShowAgainDisplay;
-        margin-left: 45px;
-        margin-top: 16px;
-    }
-
-    &__checkbox-label {
-        font-size: 14px;
-        line-height: 18px;
-        display: flex;
-        align-items: center;
-        letter-spacing: -0.006em;
-        color: #1C2025;
-    }
-
-    &__icon-container {
-      display: flex;
-      background: url('../images/chromeLogo.svg');
-      background-repeat: no-repeat;
-      width: 27px;
-      height: 27px;
-    }
-
-    &__text-container {
-      font-size: 14px;
-      line-height: 18px;
-      display: flex;
-      align-items: center;
-      letter-spacing: -0.006em;
-      color: #151531;
-      width: 329px;
-    }
-
-    &__close-container {
-      display: flex;
-      width: 12px;
-      height: 12px;
-    }
-
-    &__gray-close-icon {
-      fill: #5E6D7A;
-      width: 12px;
-      height: 12px;
-      cursor: pointer;
-    }
-
-    &__button-open-url {
-      background: #0A57EB;
-      border-radius: 24px;
-      margin-left: 45px;
-      width: 236px;
-      height: 40px;
-      cursor: pointer;
-    }
-
-    &__button-text {
-      font-weight: 600;
-      font-size: 14px;
-      line-height: 40px;
-      text-align: center;
-      letter-spacing: -0.006em;
-      color: #FFFFFF;
-    }
-}

css/_subject.scss

@@ -23,10 +23,4 @@
     &-text {
         vertical-align: middle;
     }
-
-    &-conference-timer {
-        display: block;
-        font-size: 15px;
-        opacity: 0.6;
-    }
 }

css/_utils.scss

@@ -31,6 +31,13 @@
     display: inline-block !important;
 }
 
+/**
+* Shows as a list item
+**/
+.show-list-item {
+    display: list-item !important;
+}
+
 /**
  * Shows a flex element.
  */

css/_variables.scss

@@ -37,6 +37,7 @@ $presence-idle: rgb(172, 172, 172);
 /**
  * Toolbar
  */
+$defaultToolbarSize: 50px;
 $newToolbarBackgroundColor: rgba(22, 38, 55, 0.8);
 $newToolbarButtonHoverColor: rgba(255, 255, 255, 0.15);
 $newToolbarButtonToggleColor: rgba(255, 255, 255, 0.2);
@@ -105,7 +106,6 @@ $defaultWatermarkLink: '../images/watermark.png';
 $popoverMenuPadding: 13px;
 $happySoftwareBackground: transparent;
 $desktopAppDragBarHeight: 25px;
-$scrollHeight: 7px;
 
 /**
  * Z-indexes. TODO: Replace this by a function.
@@ -260,14 +260,3 @@ $deepLinkingMobileButtonFontWeight: bold;
 $deepLinkingMobileButtonFontSize: inherit;
 
 $primaryDeepLinkingMobileButtonBorderRadius: inherit;
-
-/**
-* Chrome extension banner variables.
-*/
-$chromeExtensionBannerDontShowAgainDisplay: flex;
-$chromeExtensionBannerHeight: 128px;
-$chromeExtensionBannerTop: 80px;
-$chromeExtensionBannerRight: 16px;
-$chromeExtensionBannerTopInMeeting: 10px;
-$chromeExtensionBannerRightInMeeeting: 10px;
-

css/_videolayout_default.scss

@@ -173,14 +173,18 @@
     &__hoverOverlay {
         background: rgba(0,0,0,.6);
         border-radius: $borderRadius;
-        position: absolute;
-        top: 0px;
-        left: 0px;
+        position: relative;
         width: 100%;
         height: 100%;
         visibility: hidden;
         z-index: $zindex2;
     }
+
+    &.audio-only {
+        .videoThumbnailProblemFilter {
+            filter: none;
+        }
+    }
 }
 
 #localVideoWrapper {
@@ -522,16 +526,13 @@
     display: flex;
     justify-content: center;
     height: 50%;
-    width: auto;
     overflow: hidden;
+    width: auto;
 
     .userAvatar {
         height: 100%;
         object-fit: cover;
         width: 100%;
-        top: 0px;
-        left: 0px;
-        position: absolute;
     }
 }
 
@@ -554,9 +555,6 @@
 }
 
 .sharedVideoAvatar {
-    position: absolute;
-    left: 0px;
-    top: 0px;
     height: 100%;
     width: 100%;
     object-fit: cover;
@@ -567,6 +565,21 @@
     filter: grayscale(.5) opacity(0.8);
 }
 
+.remoteVideoProblemFilter {
+    -webkit-filter: grayscale(100%);
+    filter: grayscale(100%);
+}
+
+.videoProblemFilter {
+    -webkit-filter: blur(10px) grayscale(.5) opacity(0.8);
+    filter: blur(10px) grayscale(.5) opacity(0.8);
+}
+
+.videoThumbnailProblemFilter {
+    -webkit-filter: grayscale(100%);
+    filter: grayscale(100%);
+}
+
 #remotePresenceMessage,
 #remoteConnectionMessage {
     position: absolute;
@@ -597,6 +610,24 @@
     display: none;
 }
 
+#localConnectionMessage {
+    display: none;
+    position: absolute;
+    left: 0;
+    width: 100%;
+    top:50%;
+    z-index: $zindex2;
+    font-weight: 600;
+    font-size: 14px;
+    text-align: center;
+    color: #FFF;
+    opacity: .80;
+    text-shadow:    0px 0px 1px rgba(0,0,0,0.3),
+                    0px 1px 1px rgba(0,0,0,0.3),
+                    1px 0px 1px rgba(0,0,0,0.3),
+                    0px 0px 1px rgba(0,0,0,0.3);
+}
+
 .display-avatar-with-name {
     .avatar-container {
         visibility: visible;

css/filmstrip/_horizontal_filmstrip.scss

@@ -13,24 +13,9 @@
     @extend %align-right;
     transition: bottom .3s;
     z-index: $filmstripVideosZ;
-    box-sizing: border-box;
-    width: 100%;
-    position: fixed;
-
-    /*
-     * Firefox sets flex items to min-height: auto and min-width: auto,
-     * preventing flex children from shrinking like they do on other browsers.
-     * Setting min-height and min-width 0 is a workaround for the issue so
-     * Firefox behaves like other browsers.
-     * https://bugzilla.mozilla.org/show_bug.cgi?id=1043520
-     */
-     @mixin minHWAutoFix() {
-        min-height: 0;
-        min-width: 0;
-    }
 
     &.reduce-height {
-        bottom: calc(#{$newToolbarSizeWithPadding} + #{$scrollHeight});
+        bottom: $newToolbarSizeWithPadding;
     }
 
     &__videos {
@@ -44,9 +29,8 @@
 
         &#remoteVideos {
             border: $thumbnailsBorder solid transparent;
+            padding-left: $defaultToolbarSize + 5;
             transition: bottom 2s;
-            flex-grow: 1;
-            @include minHWAutoFix()
         }
 
         /**
@@ -55,7 +39,6 @@
         &#filmstripLocalVideo {
             align-self: flex-end;
             display: block;
-            margin-bottom: 8px;
         }
 
         &.hidden {
@@ -91,52 +74,4 @@
             pointer-events: none;
         }
     }
-
-    #filmstripRemoteVideos {
-        @include minHWAutoFix();
-
-        display: flex;
-        flex: 1;
-        width: auto;
-        justify-content: flex-end;
-        flex-direction: row;
-
-        #filmstripRemoteVideosContainer {
-            flex-direction: row-reverse;
-            /**
-             * Add padding as a hack for Firefox not to show scrollbars when
-             * unnecessary.
-             */
-            padding: 1px 0;
-            overflow-y: hidden;
-            overflow-x: scroll;
-        }
-    }
-
-    .videocontainer {
-        margin-bottom: 10px;
-    }
-}
-
-
-/**
- * Workarounds for Edge and Firefox not handling scrolling properly with
- * flex-direction: row-reverse.
- */
- @mixin undoRowReverseVideos() {
-    .horizontal-filmstrip {
-        #remoteVideos #filmstripRemoteVideos #filmstripRemoteVideosContainer {
-            flex-direction: row;
-        }
-    }
-}
-
-/** Firefox detection hack **/
-@-moz-document url-prefix() {
-    @include undoRowReverseVideos();
-}
-
-/** Edge detection hack **/
-@supports (-ms-ime-align:auto) {
-    @include undoRowReverseVideos();
 }

css/filmstrip/_small_video.scss

@@ -1,5 +1,5 @@
 .filmstrip__videos .videocontainer {
-    display: inline-block;
+    display: none;
     position: relative;
     background-size: contain;
     border: $thumbnailVideoBorder solid transparent;

css/filmstrip/_tile_view_overrides.scss

@@ -22,6 +22,7 @@
         display: none;
     }
 
+    #localConnectionMessage,
     #remoteConnectionMessage,
     .watermark {
         z-index: $filmstripVideosZ + 1;

css/filmstrip/_vertical_filmstrip.scss

@@ -25,7 +25,6 @@
     display: flex;
     flex-direction: column-reverse;
     height: 100%;
-    width: 100%;
     padding: ($desktopAppDragBarHeight - 5px) 5px 10px;
     /**
      * fixed positioning is necessary for remote menus and tooltips to pop
@@ -49,6 +48,7 @@
     .filmstrip__videos {
         @extend %align-right;
         bottom: 0;
+        overflow: visible !important;
         padding: 0;
         position:relative;
         right: 0;
@@ -67,7 +67,6 @@
             border: $thumbnailsBorder solid transparent;
             padding-left: 0;
             transition: right 2s;
-            width: 100%;
         }
     }
 
@@ -81,16 +80,6 @@
         flex-direction: column-reverse;
         height: auto;
         justify-content: flex-start;
-
-        #filmstripLocalVideoThumbnail {
-            width: calc(100% - 15px);
-
-            .videocontainer {
-                height: 0px;
-                width: 100%;
-    }
-        }
-
     }
 
     /**
@@ -107,21 +96,18 @@
 
         display: flex;
         flex: 1;
-        flex-direction: column-reverse;
+        flex-direction: column;
         height: auto;
-        overflow-x: hidden;
-        overflow-y: scroll;
+        justify-content: flex-end;
 
         #filmstripRemoteVideosContainer {
-            @include minHWAutoFix();
             flex-direction: column-reverse;
-            overflow: visible;
-            width: calc(100% - 8px); // 8px for margin + border of the thumbnails
-
-            .videocontainer {
-                height: 0px;
-                width: 100%;
-            }
+            /**
+             * Add padding as a hack for Firefox not to show scrollbars when
+             * unnecessary.
+             */
+            padding: 1px 0;
+            overflow-x: hidden;
         }
     }
 
@@ -174,24 +160,9 @@
     }
 }
 
-/**
- * FF does not include the scroll width when calculating the size of the content. That's why we need to include
- * ourselves the width of the scroll so that the remote videos are aligned with the local one.
- */
-@mixin filmstripSizeWithoutScroll {
-    .vertical-filmstrip {
-        #remoteVideos #filmstripRemoteVideos {
-            #filmstripRemoteVideosContainer {
-                width: calc(100% - 15px) // 8 px - margins + border of the thumbnails; 7px - for the scroll
-            }
-        }
-    }
-}
-
 /** Firefox detection hack **/
 @-moz-document url-prefix() {
     @include undoColumnReverseVideos();
-    @include filmstripSizeWithoutScroll();
 }
 
 /** Edge detection hack **/

css/filmstrip/_vertical_filmstrip_overrides.scss

@@ -56,10 +56,6 @@
         transform: translate3d(0, 0, 0);
     }
 
-    .indicator-icon-container {
-        display: inline-block;
-    }
-
     .indicator-container {
         float: none;
     }

css/main.scss

@@ -85,6 +85,5 @@ $flagsImagePath: "../images/";
 @import 'third-party-branding/microsoft';
 @import 'avatar';
 @import 'promotional-footer';
-@import 'chrome-extension-banner';
 
 /* Modules END */

css/modals/invite/_info.scss

@@ -140,13 +140,15 @@
     margin-top: 20px;
     font-size: 12px;
     line-height: 24px;
-    border-collapse: collapse;
+    border-collapse: separate;
+    border-spacing: 0 5px;
 
     thead {
         text-align: left;
     }
 
-    tr {
+    td,
+    th {
         border-bottom: 1px solid #d1dbe8;
     }
 

debian/control

@@ -21,7 +21,7 @@ Description: WebRTC JavaScript video conferences
 
 Package: jitsi-meet-web-config
 Architecture: all
-Depends: openssl, nginx | nginx-full | nginx-extras | apache2
+Depends: openssl, openjdk-8-jre-headless | nginx | nginx-extras | apache2
 Description: Configuration for web serving of Jitsi Meet
  Jitsi Meet is a WebRTC JavaScript application that uses Jitsi
  Videobridge to provide high quality, scalable video conferences.
@@ -54,7 +54,3 @@ Architecture: all
 Depends: ${misc:Depends}, prosody-trunk (>= 1nightly747) | prosody-0.11 | prosody (>= 0.11.2), libssl-dev, luarocks, jitsi-meet-prosody
 Description: Prosody token authentication plugin for Jitsi Meet
 
-Package: jitsi-meet-turnserver
-Architecture: all
-Depends: ${misc:Depends}, nginx (>= 1.13.10) | nginx-full (>= 1.13.10) | nginx-extras (>= 1.13.10), jitsi-meet-prosody, coturn, dnsutils
-Description: Configures coturn to be used with Jitsi Meet

debian/jitsi-meet-prosody.postinst

@@ -80,15 +80,6 @@ case "$1" in
         # stores the hostname so we will reuse it later, like in purge
         db_set jitsi-meet-prosody/jvb-hostname "$JVB_HOSTNAME"
 
-        db_get jitsi-meet-prosody/turn-secret
-        if [ -z "$RET" ] ; then
-            # 8-chars random secret used for the turnserver
-            TURN_SECRET=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1`
-            db_set jitsi-meet-prosody/turn-secret "$TURN_SECRET"
-        else
-            TURN_SECRET="$RET"
-        fi
-
         # and we're done with debconf
         db_stop
 
@@ -104,9 +95,9 @@ case "$1" in
             mkdir -p /etc/prosody/conf.d/
             cp /usr/share/jitsi-meet-prosody/prosody.cfg.lua-jvb.example $PROSODY_HOST_CONFIG
             sed -i "s/jitmeet.example.com/$JVB_HOSTNAME/g" $PROSODY_HOST_CONFIG
+            sed -i "s/jitmeetSecret/$JVB_SECRET/g" $PROSODY_HOST_CONFIG
             sed -i "s/focusSecret/$JICOFO_SECRET/g" $PROSODY_HOST_CONFIG
             sed -i "s/focusUser/$JICOFO_AUTH_USER/g" $PROSODY_HOST_CONFIG
-            sed -i "s/__turnSecret__/$TURN_SECRET/g" $PROSODY_HOST_CONFIG
             if [ ! -f /etc/prosody/conf.d/$JVB_HOSTNAME.cfg.lua ]; then
                 ln -s $PROSODY_HOST_CONFIG /etc/prosody/conf.d/$JVB_HOSTNAME.cfg.lua
             fi
@@ -125,20 +116,6 @@ case "$1" in
             PROSODY_CONFIG_PRESENT="false"
         fi
 
-        USER_EXISTS_CHECK=`prosodyctl adduser jvb@$JICOFO_AUTH_DOMAIN < /dev/null || true`
-        if [ ! "$USER_EXISTS_CHECK" = "That user already exists" ]; then
-            prosodyctl register jvb $JICOFO_AUTH_DOMAIN $JVB_SECRET || true
-        fi
-
-        # Check whether prosody config has the internal muc, if not add it,
-        # as we are migrating configs
-        if [ -f $PROSODY_HOST_CONFIG ] && ! grep -q "internal.auth.$JVB_HOSTNAME" $PROSODY_HOST_CONFIG; then
-            echo -e "\nComponent \"internal.auth.$JVB_HOSTNAME\" \"muc\"" >> $PROSODY_HOST_CONFIG
-            echo -e "    storage = \"null\"" >> $PROSODY_HOST_CONFIG
-            echo -e "    modules_enabled = { \"ping\"; }" >> $PROSODY_HOST_CONFIG
-            echo -e "    admins = { \"focusUser@auth.jitmeet.example.com\", \"jvb@auth.jitmeet.example.com\" }" >> $PROSODY_HOST_CONFIG
-        fi
-
         if [ ! -f /var/lib/prosody/$JVB_HOSTNAME.crt ]; then
             # prosodyctl takes care for the permissions
             # echo for using all default values

debian/jitsi-meet-prosody.postrm

@@ -25,7 +25,7 @@ set -e
 case "$1" in
     remove)
         if [ -x "/etc/init.d/prosody" ]; then
-            invoke-rc.d prosody reload || true
+            invoke-rc.d prosody reload
         fi
     ;;
 

debian/jitsi-meet-prosody.templates

@@ -28,8 +28,3 @@ Template: jicofo/jicofosecret
 Type: password
 _Description: Jicofo Component secret:
  The secret used to connect to xmpp server as component
-
-Template: jitsi-meet-prosody/turn-secret
-Type: string
-_Description: The turn server secret
- The secret used to connect to turnserver server.

debian/jitsi-meet-tokens.postrm

@@ -44,7 +44,7 @@ case "$1" in
             sed -i 's/ -- "token_verification"/   "token_verification"/g' $PROSODY_HOST_CONFIG
 
             if [ -x "/etc/init.d/prosody" ]; then
-                invoke-rc.d prosody restart || true
+                invoke-rc.d prosody restart
             fi
         fi
 

debian/jitsi-meet-turnserver.install

@@ -1,2 +0,0 @@
-doc/debian/jitsi-meet-turn/turnserver.conf  /usr/share/jitsi-meet-turnserver/
-doc/debian/jitsi-meet/jitsi-meet.conf       /usr/share/jitsi-meet-turnserver/

debian/jitsi-meet-turnserver.links

@@ -1 +0,0 @@
-/usr/share/jitsi-meet-turnserver/jitsi-meet.conf /etc/nginx/modules-enabled/60-jitsi-meet.conf

debian/jitsi-meet-turnserver.postinst

@@ -1,127 +0,0 @@
-#!/bin/bash
-# postinst script for jitsi-meet-turnserver
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-case "$1" in
-    configure)
-        # loading debconf
-        . /usr/share/debconf/confmodule
-
-        # try to get host from jitsi-videobridge
-        db_get jitsi-videobridge/jvb-hostname
-        if [ -z "$RET" ] ; then
-            # server hostname
-            db_set jitsi-videobridge/jvb-hostname "localhost"
-            db_input critical jitsi-videobridge/jvb-hostname || true
-            db_go
-        fi
-        JVB_HOSTNAME="$RET"
-
-        TURN_CONFIG="/etc/turnserver.conf"
-        NGINX_CONFIG="/etc/nginx/sites-available/$JVB_HOSTNAME.conf"
-        JITSI_MEET_CONFIG="/etc/jitsi/meet/$JVB_HOSTNAME-config.js"
-
-        # detect dpkg-reconfigure, just delete old links
-        db_get jitsi-meet-turnserver/jvb-hostname
-        JVB_HOSTNAME_OLD=$RET
-        if [ -n "$RET" ] && [ ! "$JVB_HOSTNAME_OLD" = "$JVB_HOSTNAME" ] ; then
-            rm -f $TURN_CONFIG
-        fi
-
-        # this detect only old installations with no nginx
-        db_get jitsi-meet/jvb-serve || true
-        if [ ! -f $NGINX_CONFIG -o "$RET" = "true" ] ; then
-            # nothing to do
-            echo ""
-            echo "turnserver not configured as no nginx found to multiplex traffic"
-            echo ""
-            db_stop
-            exit 0
-        fi
-
-        # stores the hostname so we will reuse it later, like in purge
-        db_set jitsi-meet-turnserver/jvb-hostname "$JVB_HOSTNAME"
-
-        # try to get turnserver password
-        db_get jitsi-meet-prosody/turn-secret
-        if [ -z "$RET" ] ; then
-            db_input critical jitsi-meet-prosody/turn-secret || true
-            db_go
-        fi
-        TURN_SECRET="$RET"
-
-        if [[ -f $TURN_CONFIG ]] && ! grep -q "jitsi-meet coturn config" "$TURN_CONFIG" ; then
-            PUBLIC_IP=$(dig +short myip.opendns.com @resolver1.opendns.com)
-            cp /usr/share/jitsi-meet-turnserver/turnserver.conf $TURN_CONFIG
-            sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" $TURN_CONFIG
-            sed -i "s/__turnSecret__/$TURN_SECRET/g" $TURN_CONFIG
-            sed -i "s/__external_ip_address__/$JVB_HOSTNAME/g" $TURN_CONFIG
-
-            # SSL for nginx
-            db_get jitsi-meet/cert-choice
-            CERT_CHOICE="$RET"
-
-            if [ "$CERT_CHOICE" = "I want to use my own certificate" ] ; then
-                db_get jitsi-meet/cert-path-key
-                CERT_KEY="$RET"
-                db_get jitsi-meet/cert-path-crt
-                CERT_CRT="$RET"
-
-                # replace self-signed certificate paths with user provided ones
-                CERT_KEY_ESC=$(echo $CERT_KEY | sed 's/\./\\\./g')
-                CERT_KEY_ESC=$(echo $CERT_KEY_ESC | sed 's/\//\\\//g')
-                sed -i "s/pkey=\/etc\/jitsi\/meet\/.*key/pkey=$CERT_KEY_ESC/g" $TURN_CONFIG
-                CERT_CRT_ESC=$(echo $CERT_CRT | sed 's/\./\\\./g')
-                CERT_CRT_ESC=$(echo $CERT_CRT_ESC | sed 's/\//\\\//g')
-                sed -i "s/cert=\/etc\/jitsi\/meet\/.*crt/cert=$CERT_CRT_ESC/g" $TURN_CONFIG
-            fi
-
-            sed -i "s/#TURNSERVER_ENABLED/TURNSERVER_ENABLED/g" /etc/default/coturn
-            invoke-rc.d coturn restart || true
-
-            NGINX_STREAM_CONFIG="/etc/nginx/modules-enabled/60-jitsi-meet.conf"
-            if [ -f $NGINX_STREAM_CONFIG ] && [ -f $NGINX_CONFIG ] ; then
-                sed -i "s/listen 443 ssl/listen 4444 ssl http2/g" $NGINX_CONFIG
-                invoke-rc.d nginx reload || true
-            fi
-
-            # Enable turn server in config.js
-            if [ -f $JITSI_MEET_CONFIG ] ; then
-                sed -i "s/\/\/ useStunTurn: true/useStunTurn: true/g" $JITSI_MEET_CONFIG
-            fi
-        fi
-
-        # and we're done with debconf
-        db_stop
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

debian/jitsi-meet-turnserver.templates

@@ -1,9 +0,0 @@
-Template: jitsi-meet-turnserver/jvb-hostname
-Type: string
-_Description: The hostname of the current installation:
- The value for the hostname that is set in Jitsi Videobridge installation.
-
-Template: jitsi-videobridge/jvb-hostname
-Type: string
-_Description: The hostname of the current installation:
- The value for the hostname that is set in Jitsi Videobridge installation.

debian/jitsi-meet-web-config.postinst

@@ -43,8 +43,7 @@ case "$1" in
         fi
 
         JVB_SERVE="false"
-        # this detect only old installations
-        db_get jitsi-meet/jvb-serve || true
+        db_get jitsi-meet/jvb-serve
         if [ -n "$RET" ] && [ "$RET" = "true" ] ; then
             JVB_SERVE="true"
         fi
@@ -53,12 +52,9 @@ case "$1" in
         db_set jitsi-meet/jvb-hostname $JVB_HOSTNAME
 
         NGINX_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'nginx' 2>/dev/null | awk '{print $3}' || true)"
-        NGINX_FULL_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'nginx-full' 2>/dev/null | awk '{print $3}' || true)"
         NGINX_EXTRAS_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'nginx-extras' 2>/dev/null | awk '{print $3}' || true)"
         if [ "$NGINX_INSTALL_CHECK" = "installed" ] \
            || [ "$NGINX_INSTALL_CHECK" = "unpacked" ] \
-           || [ "$NGINX_FULL_INSTALL_CHECK" = "installed" ] \
-           || [ "$NGINX_FULL_INSTALL_CHECK" = "unpacked" ] \
            || [ "$NGINX_EXTRAS_INSTALL_CHECK" = "installed" ] \
            || [ "$NGINX_EXTRAS_INSTALL_CHECK" = "unpacked" ] ; then
             FORCE_NGINX="true"
@@ -110,19 +106,71 @@ case "$1" in
 
         # this is new install let's configure jvb to serve meet
         # no-nginx, no-apache installed on machine, this is new install or reconfiguring old one which have jvb_serve set
-        if [[ "$JVB_SERVE" = "true" ]] ; then
-            echo ""
-            echo "------------------------------------------------"
-            echo "You are using jetty to serve jitsi-meet, it is recommended to uninstall(purge) and use default installation that comes with nginx!"
-            echo ""
-            echo "When using the following command, any custom config will be LOST, please backup /etc/jitsi !!!"
-            echo ""
-            echo "You can purge your installation using the following command:"
-            echo "apt-get purge jitsi-meet jitsi-meet-web-config jitsi-meet-prosody jitsi-meet-web jicofo jitsi-videobridge"
-            echo "------------------------------------------------"
-            echo ""
-        elif [[ "$FORCE_NGINX" = "true" && ( -z "$JVB_HOSTNAME_OLD" || "$RECONFIGURING" = "true" ) ]] ; then
+        if [[ -z "$FORCE_NGINX" && -z "$FORCE_APACHE" && ( -z "$JVB_HOSTNAME_OLD" || ( "$JVB_SERVE" = "true" && "$RECONFIGURING" = "true" )) ]] ; then
 
+            JVB_ETC_CONFIG="/etc/jitsi/videobridge/config"
+            JVB_CONFIG="/etc/jitsi/videobridge/sip-communicator.properties"
+
+            # this is a reconfigure, lets just delete old links
+            if [ "$RECONFIGURING" = "true" ] ; then
+                rm -f $JVB_CONFIG
+            fi
+
+            # we will write to the file if missing create it
+            if [ ! -f $JVB_CONFIG ] ; then
+                touch $JVB_CONFIG
+            fi
+
+            # configure jvb
+            echo "AUTHBIND=yes" >> $JVB_ETC_CONFIG
+            sed -i "s/JVB_OPTS=.*/JVB_OPTS=--apis=rest,xmpp/g" $JVB_ETC_CONFIG
+
+            echo "org.jitsi.videobridge.rest.jetty.host=::" >> $JVB_CONFIG
+            echo "org.jitsi.videobridge.rest.jetty.port=443" >> $JVB_CONFIG
+            echo "org.jitsi.videobridge.rest.jetty.ProxyServlet.hostHeader=$JVB_HOSTNAME" >> $JVB_CONFIG
+            echo "org.jitsi.videobridge.rest.jetty.ProxyServlet.pathSpec=/http-bind" >> $JVB_CONFIG
+            echo "org.jitsi.videobridge.rest.jetty.ProxyServlet.proxyTo=http://localhost:5280/http-bind" >> $JVB_CONFIG
+            echo "org.jitsi.videobridge.rest.jetty.ResourceHandler.resourceBase=/usr/share/jitsi-meet" >> $JVB_CONFIG
+            echo "org.jitsi.videobridge.rest.jetty.ResourceHandler.alias./config.js=/etc/jitsi/meet/$JVB_HOSTNAME-config.js" >> $JVB_CONFIG
+            echo "org.jitsi.videobridge.rest.jetty.ResourceHandler.alias./interface_config.js=/usr/share/jitsi-meet/interface_config.js" >> $JVB_CONFIG
+            echo "org.jitsi.videobridge.rest.jetty.ResourceHandler.alias./logging_config.js=/usr/share/jitsi-meet/logging_config.js" >> $JVB_CONFIG
+            echo "org.jitsi.videobridge.rest.jetty.ResourceHandler.alias./external_api.js=/usr/share/jitsi-meet/libs/external_api.min.js" >> $JVB_CONFIG
+            echo "org.jitsi.videobridge.rest.jetty.RewriteHandler.regex=^/([a-zA-Z0-9]+)$" >> $JVB_CONFIG
+            echo "org.jitsi.videobridge.rest.jetty.RewriteHandler.replacement=/" >> $JVB_CONFIG
+            echo "org.jitsi.videobridge.rest.jetty.SSIResourceHandler.paths=/" >> $JVB_CONFIG
+            echo "org.jitsi.videobridge.rest.jetty.tls.port=443" >> $JVB_CONFIG
+            echo "org.jitsi.videobridge.TCP_HARVESTER_PORT=443" >> $JVB_CONFIG
+            echo "org.jitsi.videobridge.rest.jetty.sslContextFactory.keyStorePath=/etc/jitsi/videobridge/$JVB_HOSTNAME.jks" >> $JVB_CONFIG
+            echo "org.jitsi.videobridge.rest.jetty.sslContextFactory.keyStorePassword=changeit" >> $JVB_CONFIG
+
+            # configure authbind to allow jvb to bind to privileged ports
+            OWNER=$(stat -c '%U' /usr/share/jitsi-videobridge)
+            GROUP=$(stat -c '%G' /usr/share/jitsi-videobridge)
+            JVB_UID="`id -u $OWNER`"
+            if [ ! -f "/etc/authbind/byport/443" ] ; then
+                if [ ! -d "/etc/authbind/byport" ] ; then
+                        mkdir -p /etc/authbind/byport
+                        chmod 755 /etc/authbind
+                        chmod 755 /etc/authbind/byport
+                fi
+                touch /etc/authbind/byport/443
+                chown $OWNER /etc/authbind/byport/443
+                chmod 755 /etc/authbind/byport/443
+            fi
+
+            CERT_P12="/etc/jitsi/videobridge/$JVB_HOSTNAME.p12"
+            CERT_JKS="/etc/jitsi/videobridge/$JVB_HOSTNAME.jks"
+            # create jks from  certs
+            openssl pkcs12 -export \
+                -in $CERT_CRT -inkey $CERT_KEY -passout pass:changeit > $CERT_P12
+            keytool -importkeystore -destkeystore $CERT_JKS \
+                -srckeystore $CERT_P12 -srcstoretype pkcs12 \
+                -noprompt -storepass changeit -srcstorepass changeit
+
+            db_set jitsi-meet/jvb-serve "true"
+
+            invoke-rc.d jitsi-videobridge restart || true
+        elif [[ "$FORCE_NGINX" = "true" && ( -z "$JVB_HOSTNAME_OLD" || "$RECONFIGURING" = "true" ) ]] ; then
             # this is a reconfigure, lets just delete old links
             if [ "$RECONFIGURING" = "true" ] ; then
                 rm -f /etc/nginx/sites-enabled/$JVB_HOSTNAME_OLD.conf
@@ -152,7 +200,6 @@ case "$1" in
 
             invoke-rc.d nginx reload || true
         elif [[ "$FORCE_APACHE" = "true" && ( -z "$JVB_HOSTNAME_OLD" || "$RECONFIGURING" = "true" ) ]] ; then
-
             # this is a reconfigure, lets just delete old links
             if [ "$RECONFIGURING" = "true" ] ; then
                 a2dissite $JVB_HOSTNAME_OLD.conf

debian/jitsi-meet-web-config.postrm

@@ -25,10 +25,10 @@ set -e
 case "$1" in
     remove)
         if [ -x "/etc/init.d/nginx" ]; then
-            invoke-rc.d nginx reload || true
+            invoke-rc.d nginx reload
         fi
         if [ -x "/etc/init.d/apache2" ]; then
-            invoke-rc.d apache2 reload || true
+            invoke-rc.d apache2 reload
         fi
     ;;
     purge)
@@ -40,6 +40,8 @@ case "$1" in
             rm -f /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf
             rm -f /etc/apache2/sites-available/$JVB_HOSTNAME.conf
             rm -f /etc/apache2/sites-enabled/$JVB_HOSTNAME.conf
+            rm -f /etc/jitsi/videobridge/$JVB_HOSTNAME.jks
+            rm -f /etc/jitsi/videobridge/$JVB_HOSTNAME.p12
             rm -f /etc/jitsi/meet/$JVB_HOSTNAME.key
             rm -f /etc/jitsi/meet/$JVB_HOSTNAME.crt
         fi

debian/jitsi-meet-web-config.templates

@@ -26,6 +26,12 @@ Type: string
 _Description: The hostname of the current installation:
  The value for the hostname that is set in Jitsi Videobridge installation.
 
+Template: jitsi-meet/jvb-serve
+Type: boolean
+Default: false
+_Description: for internal use
+ for internal use.
+
 Template: jitsi-videobridge/jvb-hostname
 Type: string
 _Description: Hostname:

doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example

@@ -3,17 +3,6 @@ plugin_paths = { "/usr/share/jitsi-meet/prosody-plugins/" }
 -- domain mapper options, must at least have domain base set to use the mapper
 muc_mapper_domain_base = "jitmeet.example.com";
 
-turncredentials_secret = "__turnSecret__";
-
-turncredentials = {
-  { type = "stun", host = "jitmeet.example.com", port = "443" },
-  { type = "turn", host = "jitmeet.example.com", port = "443", transport = "udp" },
-  { type = "turns", host = "jitmeet.example.com", port = "443", transport = "tcp" }
-};
-
-cross_domain_bosh = false;
-consider_bosh_secure = true;
-
 VirtualHost "jitmeet.example.com"
         -- enabled = false -- Remove this line to enable this host
         authentication = "anonymous"
@@ -30,15 +19,12 @@ VirtualHost "jitmeet.example.com"
                 certificate = "/etc/prosody/certs/jitmeet.example.com.crt";
         }
         speakerstats_component = "speakerstats.jitmeet.example.com"
-        conference_duration_component = "conferenceduration.jitmeet.example.com"
         -- we need bosh
         modules_enabled = {
             "bosh";
             "pubsub";
             "ping"; -- Enable mod_ping
             "speakerstats";
-            "turncredentials";
-            "conference_duration";
         }
         c2s_require_encryption = false
 
@@ -49,15 +35,10 @@ Component "conference.jitmeet.example.com" "muc"
         "muc_domain_mapper";
         -- "token_verification";
     }
-    admins = { "focusUser@auth.jitmeet.example.com" }
+admins = { "focusUser@auth.jitmeet.example.com" }
 
--- internal muc component
-Component "internal.auth.jitmeet.example.com" "muc"
-    storage = "null"
-    modules_enabled = {
-      "ping";
-    }
-    admins = { "focusUser@auth.jitmeet.example.com", "jvb@auth.jitmeet.example.com" }
+Component "jitsi-videobridge.jitmeet.example.com"
+    component_secret = "jitmeetSecret"
 
 VirtualHost "auth.jitmeet.example.com"
     authentication = "internal_plain"
@@ -67,6 +48,3 @@ Component "focus.jitmeet.example.com"
 
 Component "speakerstats.jitmeet.example.com" "speakerstats_component"
     muc_component = "conference.jitmeet.example.com"
-
-Component "conferenceduration.jitmeet.example.com" "conference_duration_component"
-    muc_component = "conference.jitmeet.example.com"

doc/debian/jitsi-meet-turn/RREADME

@@ -1 +0,0 @@
-Coturn configuration for Jitsi Meet

doc/debian/jitsi-meet-turn/turnserver.conf

@@ -1,13 +0,0 @@
-# jitsi-meet coturn config. Do not modify this line
-lt-cred-mech
-use-auth-secret
-keep-address-family
-static-auth-secret=__turnSecret__
-realm=jitsi-meet.example.com
-cert=/etc/jitsi/meet/jitsi-meet.example.com.crt
-pkey=/etc/jitsi/meet/jitsi-meet.example.com.key
-
-no-tcp
-listening-port=443
-tls-listening-port=4445
-external-ip=__external_ip_address__

doc/debian/jitsi-meet/jitsi-meet.conf

@@ -1,30 +0,0 @@
-# this is jitsi-meet nginx module configuration
-# this forward all http traffic to the nginx virtual host port
-# and the rest to the turn server
-
-stream {
-    upstream web {
-        server 127.0.0.1:4444;
-    }
-    upstream turn {
-        server 127.0.0.1:4445;
-    }
-    # since 1.13.10
-    map $ssl_preread_alpn_protocols $upstream {
-        "h2"            web;
-        "http/1.1"      web;
-        "h2,http/1.1"   web;
-        default         turn;
-    }
-
-    server {
-        listen 443;
-
-        # since 1.11.5
-        ssl_preread on;
-        proxy_pass $upstream;
-
-        # Increase buffer to serve video
-        proxy_buffer_size 10m;
-    }
-}

doc/debian/jitsi-meet/jitsi-meet.example

@@ -3,17 +3,7 @@ server_names_hash_bucket_size 64;
 server {
     listen 80;
     server_name jitsi-meet.example.com;
-
-    location ^~ /.well-known/acme-challenge/ {
-       default_type "text/plain";
-       root         /usr/share/jitsi-meet;
-    }
-    location = /.well-known/acme-challenge/ {
-       return 404;
-    }
-    location / {
-       return 301 https://$host$request_uri;
-    }
+    return 301 https://$host$request_uri;
 }
 server {
     listen 443 ssl;
@@ -59,16 +49,6 @@ server {
         proxy_set_header Host $http_host;
     }
 
-    # xmpp websockets
-    location = /xmpp-websocket {
-        proxy_pass http://127.0.0.1:5280/xmpp-websocket?prefix=$prefix&$args;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        proxy_set_header Host $http_host;
-        tcp_nodelay on;
-    }
-
     location ~ ^/([^/?&:'"]+)$ {
         try_files $uri @root_path;
     }
@@ -100,13 +80,4 @@ server {
 
         rewrite ^/(.*)$ /http-bind;
     }
-
-    # websockets for subdomains
-    location ~ ^/([^/?&:'"]+)/xmpp-websocket {
-        set $subdomain "$1.";
-        set $subdir "$1/";
-        set $prefix "$1";
-
-        rewrite ^/(.*)$ /xmpp-websocket;
-    }
 }

doc/example-config-files/multidomain/config.js.multidomain.example

@@ -10,6 +10,5 @@ var config = {
         focus: 'focus.jitsi.example.com',
     },
     useNicks: false,
-    bosh: '//jitsi.example.com/http-bind', // FIXME: use xep-0156 for that
-    websocket: 'wss://jitsi.example.com/xmpp-websocket'
+    bosh: '//jitsi.example.com/http-bind' // FIXME: use xep-0156 for that
 };

doc/example-config-files/multidomain/jitsi.example.com.multidomain.example

@@ -60,12 +60,4 @@ server {
         rewrite ^/(.*)$ /http-bind;
     }
 
-    # websockets for subdomains
-    location ~ ^/([^/?&:'"]+)/xmpp-websocket {
-        set $subdomain "$1.";
-        set $subdir "$1/";
-        set $prefix "$1";
-
-        rewrite ^/(.*)$ /xmpp-websocket;
-    }
 }

doc/quick-install.md

@@ -6,7 +6,7 @@ Debian Wheezy and other older systems may require additional things to be done.
 
 Also note that a recent default Ubuntu installation has only the `main` repository enabled, and Jitsi Meet needs packages from `universe`. Check your `/etc/apt/sources.list` file, and if `universe` is not present refer to [Ubuntu's documentation](https://help.ubuntu.com/community/Repositories/Ubuntu) on how to enable it. (Usually it amounts to copying the `main` lines and changing to `universe`.)
 
-N.B.:
+N.B.: 
 
 a.) All commands are supposed to be run by root. If you are logged in as a regular user with sudo rights, please prepend ___sudo___ to each of the commands.
 
@@ -46,7 +46,7 @@ During the installation, you will be asked to enter the hostname of the Jitsi Me
 
 This hostname (or IP address) will be used for virtualhost configuration inside the Jitsi Meet and also, you and your correspondents will be using it to access the web conferences.
 
-### Generate a Let's Encrypt certificate
+### Generate a Let's Encrypt certificate 
 
 Simply run the following in your shell
 
@@ -109,7 +109,7 @@ Enjoy!
 ## Uninstall
 
 ```sh
-apt-get purge jigasi jitsi-meet jitsi-meet-web-config jitsi-meet-prosody jitsi-meet-turnserver jitsi-meet-web jicofo jitsi-videobridge
+apt-get purge jigasi jitsi-meet jitsi-meet-web-config jitsi-meet-prosody jitsi-meet-web jicofo jitsi-videobridge
 ```
 
 Sometimes the following packages will fail to uninstall properly:

interface_config.js

@@ -188,24 +188,7 @@ var interfaceConfig = {
      *
      * Note: this mode is experimental and subject to breakage.
      */
-    AUTO_PIN_LATEST_SCREEN_SHARE: 'remote-only',
-
-    /**
-     * If true, presence status: busy, calling, connected etc. is not displayed.
-     */
-    DISABLE_PRESENCE_STATUS: false,
-
-    /**
-     * If true, notifications regarding joining/leaving are no longer displayed.
-     */
-    DISABLE_JOIN_LEAVE_NOTIFICATIONS: false,
-
-    /**
-    * Decides whether the chrome extension banner should be rendered on the landing page and during the meeting.
-    * If this is set to false, the banner will not be rendered at all. If set to true, the check for extension(s)
-    * being already installed is done before rendering.
-    */
-    SHOW_CHROME_EXTENSION_BANNER: false
+    AUTO_PIN_LATEST_SCREEN_SHARE: 'remote-only'
 
     /**
      * How many columns the tile view can expand to. The respected range is

ios/Podfile.lock

@@ -15,14 +15,14 @@ PODS:
     - Fabric (~> 1.9.0)
   - DoubleConversion (1.1.6)
   - Fabric (1.9.0)
-  - FBLazyVector (0.61.5-jitsi.1)
-  - FBReactNativeSpec (0.61.5-jitsi.1):
+  - FBLazyVector (0.61.3)
+  - FBReactNativeSpec (0.61.3):
     - Folly (= 2018.10.22.00)
-    - RCTRequired (= 0.61.5-jitsi.1)
-    - RCTTypeSafety (= 0.61.5-jitsi.1)
-    - React-Core (= 0.61.5-jitsi.1)
-    - React-jsi (= 0.61.5-jitsi.1)
-    - ReactCommon/turbomodule/core (= 0.61.5-jitsi.1)
+    - RCTRequired (= 0.61.3)
+    - RCTTypeSafety (= 0.61.3)
+    - React-Core (= 0.61.3)
+    - React-jsi (= 0.61.3)
+    - ReactCommon/turbomodule/core (= 0.61.3)
   - Firebase/Core (5.18.0):
     - Firebase/CoreOnly
     - FirebaseAnalytics (= 5.7.0)
@@ -103,169 +103,169 @@ PODS:
   - nanopb/decode (0.3.901)
   - nanopb/encode (0.3.901)
   - ObjectiveDropboxOfficial (3.9.4)
-  - RCTRequired (0.61.5-jitsi.1)
-  - RCTTypeSafety (0.61.5-jitsi.1):
-    - FBLazyVector (= 0.61.5-jitsi.1)
+  - RCTRequired (0.61.3)
+  - RCTTypeSafety (0.61.3):
+    - FBLazyVector (= 0.61.3)
     - Folly (= 2018.10.22.00)
-    - RCTRequired (= 0.61.5-jitsi.1)
-    - React-Core (= 0.61.5-jitsi.1)
-  - React (0.61.5-jitsi.1):
-    - React-Core (= 0.61.5-jitsi.1)
-    - React-Core/DevSupport (= 0.61.5-jitsi.1)
-    - React-Core/RCTWebSocket (= 0.61.5-jitsi.1)
-    - React-RCTActionSheet (= 0.61.5-jitsi.1)
-    - React-RCTAnimation (= 0.61.5-jitsi.1)
-    - React-RCTBlob (= 0.61.5-jitsi.1)
-    - React-RCTImage (= 0.61.5-jitsi.1)
-    - React-RCTLinking (= 0.61.5-jitsi.1)
-    - React-RCTNetwork (= 0.61.5-jitsi.1)
-    - React-RCTSettings (= 0.61.5-jitsi.1)
-    - React-RCTText (= 0.61.5-jitsi.1)
-    - React-RCTVibration (= 0.61.5-jitsi.1)
-  - React-Core (0.61.5-jitsi.1):
+    - RCTRequired (= 0.61.3)
+    - React-Core (= 0.61.3)
+  - React (0.61.3):
+    - React-Core (= 0.61.3)
+    - React-Core/DevSupport (= 0.61.3)
+    - React-Core/RCTWebSocket (= 0.61.3)
+    - React-RCTActionSheet (= 0.61.3)
+    - React-RCTAnimation (= 0.61.3)
+    - React-RCTBlob (= 0.61.3)
+    - React-RCTImage (= 0.61.3)
+    - React-RCTLinking (= 0.61.3)
+    - React-RCTNetwork (= 0.61.3)
+    - React-RCTSettings (= 0.61.3)
+    - React-RCTText (= 0.61.3)
+    - React-RCTVibration (= 0.61.3)
+  - React-Core (0.61.3):
     - Folly (= 2018.10.22.00)
     - glog
-    - React-Core/Default (= 0.61.5-jitsi.1)
-    - React-cxxreact (= 0.61.5-jitsi.1)
-    - React-jsi (= 0.61.5-jitsi.1)
-    - React-jsiexecutor (= 0.61.5-jitsi.1)
+    - React-Core/Default (= 0.61.3)
+    - React-cxxreact (= 0.61.3)
+    - React-jsi (= 0.61.3)
+    - React-jsiexecutor (= 0.61.3)
     - Yoga
-  - React-Core/CoreModulesHeaders (0.61.5-jitsi.1):
+  - React-Core/CoreModulesHeaders (0.61.3):
     - Folly (= 2018.10.22.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.61.5-jitsi.1)
-    - React-jsi (= 0.61.5-jitsi.1)
-    - React-jsiexecutor (= 0.61.5-jitsi.1)
+    - React-cxxreact (= 0.61.3)
+    - React-jsi (= 0.61.3)
+    - React-jsiexecutor (= 0.61.3)
     - Yoga
-  - React-Core/Default (0.61.5-jitsi.1):
+  - React-Core/Default (0.61.3):
     - Folly (= 2018.10.22.00)
     - glog
-    - React-cxxreact (= 0.61.5-jitsi.1)
-    - React-jsi (= 0.61.5-jitsi.1)
-    - React-jsiexecutor (= 0.61.5-jitsi.1)
+    - React-cxxreact (= 0.61.3)
+    - React-jsi (= 0.61.3)
+    - React-jsiexecutor (= 0.61.3)
     - Yoga
-  - React-Core/DevSupport (0.61.5-jitsi.1):
+  - React-Core/DevSupport (0.61.3):
     - Folly (= 2018.10.22.00)
     - glog
-    - React-Core/Default (= 0.61.5-jitsi.1)
-    - React-Core/RCTWebSocket (= 0.61.5-jitsi.1)
-    - React-cxxreact (= 0.61.5-jitsi.1)
-    - React-jsi (= 0.61.5-jitsi.1)
-    - React-jsiexecutor (= 0.61.5-jitsi.1)
-    - React-jsinspector (= 0.61.5-jitsi.1)
+    - React-Core/Default (= 0.61.3)
+    - React-Core/RCTWebSocket (= 0.61.3)
+    - React-cxxreact (= 0.61.3)
+    - React-jsi (= 0.61.3)
+    - React-jsiexecutor (= 0.61.3)
+    - React-jsinspector (= 0.61.3)
     - Yoga
-  - React-Core/RCTActionSheetHeaders (0.61.5-jitsi.1):
+  - React-Core/RCTActionSheetHeaders (0.61.3):
     - Folly (= 2018.10.22.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.61.5-jitsi.1)
-    - React-jsi (= 0.61.5-jitsi.1)
-    - React-jsiexecutor (= 0.61.5-jitsi.1)
+    - React-cxxreact (= 0.61.3)
+    - React-jsi (= 0.61.3)
+    - React-jsiexecutor (= 0.61.3)
     - Yoga
-  - React-Core/RCTAnimationHeaders (0.61.5-jitsi.1):
+  - React-Core/RCTAnimationHeaders (0.61.3):
     - Folly (= 2018.10.22.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.61.5-jitsi.1)
-    - React-jsi (= 0.61.5-jitsi.1)
-    - React-jsiexecutor (= 0.61.5-jitsi.1)
+    - React-cxxreact (= 0.61.3)
+    - React-jsi (= 0.61.3)
+    - React-jsiexecutor (= 0.61.3)
     - Yoga
-  - React-Core/RCTBlobHeaders (0.61.5-jitsi.1):
+  - React-Core/RCTBlobHeaders (0.61.3):
     - Folly (= 2018.10.22.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.61.5-jitsi.1)
-    - React-jsi (= 0.61.5-jitsi.1)
-    - React-jsiexecutor (= 0.61.5-jitsi.1)
+    - React-cxxreact (= 0.61.3)
+    - React-jsi (= 0.61.3)
+    - React-jsiexecutor (= 0.61.3)
     - Yoga
-  - React-Core/RCTImageHeaders (0.61.5-jitsi.1):
+  - React-Core/RCTImageHeaders (0.61.3):
     - Folly (= 2018.10.22.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.61.5-jitsi.1)
-    - React-jsi (= 0.61.5-jitsi.1)
-    - React-jsiexecutor (= 0.61.5-jitsi.1)
+    - React-cxxreact (= 0.61.3)
+    - React-jsi (= 0.61.3)
+    - React-jsiexecutor (= 0.61.3)
     - Yoga
-  - React-Core/RCTLinkingHeaders (0.61.5-jitsi.1):
+  - React-Core/RCTLinkingHeaders (0.61.3):
     - Folly (= 2018.10.22.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.61.5-jitsi.1)
-    - React-jsi (= 0.61.5-jitsi.1)
-    - React-jsiexecutor (= 0.61.5-jitsi.1)
+    - React-cxxreact (= 0.61.3)
+    - React-jsi (= 0.61.3)
+    - React-jsiexecutor (= 0.61.3)
     - Yoga
-  - React-Core/RCTNetworkHeaders (0.61.5-jitsi.1):
+  - React-Core/RCTNetworkHeaders (0.61.3):
     - Folly (= 2018.10.22.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.61.5-jitsi.1)
-    - React-jsi (= 0.61.5-jitsi.1)
-    - React-jsiexecutor (= 0.61.5-jitsi.1)
+    - React-cxxreact (= 0.61.3)
+    - React-jsi (= 0.61.3)
+    - React-jsiexecutor (= 0.61.3)
     - Yoga
-  - React-Core/RCTSettingsHeaders (0.61.5-jitsi.1):
+  - React-Core/RCTSettingsHeaders (0.61.3):
     - Folly (= 2018.10.22.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.61.5-jitsi.1)
-    - React-jsi (= 0.61.5-jitsi.1)
-    - React-jsiexecutor (= 0.61.5-jitsi.1)
+    - React-cxxreact (= 0.61.3)
+    - React-jsi (= 0.61.3)
+    - React-jsiexecutor (= 0.61.3)
     - Yoga
-  - React-Core/RCTTextHeaders (0.61.5-jitsi.1):
+  - React-Core/RCTTextHeaders (0.61.3):
     - Folly (= 2018.10.22.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.61.5-jitsi.1)
-    - React-jsi (= 0.61.5-jitsi.1)
-    - React-jsiexecutor (= 0.61.5-jitsi.1)
+    - React-cxxreact (= 0.61.3)
+    - React-jsi (= 0.61.3)
+    - React-jsiexecutor (= 0.61.3)
     - Yoga
-  - React-Core/RCTVibrationHeaders (0.61.5-jitsi.1):
+  - React-Core/RCTVibrationHeaders (0.61.3):
     - Folly (= 2018.10.22.00)
     - glog
     - React-Core/Default
-    - React-cxxreact (= 0.61.5-jitsi.1)
-    - React-jsi (= 0.61.5-jitsi.1)
-    - React-jsiexecutor (= 0.61.5-jitsi.1)
+    - React-cxxreact (= 0.61.3)
+    - React-jsi (= 0.61.3)
+    - React-jsiexecutor (= 0.61.3)
     - Yoga
-  - React-Core/RCTWebSocket (0.61.5-jitsi.1):
+  - React-Core/RCTWebSocket (0.61.3):
     - Folly (= 2018.10.22.00)
     - glog
-    - React-Core/Default (= 0.61.5-jitsi.1)
-    - React-cxxreact (= 0.61.5-jitsi.1)
-    - React-jsi (= 0.61.5-jitsi.1)
-    - React-jsiexecutor (= 0.61.5-jitsi.1)
+    - React-Core/Default (= 0.61.3)
+    - React-cxxreact (= 0.61.3)
+    - React-jsi (= 0.61.3)
+    - React-jsiexecutor (= 0.61.3)
     - Yoga
-  - React-CoreModules (0.61.5-jitsi.1):
-    - FBReactNativeSpec (= 0.61.5-jitsi.1)
+  - React-CoreModules (0.61.3):
+    - FBReactNativeSpec (= 0.61.3)
     - Folly (= 2018.10.22.00)
-    - RCTTypeSafety (= 0.61.5-jitsi.1)
-    - React-Core/CoreModulesHeaders (= 0.61.5-jitsi.1)
-    - React-RCTImage (= 0.61.5-jitsi.1)
-    - ReactCommon/turbomodule/core (= 0.61.5-jitsi.1)
-  - React-cxxreact (0.61.5-jitsi.1):
+    - RCTTypeSafety (= 0.61.3)
+    - React-Core/CoreModulesHeaders (= 0.61.3)
+    - React-RCTImage (= 0.61.3)
+    - ReactCommon/turbomodule/core (= 0.61.3)
+  - React-cxxreact (0.61.3):
     - boost-for-react-native (= 1.63.0)
     - DoubleConversion
     - Folly (= 2018.10.22.00)
     - glog
-    - React-jsinspector (= 0.61.5-jitsi.1)
-  - React-jsi (0.61.5-jitsi.1):
+    - React-jsinspector (= 0.61.3)
+  - React-jsi (0.61.3):
     - boost-for-react-native (= 1.63.0)
     - DoubleConversion
     - Folly (= 2018.10.22.00)
     - glog
-    - React-jsi/Default (= 0.61.5-jitsi.1)
-  - React-jsi/Default (0.61.5-jitsi.1):
+    - React-jsi/Default (= 0.61.3)
+  - React-jsi/Default (0.61.3):
     - boost-for-react-native (= 1.63.0)
     - DoubleConversion
     - Folly (= 2018.10.22.00)
     - glog
-  - React-jsiexecutor (0.61.5-jitsi.1):
+  - React-jsiexecutor (0.61.3):
     - DoubleConversion
     - Folly (= 2018.10.22.00)
     - glog
-    - React-cxxreact (= 0.61.5-jitsi.1)
-    - React-jsi (= 0.61.5-jitsi.1)
-  - React-jsinspector (0.61.5-jitsi.1)
+    - React-cxxreact (= 0.61.3)
+    - React-jsi (= 0.61.3)
+  - React-jsinspector (0.61.3)
   - react-native-background-timer (2.1.1):
     - React
   - react-native-calendar-events (1.7.3):
@@ -274,64 +274,64 @@ PODS:
     - React
   - react-native-netinfo (4.1.5):
     - React
-  - react-native-webrtc (1.75.3):
+  - react-native-webrtc (1.75.2):
     - React
   - react-native-webview (7.4.1):
     - React
-  - React-RCTActionSheet (0.61.5-jitsi.1):
-    - React-Core/RCTActionSheetHeaders (= 0.61.5-jitsi.1)
-  - React-RCTAnimation (0.61.5-jitsi.1):
-    - React-Core/RCTAnimationHeaders (= 0.61.5-jitsi.1)
-  - React-RCTBlob (0.61.5-jitsi.1):
-    - React-Core/RCTBlobHeaders (= 0.61.5-jitsi.1)
-    - React-Core/RCTWebSocket (= 0.61.5-jitsi.1)
-    - React-jsi (= 0.61.5-jitsi.1)
-    - React-RCTNetwork (= 0.61.5-jitsi.1)
-  - React-RCTImage (0.61.5-jitsi.1):
-    - React-Core/RCTImageHeaders (= 0.61.5-jitsi.1)
-    - React-RCTNetwork (= 0.61.5-jitsi.1)
-  - React-RCTLinking (0.61.5-jitsi.1):
-    - React-Core/RCTLinkingHeaders (= 0.61.5-jitsi.1)
-  - React-RCTNetwork (0.61.5-jitsi.1):
-    - React-Core/RCTNetworkHeaders (= 0.61.5-jitsi.1)
-  - React-RCTSettings (0.61.5-jitsi.1):
-    - React-Core/RCTSettingsHeaders (= 0.61.5-jitsi.1)
-  - React-RCTText (0.61.5-jitsi.1):
-    - React-Core/RCTTextHeaders (= 0.61.5-jitsi.1)
-  - React-RCTVibration (0.61.5-jitsi.1):
-    - React-Core/RCTVibrationHeaders (= 0.61.5-jitsi.1)
-  - ReactCommon/jscallinvoker (0.61.5-jitsi.1):
+  - React-RCTActionSheet (0.61.3):
+    - React-Core/RCTActionSheetHeaders (= 0.61.3)
+  - React-RCTAnimation (0.61.3):
+    - React-Core/RCTAnimationHeaders (= 0.61.3)
+  - React-RCTBlob (0.61.3):
+    - React-Core/RCTBlobHeaders (= 0.61.3)
+    - React-Core/RCTWebSocket (= 0.61.3)
+    - React-jsi (= 0.61.3)
+    - React-RCTNetwork (= 0.61.3)
+  - React-RCTImage (0.61.3):
+    - React-Core/RCTImageHeaders (= 0.61.3)
+    - React-RCTNetwork (= 0.61.3)
+  - React-RCTLinking (0.61.3):
+    - React-Core/RCTLinkingHeaders (= 0.61.3)
+  - React-RCTNetwork (0.61.3):
+    - React-Core/RCTNetworkHeaders (= 0.61.3)
+  - React-RCTSettings (0.61.3):
+    - React-Core/RCTSettingsHeaders (= 0.61.3)
+  - React-RCTText (0.61.3):
+    - React-Core/RCTTextHeaders (= 0.61.3)
+  - React-RCTVibration (0.61.3):
+    - React-Core/RCTVibrationHeaders (= 0.61.3)
+  - ReactCommon/jscallinvoker (0.61.3):
     - DoubleConversion
     - Folly (= 2018.10.22.00)
     - glog
-    - React-cxxreact (= 0.61.5-jitsi.1)
-  - ReactCommon/turbomodule (0.61.5-jitsi.1):
+    - React-cxxreact (= 0.61.3)
+  - ReactCommon/turbomodule (0.61.3):
     - DoubleConversion
     - Folly (= 2018.10.22.00)
     - glog
-    - React-Core (= 0.61.5-jitsi.1)
-    - React-cxxreact (= 0.61.5-jitsi.1)
-    - React-jsi (= 0.61.5-jitsi.1)
-    - ReactCommon/jscallinvoker (= 0.61.5-jitsi.1)
-    - ReactCommon/turbomodule/core (= 0.61.5-jitsi.1)
-    - ReactCommon/turbomodule/samples (= 0.61.5-jitsi.1)
-  - ReactCommon/turbomodule/core (0.61.5-jitsi.1):
+    - React-Core (= 0.61.3)
+    - React-cxxreact (= 0.61.3)
+    - React-jsi (= 0.61.3)
+    - ReactCommon/jscallinvoker (= 0.61.3)
+    - ReactCommon/turbomodule/core (= 0.61.3)
+    - ReactCommon/turbomodule/samples (= 0.61.3)
+  - ReactCommon/turbomodule/core (0.61.3):
     - DoubleConversion
     - Folly (= 2018.10.22.00)
     - glog
-    - React-Core (= 0.61.5-jitsi.1)
-    - React-cxxreact (= 0.61.5-jitsi.1)
-    - React-jsi (= 0.61.5-jitsi.1)
-    - ReactCommon/jscallinvoker (= 0.61.5-jitsi.1)
-  - ReactCommon/turbomodule/samples (0.61.5-jitsi.1):
+    - React-Core (= 0.61.3)
+    - React-cxxreact (= 0.61.3)
+    - React-jsi (= 0.61.3)
+    - ReactCommon/jscallinvoker (= 0.61.3)
+  - ReactCommon/turbomodule/samples (0.61.3):
     - DoubleConversion
     - Folly (= 2018.10.22.00)
     - glog
-    - React-Core (= 0.61.5-jitsi.1)
-    - React-cxxreact (= 0.61.5-jitsi.1)
-    - React-jsi (= 0.61.5-jitsi.1)
-    - ReactCommon/jscallinvoker (= 0.61.5-jitsi.1)
-    - ReactCommon/turbomodule/core (= 0.61.5-jitsi.1)
+    - React-Core (= 0.61.3)
+    - React-cxxreact (= 0.61.3)
+    - React-jsi (= 0.61.3)
+    - ReactCommon/jscallinvoker (= 0.61.3)
+    - ReactCommon/turbomodule/core (= 0.61.3)
   - RNCAsyncStorage (1.3.4):
     - React
   - RNGoogleSignin (3.0.1):
@@ -504,8 +504,8 @@ SPEC CHECKSUMS:
   Crashlytics: 07fb167b1694128c1c9a5a5cc319b0e9c3ca0933
   DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
   Fabric: f988e33c97f08930a413e08123064d2e5f68d655
-  FBLazyVector: 4a5251159a3ed05dc11cc8b74cf937869935814b
-  FBReactNativeSpec: 6fa602a20993212cc9877a81838578ffb0008bc9
+  FBLazyVector: 5bc5b1606fc9a7ac6956de049f6e30901ed31c49
+  FBReactNativeSpec: f7be9bcc5ce259f7c39509f3f4caf59020d11d4c
   Firebase: 02f3281965c075426141a0ce1277e9de6649cab9
   FirebaseAnalytics: 23851fe602c872130a2c5c55040b302120346cc2
   FirebaseAnalyticsInterop: efbe45c8385ec626e29f9525e5ebd38520dfb6c1
@@ -521,38 +521,38 @@ SPEC CHECKSUMS:
   GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23
   nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
   ObjectiveDropboxOfficial: a5afefc83f6467c42c45f2253f583f2ad1ffc701
-  RCTRequired: f63dd90a89a60602acdd44c42e5d2645ca60ab79
-  RCTTypeSafety: 24a3c6d55684046ed550b1d0ef083a9bf71c8bd4
-  React: 71c5a51135f291c3b32c0b558e167b858ae50e84
-  React-Core: e82c03ff91062abf963f35bf99a357154e570285
-  React-CoreModules: e236aeecd18cec37743c8c50562431db5302f668
-  React-cxxreact: 526ec106aa1bf2b3f6aab2a7d528d1d23d5f59c2
-  React-jsi: 4f35c1a2273d193a80c1c3831c808413840c260c
-  React-jsiexecutor: de1c37cf59ae9adcbf2be82eea0e090dc3f3205e
-  React-jsinspector: b76c4e84a7833bb4c90549d59ed53ec299ff912b
+  RCTRequired: a72523286ea3381f97b28d87529c265baad3ad7d
+  RCTTypeSafety: e3cc0537400222250f0be37bd69f4b339d3c0a0f
+  React: 3dc877fc32548b0c7108ca7f301466f4956cbff8
+  React-Core: ca94e2e7d22cdcc266a405c4d2ad5e5675145776
+  React-CoreModules: aa415458b5d7dacd10ac1b324d679f6e17cd8685
+  React-cxxreact: bac5da3d62ee98abd3c1bf7338a7cc6205da7f69
+  React-jsi: 8bcf5836caa8a759c135ab9ef97f3e023a7b94af
+  React-jsiexecutor: ae078e9df9c65bcdcf68f9a17656657932d95528
+  React-jsinspector: a8939cc6909607eb5e8a5ecfff7c6226984e174d
   react-native-background-timer: 0d34748e53a972507c66963490c775321a88f6f2
   react-native-calendar-events: 2fe35a9294af05de0ed819d3a1b5dac048d2c010
   react-native-keep-awake: eba3137546b10003361b37c761f6c429b59814ae
   react-native-netinfo: 8d8db463bcc5db66a8ac5c48a7d86beb3b92f61a
-  react-native-webrtc: 86d841823e66d68cc1f86712db1c2956056bf0c2
+  react-native-webrtc: f6783727706d8bec5fb302b76eda60c33dfe3191
   react-native-webview: 4dbc1d2a4a6b9c5e9e723c62651917aa2b5e579e
-  React-RCTActionSheet: b72ddbfbe15b44ce691d128e4b582f4bb9abb540
-  React-RCTAnimation: cfaefba5024499d336b76ab850e6bd33b232b5e3
-  React-RCTBlob: c427e643bef82999deeab97489ba43298ecfbe24
-  React-RCTImage: 79934bc96f3349da6a75b1d61cad594a932e4097
-  React-RCTLinking: 12b153399567c30efac0b32bb00f9c064587dc26
-  React-RCTNetwork: 603ad75778a54521b7797fd07c67dff562317526
-  React-RCTSettings: 8d45fcf14513582539ea1ddea69391207de7f046
-  React-RCTText: b4c29897c3df0c9f112e29aa3167fa6caf40b690
-  React-RCTVibration: a1bcfcdc0b5a73a1b0829a34cee22bd0e95bacba
-  ReactCommon: 675681aba4fecff5acbc0e440530cc422103c610
+  React-RCTActionSheet: 94671eef55b01a93be735605822ef712d5ea208e
+  React-RCTAnimation: 524ae33e73de9c0fe6501a7a4bda8e01d26499d9
+  React-RCTBlob: 5481c2db702f57207af7e7a9b32d90524b821b72
+  React-RCTImage: b472cc0606f8a7c1ac270d6ccc57123a09439a32
+  React-RCTLinking: 9cfc7bfdfda078489736695ac476de1f265b9f82
+  React-RCTNetwork: 967547e4eeac92e55d41573a82da7fff4003052a
+  React-RCTSettings: 6ab7911172056b5077dacd9240f057eeeb1b121b
+  React-RCTText: b8f895b94aa0e7778fef28d13f3d71eed4a10c3d
+  React-RCTVibration: 262588c97551b0b1c675468cda857466ba5af18f
+  ReactCommon: c2c63d9290b422ca6ad5b3663073a015dd892ae9
   RNCAsyncStorage: 8e31405a9f12fbf42c2bb330e4560bfd79c18323
   RNGoogleSignin: 39336070b35fc4cea6a98cf111e00480317be0ae
   RNSound: c980916b596cc15c8dcd2f6ecd3b13c4881dbe20
   RNSVG: aac12785382e8fd4f28d072fe640612e34914631
   RNWatch: 09738b339eceb66e4d80a2371633ca5fb380fa42
-  Yoga: 7b4209fda2441f99d54dd6cf4c82b094409bb68f
+  Yoga: 02036f6383c0008edb7ef0773a0e6beb6ce82bd1
 
 PODFILE CHECKSUM: 0fdfa45ae809c9460c80be3e0d4bbb822fccc418
 
-COCOAPODS: 1.8.4
+COCOAPODS: 1.8.1

ios/app/src/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>20.0.0</string>
+	<string>19.5.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

ios/app/watchos/app/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>20.0.0</string>
+	<string>19.5.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>UISupportedInterfaceOrientations</key>

ios/app/watchos/extension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>20.0.0</string>
+	<string>19.5.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CLKComplicationPrincipalClass</key>

ios/sdk/src/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6.1</string>
+	<string>2.5.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

lang/languages-bg.json

@@ -14,7 +14,6 @@
     "fr": "Френски",
     "frCA": "Френски (Канада)",
     "hr": "Хърватски",
-    "hu": "Унгарски",
     "hy": "Арменски",
     "it": "Италиански",
     "ja": "Японски",

lang/languages-ca.json

@@ -1,32 +1,27 @@
 {
-    "en": "Anglès",
-    "af": "Afrikaans",
-    "bg": "Búlgar",
-    "ca": "Català",
-    "cs": "Txec",
-    "de": "Alemany",
-    "el": "Grec",
-    "enGB": "Anglès (Regne Unit)",
-    "eo": "Esperanto",
-    "es": "Espanyol",
-    "esUS": "Espanyol (Amèrica llatina)",
-    "fi": "Finès",
-    "fr": "Francès",
-    "frCA": "Francès (Canadenc)",
-    "hr": "Croat",
-    "hu": "",
-    "hy": "Armeni",
-    "it": "Italià",
-    "ja": "Japonès",
-    "ko": "Coreà",
-    "nl": "Neerlandès",
-    "oc": "Occità",
-    "pl": "Polonès",
-    "ptBR": "Portuguès (Brasil)",
-    "ru": "Rus",
-    "sv": "Suec",
-    "tr": "Turc",
-    "vi": "Vietnamita",
-    "zhCN": "Xinès (Xina)",
-    "zhTW": "Coreà"
+    "en": "",
+    "af": "",
+    "az": "",
+    "bg": "",
+    "cs": "",
+    "de": "",
+    "el": "",
+    "eo": "",
+    "es": "",
+    "fr": "",
+    "hy": "",
+    "it": "",
+    "ja": "",
+    "ko": "",
+    "nb": "",
+    "oc": "",
+    "pl": "",
+    "ptBR": "",
+    "ru": "",
+    "sk": "",
+    "sl": "",
+    "sv": "",
+    "tr": "",
+    "vi": "",
+    "zhCN": ""
 }

lang/languages-es.json

@@ -1,32 +1,27 @@
 {
     "en": "Inglés",
     "af": "Africano",
+    "az": "Azerbaijani",
     "bg": "Búlgaro",
-    "ca": "Catalán",
-    "cs": "Checo",
+    "cs": "Czech",
     "de": "Alemán",
     "el": "Griego",
-    "enGB": "Inglés (Reino Unido)",
     "eo": "Esperanto",
     "es": "Español",
-    "esUS": "Español (América Latina)",
-    "fi": "Finlandés",
     "fr": "Francés",
-    "frCA": "Franco (Canadiense)",
-    "hr": "Croata",
-    "hu": "Húngaro",
     "hy": "Armenio",
     "it": "Italiano",
     "ja": "Jopones",
     "ko": "Coreano",
-    "nl": "Holandés",
+    "nb": "Noruego (bokmal)",
     "oc": "Occitano",
     "pl": "Polaco",
     "ptBR": "Portugués (Brasil)",
     "ru": "Ruso",
+    "sk": "Eslovaco",
+    "sl": "Esloveno",
     "sv": "Sueco",
     "tr": "Turco",
     "vi": "Vietnamita",
-    "zhCN": "Chino (China)",
-    "zhTW": "Chino (Taiwan)\"msgstr \""
+    "zhCN": "Chino (China)"
 }