Moves interface_config and logging_config to /etc folder.

Samsung devices (of course) seem to stick with the earpiece if we first select
Bluetooth but then set speaker to false. Reverse the order to make everyone
happy.

This only applies to the generic and legacy handlers.

android/gradle.properties

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

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

@@ -18,6 +18,7 @@ package org.jitsi.meet.sdk;
 
 import android.content.Context;
 import android.os.Build;
+import android.telecom.CallAudioState;
 import androidx.annotation.RequiresApi;
 
 import java.util.HashSet;
@@ -52,20 +53,20 @@ class AudioDeviceHandlerConnectionService implements
      */
     private static int audioDeviceToRouteInt(String audioDevice) {
         if (audioDevice == null) {
-            return android.telecom.CallAudioState.ROUTE_EARPIECE;
+            return CallAudioState.ROUTE_EARPIECE;
         }
         switch (audioDevice) {
             case AudioModeModule.DEVICE_BLUETOOTH:
-                return android.telecom.CallAudioState.ROUTE_BLUETOOTH;
+                return CallAudioState.ROUTE_BLUETOOTH;
             case AudioModeModule.DEVICE_EARPIECE:
-                return android.telecom.CallAudioState.ROUTE_EARPIECE;
+                return CallAudioState.ROUTE_EARPIECE;
             case AudioModeModule.DEVICE_HEADPHONES:
-                return android.telecom.CallAudioState.ROUTE_WIRED_HEADSET;
+                return CallAudioState.ROUTE_WIRED_HEADSET;
             case AudioModeModule.DEVICE_SPEAKER:
-                return android.telecom.CallAudioState.ROUTE_SPEAKER;
+                return CallAudioState.ROUTE_SPEAKER;
             default:
                 JitsiMeetLogger.e(TAG + " Unsupported device name: " + audioDevice);
-                return android.telecom.CallAudioState.ROUTE_EARPIECE;
+                return CallAudioState.ROUTE_EARPIECE;
         }
     }
 
@@ -78,20 +79,16 @@ class AudioDeviceHandlerConnectionService implements
      */
     private static Set<String> routesToDeviceNames(int supportedRouteMask) {
         Set<String> devices = new HashSet<>();
-        if ((supportedRouteMask & android.telecom.CallAudioState.ROUTE_EARPIECE)
-                == android.telecom.CallAudioState.ROUTE_EARPIECE) {
+        if ((supportedRouteMask & CallAudioState.ROUTE_EARPIECE) == CallAudioState.ROUTE_EARPIECE) {
             devices.add(AudioModeModule.DEVICE_EARPIECE);
         }
-        if ((supportedRouteMask & android.telecom.CallAudioState.ROUTE_BLUETOOTH)
-                == android.telecom.CallAudioState.ROUTE_BLUETOOTH) {
+        if ((supportedRouteMask & CallAudioState.ROUTE_BLUETOOTH) == CallAudioState.ROUTE_BLUETOOTH) {
             devices.add(AudioModeModule.DEVICE_BLUETOOTH);
         }
-        if ((supportedRouteMask & android.telecom.CallAudioState.ROUTE_SPEAKER)
-                == android.telecom.CallAudioState.ROUTE_SPEAKER) {
+        if ((supportedRouteMask & CallAudioState.ROUTE_SPEAKER) == CallAudioState.ROUTE_SPEAKER) {
             devices.add(AudioModeModule.DEVICE_SPEAKER);
         }
-        if ((supportedRouteMask & android.telecom.CallAudioState.ROUTE_WIRED_HEADSET)
-                == android.telecom.CallAudioState.ROUTE_WIRED_HEADSET) {
+        if ((supportedRouteMask & CallAudioState.ROUTE_WIRED_HEADSET) == CallAudioState.ROUTE_WIRED_HEADSET) {
             devices.add(AudioModeModule.DEVICE_HEADPHONES);
         }
         return devices;
@@ -109,13 +106,13 @@ class AudioDeviceHandlerConnectionService implements
     }
 
     @Override
-    public void onCallAudioStateChange(final android.telecom.CallAudioState callAudioState) {
+    public void onCallAudioStateChange(final CallAudioState state) {
         module.runInAudioThread(new Runnable() {
             @Override
             public void run() {
                 boolean audioRouteChanged
-                    = audioDeviceToRouteInt(module.getSelectedDevice()) != callAudioState.getRoute();
-                int newSupportedRoutes = callAudioState.getSupportedRouteMask();
+                    = audioDeviceToRouteInt(module.getSelectedDevice()) != state.getRoute();
+                int newSupportedRoutes = state.getSupportedRouteMask();
                 boolean audioDevicesChanged = supportedRouteMask != newSupportedRoutes;
                 if (audioDevicesChanged) {
                     supportedRouteMask = newSupportedRoutes;
@@ -140,6 +137,8 @@ class AudioDeviceHandlerConnectionService implements
         RNConnectionService rcs = ReactInstanceManagerHolder.getNativeModule(RNConnectionService.class);
         if (rcs != null) {
             rcs.setCallAudioStateListener(this);
+        } else {
+            JitsiMeetLogger.w(TAG + " Couldn't set call audio state listener, module is null");
         }
     }
 
@@ -148,6 +147,8 @@ class AudioDeviceHandlerConnectionService implements
         RNConnectionService rcs = ReactInstanceManagerHolder.getNativeModule(RNConnectionService.class);
         if (rcs != null) {
             rcs.setCallAudioStateListener(null);
+        } else {
+            JitsiMeetLogger.w(TAG + " Couldn't set call audio state listener, module is null");
         }
     }
 

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

@@ -198,11 +198,11 @@ class AudioDeviceHandlerGeneric implements
 
     @Override
     public void setAudioRoute(String device) {
-        // Turn bluetooth on / off
-        setBluetoothAudioRoute(device.equals(AudioModeModule.DEVICE_BLUETOOTH));
-
         // Turn speaker on / off
         audioManager.setSpeakerphoneOn(device.equals(AudioModeModule.DEVICE_SPEAKER));
+
+        // Turn bluetooth on / off
+        setBluetoothAudioRoute(device.equals(AudioModeModule.DEVICE_BLUETOOTH));
     }
 
     @Override

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

@@ -196,11 +196,11 @@ class AudioDeviceHandlerLegacy implements
 
     @Override
     public void setAudioRoute(String device) {
-        // Turn bluetooth on / off
-        setBluetoothAudioRoute(device.equals(AudioModeModule.DEVICE_BLUETOOTH));
-
         // Turn speaker on / off
         audioManager.setSpeakerphoneOn(device.equals(AudioModeModule.DEVICE_SPEAKER));
+
+        // Turn bluetooth on / off
+        setBluetoothAudioRoute(device.equals(AudioModeModule.DEVICE_BLUETOOTH));
     }
 
     @Override

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

@@ -136,8 +136,6 @@ class AudioModeModule extends ReactContextBaseJavaModule {
      */
     public AudioModeModule(ReactApplicationContext reactContext) {
         super(reactContext);
-
-        setAudioDeviceHandler();
     }
 
     /**
@@ -193,6 +191,16 @@ class AudioModeModule extends ReactContextBaseJavaModule {
         return NAME;
     }
 
+    /**
+     * Initializes the audio device handler module. This function is called *after* all Catalyst
+     * modules have been created, and that's why we use it, because {@link AudioDeviceHandlerConnectionService}
+     * needs access to another Catalyst module, so doing this in the constructor would be too early.
+     */
+    @Override
+    public void initialize() {
+        setAudioDeviceHandler();
+    }
+
     private void setAudioDeviceHandler() {
         if (audioDeviceHandler != null) {
             audioDeviceHandler.stop();

css/_promotional-footer.scss

@@ -0,0 +1 @@
+/** Insert custom CSS for any additional content in the promotional footer **/

css/_variables.scss

@@ -220,4 +220,39 @@ $welcomePageButtonLineHeight: 35px;
  * Deep-linking page variables.
  */
 $deepLinkingMobileLogoHeight: 40px;
+
 $deepLinkingMobileHeaderBackground: #f1f2f5;
+
+$deepLinkingMobileLinkColor: inherit;
+$deepLinkingMobileTextFontSize: inherit;
+$deepLinkingMobileTextLineHeight: inherit;
+
+$deepLinkingDialInConferenceIdMargin: 10px 0 10px 0;
+$deepLinkingDialInConferenceIdPadding: inherit;
+$deepLinkingDialInConferenceIdBackgroundColor: inherit;
+$deepLinkingDialInConferenceIdBorderRadius: inherit;
+
+$deepLinkingDialInConferenceNameFontSize: inherit;
+$deepLinkingDialInConferenceNameLineHeight: inherit;
+$deepLinkingDialInConferenceNameMarginBottom: none;
+$deepLinkingDialInConferenceNameFontWeight: inherit;
+
+$deepLinkingDialInConferenceDescriptionFontSize: 0.8em;
+$deepLinkingDialInConferenceDescriptionLineHeight: inherit;
+$deepLinkingDialInConferenceDescriptionMarginBottom: none;
+
+$deepLinkingDialInConferencePinFontSize: inherit;
+$deepLinkingDialInConferencePinLineHeight: inherit;
+
+$depLinkingMobileHrefLineHeight: 2.2857142857142856em;
+$deepLinkingMobileHrefFontWeight: bolder;
+$deepLinkingMobileHrefFontSize: inherit;
+
+$deepLinkingMobileButtonHeight: 2.2857142857142856em;
+$deepLinkingMobileButtonLineHeight: 2.2857142857142856em;
+$deepLinkingMobileButtonMargin: 18px auto 10px;
+$deepLinkingMobileButtonWidth: auto;
+$deepLinkingMobileButtonFontWeight: bold;
+$deepLinkingMobileButtonFontSize: inherit;
+
+$primaryDeepLinkingMobileButtonBorderRadius: inherit;

css/deep-linking/_mobile.scss

@@ -19,7 +19,8 @@
     }
 
     a {
-        text-decoration: none
+        text-decoration: none;
+        color: $deepLinkingMobileLinkColor;
     }
 
     &__body {
@@ -41,6 +42,8 @@
 
     &__text {
         font-weight: bolder;
+        font-size: $deepLinkingMobileTextFontSize;
+        line-height: $deepLinkingMobileTextLineHeight;
         padding: 10px 10px 0px 10px;
     }
 
@@ -65,11 +68,28 @@
         }
 
         .dial-in-conference-id {
-            margin: 10px 0 10px 0;
+            margin: $deepLinkingDialInConferenceIdMargin;
+            padding: $deepLinkingDialInConferenceIdPadding;
+            background-color: $deepLinkingDialInConferenceIdBackgroundColor;
+            border-radius: $deepLinkingDialInConferenceIdBorderRadius;
+        }
+
+        .dial-in-conference-name {
+            font-size: $deepLinkingDialInConferenceNameFontSize;
+            line-height: $deepLinkingDialInConferenceNameLineHeight;
+            margin-bottom: $deepLinkingDialInConferenceNameMarginBottom;
+            font-weight: $deepLinkingDialInConferenceNameFontWeight;
         }
 
         .dial-in-conference-description {
-            font-size: 0.8em;
+            font-size: $deepLinkingDialInConferenceDescriptionFontSize;
+            line-height: $deepLinkingDialInConferenceDescriptionLineHeight;
+            margin-bottom: $deepLinkingDialInConferenceDescriptionMarginBottom;
+        }
+
+        .dial-in-conference-pin {
+            font-size: $deepLinkingDialInConferencePinFontSize;
+            line-height: $deepLinkingDialInConferencePinLineHeight;
         }
 
         .toll-free-list {
@@ -88,25 +108,27 @@
 
     &__href {
         height: 2.2857142857142856em;
-        line-height: 2.2857142857142856em;
+        line-height: $depLinkingMobileHrefLineHeight;
         margin: 18px auto 20px;
         max-width: 300px;
         width: auto;
-        font-weight: bolder;
+        font-weight: $deepLinkingMobileHrefFontWeight;
+        font-size: $deepLinkingMobileHrefFontSize;
     }
 
     &__button {
         border: 0;
-        height: 2.2857142857142856em;
-        line-height: 2.2857142857142856em;
-        margin: 18px auto 10px;
+        height: $deepLinkingMobileButtonHeight;
+        line-height: $deepLinkingMobileButtonLineHeight;
+        margin: $deepLinkingMobileButtonMargin;
         padding: 0px 10px 0px 10px;
         max-width: 300px;
-        width: auto;
+        width: $deepLinkingMobileButtonWidth;
         @include border-radius(3px);
         background-color: $unsupportedBrowserButtonBgColor;
         color: #505F79;
-        font-weight: bold;
+        font-weight: $deepLinkingMobileButtonFontWeight;
+        font-size: $deepLinkingMobileButtonFontSize;
 
         &:active {
             background-color: $unsupportedBrowserButtonBgColor;
@@ -115,7 +137,7 @@
         &_primary {
             background-color: $primaryUnsupportedBrowserButtonBgColor;
             color: #FFFFFF;
-
+            border-radius: $primaryDeepLinkingMobileButtonBorderRadius;
             &:active {
                 background-color: $primaryUnsupportedBrowserButtonBgColor;
             }

css/main.scss

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

debian/control

@@ -21,7 +21,7 @@ Description: WebRTC JavaScript video conferences
 
 Package: jitsi-meet-web-config
 Architecture: all
-Depends: openssl, openjdk-8-jre-headless | nginx | nginx-extras | apache2
+Depends: ${misc:Depends}, openssl, 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.
@@ -36,7 +36,8 @@ Description: Configuration for web serving of Jitsi Meet
 
 Package: jitsi-meet-prosody
 Architecture: all
-Depends: openssl, prosody | prosody-trunk | prosody-0.11
+Depends: ${misc:Depends}, openssl, prosody | prosody-trunk | prosody-0.11
+Replaces: jitsi-meet-tokens
 Description: Prosody configuration for Jitsi Meet
  Jitsi Meet is a WebRTC JavaScript application that uses Jitsi
  Videobridge to provide high quality, scalable video conferences.

debian/jitsi-meet-prosody.docs

@@ -1,2 +1 @@
-doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example
 doc/debian/jitsi-meet-prosody/README

debian/jitsi-meet-prosody.install

@@ -0,0 +1,2 @@
+doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example   /usr/share/jitsi-meet-prosody/
+resources/prosody-plugins/                                  /usr/share/jitsi-meet/

debian/jitsi-meet-prosody.postinst

@@ -93,7 +93,7 @@ case "$1" in
             PROSODY_CONFIG_PRESENT="false"
             mkdir -p /etc/prosody/conf.avail/
             mkdir -p /etc/prosody/conf.d/
-            cp /usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example $PROSODY_HOST_CONFIG
+            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

debian/jitsi-meet-tokens.install

@@ -1 +0,0 @@
-resources/prosody-plugins/     /usr/share/jitsi-meet/

debian/jitsi-meet-web-config.docs

@@ -1,4 +1 @@
-doc/debian/jitsi-meet/jitsi-meet.example
-doc/debian/jitsi-meet/jitsi-meet.example-apache
 doc/debian/jitsi-meet/README
-config.js

debian/jitsi-meet-web-config.install

@@ -0,0 +1,5 @@
+doc/debian/jitsi-meet/jitsi-meet.example        /usr/share/jitsi-meet-web-config/
+doc/debian/jitsi-meet/jitsi-meet.example-apache /usr/share/jitsi-meet-web-config/
+config.js                                       /usr/share/jitsi-meet-web-config/
+interface_config.js                             /etc/jitsi/meet/
+logging_config.js                               /etc/jitsi/meet/

debian/jitsi-meet-web-config.postinst

@@ -42,12 +42,6 @@ case "$1" in
             rm -f /etc/jitsi/meet/$JVB_HOSTNAME_OLD-config.js
         fi
 
-        JVB_SERVE="false"
-        db_get jitsi-meet/jvb-serve
-        if [ -n "$RET" ] && [ "$RET" = "true" ] ; then
-            JVB_SERVE="true"
-        fi
-
         # stores the hostname so we will reuse it later, like in purge
         db_set jitsi-meet/jvb-hostname $JVB_HOSTNAME
 
@@ -98,77 +92,11 @@ case "$1" in
         # jitsi meet
         JITSI_MEET_CONFIG="/etc/jitsi/meet/$JVB_HOSTNAME-config.js"
         if [ ! -f $JITSI_MEET_CONFIG ] ; then
-            cp /usr/share/doc/jitsi-meet-web-config/config.js $JITSI_MEET_CONFIG
+            cp /usr/share/jitsi-meet-web-config/config.js $JITSI_MEET_CONFIG
             sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" $JITSI_MEET_CONFIG
         fi
 
-        # 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 [[ -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
-        elif [[ "$FORCE_NGINX" = "true" && ( -z "$JVB_HOSTNAME_OLD" || "$RECONFIGURING" = "true" ) ]] ; then
+        if [[ "$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
@@ -177,7 +105,7 @@ case "$1" in
 
             # nginx conf
             if [ ! -f /etc/nginx/sites-available/$JVB_HOSTNAME.conf ] ; then
-                cp /usr/share/doc/jitsi-meet-web-config/jitsi-meet.example /etc/nginx/sites-available/$JVB_HOSTNAME.conf
+                cp /usr/share/jitsi-meet-web-config/jitsi-meet.example /etc/nginx/sites-available/$JVB_HOSTNAME.conf
                 if [ ! -f /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf ] ; then
                     ln -s /etc/nginx/sites-available/$JVB_HOSTNAME.conf /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf
                 fi
@@ -208,7 +136,7 @@ case "$1" in
             if [ ! -f /etc/apache2/sites-available/$JVB_HOSTNAME.conf ] ; then
                 # when creating new config, make sure all needed modules are enabled
                 a2enmod rewrite ssl headers proxy_http include
-                cp /usr/share/doc/jitsi-meet-web-config/jitsi-meet.example-apache /etc/apache2/sites-available/$JVB_HOSTNAME.conf
+                cp /usr/share/jitsi-meet-web-config/jitsi-meet.example-apache /etc/apache2/sites-available/$JVB_HOSTNAME.conf
                 a2ensite $JVB_HOSTNAME.conf
                 sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" /etc/apache2/sites-available/$JVB_HOSTNAME.conf
             fi

debian/jitsi-meet-web-config.postrm

@@ -40,8 +40,6 @@ 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,12 +26,6 @@ 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:

debian/jitsi-meet-web.install

@@ -1,5 +1,3 @@
-interface_config.js		/usr/share/jitsi-meet/
-logging_config.js		/usr/share/jitsi-meet/
 *.json					/usr/share/jitsi-meet/
 *.html					/usr/share/jitsi-meet/
 *.ico					/usr/share/jitsi-meet/

debian/rules

@@ -14,7 +14,7 @@ override_dh_auto_build:
 
 override_dh_install: $(LANGUAGES)
 	dh_installdirs
-	dh_install -X/config.js -X/package.json
+	dh_install
 
 $(LANGUAGES):
 	LOCALE=$$(echo $@ | cut -c1-2) ; \

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

@@ -1,5 +1,4 @@
--- Plugins path gets uncommented during jitsi-meet-tokens package install - that's where token plugin is located
---plugin_paths = { "/usr/share/jitsi-meet/prosody-plugins/" }
+plugin_paths = { "/usr/share/jitsi-meet/prosody-plugins/" }
 
 VirtualHost "jitmeet.example.com"
         -- enabled = false -- Remove this line to enable this host

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

@@ -26,6 +26,12 @@ server {
     location = /config.js {
         alias /etc/jitsi/meet/jitsi-meet.example.com-config.js;
     }
+    location = /interface_config.js {
+        alias /etc/jitsi/meet/interface_config.js;
+    }
+    location = /logging_config.js {
+        alias /etc/jitsi/meet/logging_config.js;
+    }
 
     location = /external_api.js {
         alias /usr/share/jitsi-meet/libs/external_api.min.js;

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

@@ -35,6 +35,14 @@
   <Location /config.js>
     Require all granted
   </Location>
+  Alias "/interface_config.js" "/etc/jitsi/meet/interface_config.js"
+  <Location /config.js>
+    Require all granted
+  </Location>
+  Alias "/logging_config.js" "/etc/jitsi/meet/logging_config.js"
+  <Location /config.js>
+    Require all granted
+  </Location>
 
   Alias "/external_api.js" "/usr/share/jitsi-meet/libs/external_api.min.js"
   <Location /external_api.js>

ios/Podfile

@@ -82,6 +82,7 @@ post_install do |installer|
     target.build_configurations.each do |config|
       config.build_settings['ENABLE_BITCODE'] = 'YES'
       config.build_settings['SUPPORTS_MACCATALYST'] = 'NO'
+      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '10.0'
     end
   end
 end

ios/Podfile.lock

@@ -553,6 +553,6 @@ SPEC CHECKSUMS:
   RNWatch: 09738b339eceb66e4d80a2371633ca5fb380fa42
   Yoga: 02036f6383c0008edb7ef0773a0e6beb6ce82bd1
 
-PODFILE CHECKSUM: cb84b325b724c6ef7c8b24aa52ca7b6f681a095c
+PODFILE CHECKSUM: 63c90b1d33cd96709fb72bad6be440ae9c3deecb
 
 COCOAPODS: 1.8.1

ios/app/src/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>19.4.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>19.4.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>19.4.0</string>
+	<string>19.5.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CLKComplicationPrincipalClass</key>

ios/jitsi-meet.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -2,7 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>BuildSystemType</key>
-	<string>Original</string>
+	<key>PreviewsEnabled</key>
+	<false/>
 </dict>
 </plist>

ios/sdk/sdk.xcodeproj/project.pbxproj

@@ -627,6 +627,7 @@
 			baseConfigurationReference = 98E09B5C73D9036B4ED252FC /* Pods-JitsiMeet.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
@@ -658,6 +659,7 @@
 			baseConfigurationReference = 9C77CA3CC919B081F1A52982 /* Pods-JitsiMeet.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
+				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";

ios/sdk/sdk.xcodeproj/xcshareddata/xcschemes/JitsiMeet.xcscheme

@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:sdk.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -81,7 +77,7 @@
             ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
             <ActionContent
                title = "Run Script"
-               scriptText = "exec &gt; /tmp/${PROJECT_NAME}_archive.log 2&gt;&amp;1&#10;&#10;UNIVERSAL_OUTPUTFOLDER=${BUILD_DIR}/${CONFIGURATION}-universal&#10;&#10;if [ &quot;true&quot; == ${ALREADYINVOKED:-false} ]&#10;then&#10;echo &quot;RECURSION: Detected, stopping&quot;&#10;else&#10;export ALREADYINVOKED=&quot;true&quot;&#10;&#10;# make sure the output directory exists&#10;mkdir -p &quot;${UNIVERSAL_OUTPUTFOLDER}&quot;&#10;&#10;echo &quot;Building for iPhoneSimulator&quot;&#10;xcodebuild -workspace &quot;${WORKSPACE_PATH}&quot; -scheme &quot;${TARGET_NAME}&quot; -configuration ${CONFIGURATION} -sdk iphonesimulator -destination &apos;platform=iOS Simulator,name=iPhone 8&apos; ONLY_ACTIVE_ARCH=NO ARCHS=&apos;i386 x86_64&apos; BUILD_DIR=&quot;${BUILD_DIR}&quot; BUILD_ROOT=&quot;${BUILD_ROOT}&quot; ENABLE_BITCODE=YES OTHER_CFLAGS=&quot;-fembed-bitcode&quot; BITCODE_GENERATION_MODE=bitcode clean build&#10;&#10;# Step 1. Copy the framework structure (from iphoneos build) to the universal folder&#10;echo &quot;Copying to output folder&quot;&#10;cp -R &quot;${BUILD_DIR}/${CONFIGURATION}-iphoneos/${FULL_PRODUCT_NAME}&quot; &quot;${UNIVERSAL_OUTPUTFOLDER}/&quot;&#10;&#10;# Step 2. Copy Swift modules from iphonesimulator build (if it exists) to the copied framework directory&#10;SIMULATOR_SWIFT_MODULES_DIR=&quot;${BUILD_DIR}/${CONFIGURATION}-iphonesimulator/${TARGET_NAME}.framework/Modules/${TARGET_NAME}.swiftmodule/.&quot;&#10;if [ -d &quot;${SIMULATOR_SWIFT_MODULES_DIR}&quot; ]; then&#10;cp -R &quot;${SIMULATOR_SWIFT_MODULES_DIR}&quot; &quot;${UNIVERSAL_OUTPUTFOLDER}/${TARGET_NAME}.framework/Modules/${TARGET_NAME}.swiftmodule&quot;&#10;fi&#10;&#10;# Step 3. Create universal binary file using lipo and place the combined executable in the copied framework directory&#10;echo &quot;Combining executables&quot;&#10;lipo -create -output &quot;${UNIVERSAL_OUTPUTFOLDER}/${EXECUTABLE_PATH}&quot; &quot;${BUILD_DIR}/${CONFIGURATION}-iphonesimulator/${EXECUTABLE_PATH}&quot; &quot;${BUILD_DIR}/${CONFIGURATION}-iphoneos/${EXECUTABLE_PATH}&quot;&#10;&#10;# Step 4. Create universal binaries for embedded frameworks&#10;#for SUB_FRAMEWORK in $( ls &quot;${UNIVERSAL_OUTPUTFOLDER}/${TARGET_NAME}.framework/Frameworks&quot; ); do&#10;#BINARY_NAME=&quot;${SUB_FRAMEWORK%.*}&quot;&#10;#lipo -create -output &quot;${UNIVERSAL_OUTPUTFOLDER}/${TARGET_NAME}.framework/Frameworks/${SUB_FRAMEWORK}/${BINARY_NAME}&quot; &quot;${BUILD_DIR}/${CONFIGURATION}-iphonesimulator/${SUB_FRAMEWORK}/${BINARY_NAME}&quot; &quot;${ARCHIVE_PRODUCTS_PATH}${INSTALL_PATH}/${TARGET_NAME}.framework/Frameworks/${SUB_FRAMEWORK}/${BINARY_NAME}&quot;&#10;#done&#10;&#10;# Step 5. Convenience step to copy the framework to the project&apos;s directory&#10;echo &quot;Copying to project dir&quot;&#10;yes | cp -Rf &quot;${UNIVERSAL_OUTPUTFOLDER}/${FULL_PRODUCT_NAME}&quot; &quot;${PROJECT_DIR}&quot;&#10;&#10;fi&#10;">
+               scriptText = "exec &gt; /tmp/${PROJECT_NAME}_archive.log 2&gt;&amp;1&#10;&#10;UNIVERSAL_OUTPUTFOLDER=${BUILD_DIR}/${CONFIGURATION}-universal&#10;&#10;if [ &quot;true&quot; == ${ALREADYINVOKED:-false} ]&#10;then&#10;echo &quot;RECURSION: Detected, stopping&quot;&#10;else&#10;export ALREADYINVOKED=&quot;true&quot;&#10;&#10;# make sure the output directory exists&#10;mkdir -p &quot;${UNIVERSAL_OUTPUTFOLDER}&quot;&#10;&#10;echo &quot;Building for iPhoneSimulator&quot;&#10;xcodebuild -workspace &quot;${WORKSPACE_PATH}&quot; -scheme &quot;${TARGET_NAME}&quot; -configuration ${CONFIGURATION} -sdk iphonesimulator -destination &apos;platform=iOS Simulator,name=iPhone 8&apos; ONLY_ACTIVE_ARCH=NO ARCHS=&apos;i386 x86_64&apos; BUILD_DIR=&quot;${BUILD_DIR}&quot; BUILD_ROOT=&quot;${BUILD_ROOT}&quot; ENABLE_BITCODE=YES OTHER_CFLAGS=&quot;-fembed-bitcode&quot; BITCODE_GENERATION_MODE=bitcode build&#10;&#10;# Step 1. Copy the framework structure (from iphoneos build) to the universal folder&#10;echo &quot;Copying to output folder&quot;&#10;cp -R &quot;${BUILD_DIR}/${CONFIGURATION}-iphoneos/${FULL_PRODUCT_NAME}&quot; &quot;${UNIVERSAL_OUTPUTFOLDER}/&quot;&#10;&#10;# Step 2. Copy Swift modules from iphonesimulator build (if it exists) to the copied framework directory&#10;SIMULATOR_SWIFT_MODULES_DIR=&quot;${BUILD_DIR}/${CONFIGURATION}-iphonesimulator/${TARGET_NAME}.framework/Modules/${TARGET_NAME}.swiftmodule/.&quot;&#10;if [ -d &quot;${SIMULATOR_SWIFT_MODULES_DIR}&quot; ]; then&#10;cp -R &quot;${SIMULATOR_SWIFT_MODULES_DIR}&quot; &quot;${UNIVERSAL_OUTPUTFOLDER}/${TARGET_NAME}.framework/Modules/${TARGET_NAME}.swiftmodule&quot;&#10;fi&#10;&#10;# Step 3. Create universal binary file using lipo and place the combined executable in the copied framework directory&#10;echo &quot;Combining executables&quot;&#10;lipo -create -output &quot;${UNIVERSAL_OUTPUTFOLDER}/${EXECUTABLE_PATH}&quot; &quot;${BUILD_DIR}/${CONFIGURATION}-iphonesimulator/${EXECUTABLE_PATH}&quot; &quot;${BUILD_DIR}/${CONFIGURATION}-iphoneos/${EXECUTABLE_PATH}&quot;&#10;&#10;# Step 4. Create universal binaries for embedded frameworks&#10;#for SUB_FRAMEWORK in $( ls &quot;${UNIVERSAL_OUTPUTFOLDER}/${TARGET_NAME}.framework/Frameworks&quot; ); do&#10;#BINARY_NAME=&quot;${SUB_FRAMEWORK%.*}&quot;&#10;#lipo -create -output &quot;${UNIVERSAL_OUTPUTFOLDER}/${TARGET_NAME}.framework/Frameworks/${SUB_FRAMEWORK}/${BINARY_NAME}&quot; &quot;${BUILD_DIR}/${CONFIGURATION}-iphonesimulator/${SUB_FRAMEWORK}/${BINARY_NAME}&quot; &quot;${ARCHIVE_PRODUCTS_PATH}${INSTALL_PATH}/${TARGET_NAME}.framework/Frameworks/${SUB_FRAMEWORK}/${BINARY_NAME}&quot;&#10;#done&#10;&#10;# Step 5. Convenience step to copy the framework to the project&apos;s directory&#10;echo &quot;Copying to project dir&quot;&#10;yes | cp -Rf &quot;${UNIVERSAL_OUTPUTFOLDER}/${FULL_PRODUCT_NAME}&quot; &quot;${PROJECT_DIR}&quot;&#10;&#10;fi&#10;">
                <EnvironmentBuildable>
                   <BuildableReference
                      BuildableIdentifier = "primary"

ios/sdk/src/Info.plist

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

package-lock.json

@@ -10931,8 +10931,8 @@
       }
     },
     "lib-jitsi-meet": {
-      "version": "github:jitsi/lib-jitsi-meet#5521a40aa85cb6f128f8a6dad9b72a5646132484",
-      "from": "github:jitsi/lib-jitsi-meet#5521a40aa85cb6f128f8a6dad9b72a5646132484",
+      "version": "github:jitsi/lib-jitsi-meet#1de69abe22aa632c9a4255ee9f6ae48dab9be756",
+      "from": "github:jitsi/lib-jitsi-meet#1de69abe22aa632c9a4255ee9f6ae48dab9be756",
       "requires": {
         "@jitsi/sdp-interop": "0.1.14",
         "@jitsi/sdp-simulcast": "0.2.2",
@@ -17595,6 +17595,12 @@
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
       "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
     },
+    "unorm": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz",
+      "integrity": "sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==",
+      "dev": true
+    },
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",

package.json

@@ -57,7 +57,7 @@
     "js-utils": "github:jitsi/js-utils#192b1c996e8c05530eb1f19e82a31069c3021e31",
     "jsrsasign": "8.0.12",
     "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#5521a40aa85cb6f128f8a6dad9b72a5646132484",
+    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#1de69abe22aa632c9a4255ee9f6ae48dab9be756",
     "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
     "lodash": "4.17.13",
     "moment": "2.19.4",
@@ -126,6 +126,7 @@
     "precommit-hook": "3.0.0",
     "string-replace-loader": "2.1.1",
     "style-loader": "0.19.0",
+    "unorm": "1.6.0",
     "webpack": "4.27.1",
     "webpack-bundle-analyzer": "3.4.1",
     "webpack-cli": "3.1.2",

react/features/base/config/configWhitelist.js

@@ -126,6 +126,7 @@ export default [
     'startSilent',
     'startScreenSharing',
     'startVideoMuted',
+    'startWithAudioMuted',
     'startWithVideoMuted',
     'subject',
     'testing',

react/features/base/config/index.js

@@ -1,5 +1,6 @@
 export * from './actions';
 export * from './actionTypes';
+export { default as CONFIG_WHITELIST } from './configWhitelist';
 export * from './functions';
 
 import './middleware';

react/features/base/settings/functions.any.js

@@ -1,6 +1,5 @@
 // @flow
-
-import { parseURLParams } from '../config';
+import { CONFIG_WHITELIST, parseURLParams } from '../config';
 import { toState } from '../redux';
 
 import { DEFAULT_SERVER_URL } from './constants';
@@ -55,12 +54,14 @@ export function getPropertyValue(
 
     // urlParams
     if (sources.urlParams) {
-        const urlParams
-            = parseURLParams(state['features/base/connection'].locationURL);
-        const value = urlParams[`config.${propertyName}`];
+        if (CONFIG_WHITELIST.indexOf(propertyName) !== -1) {
+            const urlParams
+                = parseURLParams(state['features/base/connection'].locationURL);
+            const value = urlParams[`config.${propertyName}`];
 
-        if (typeof value !== 'undefined') {
-            return value;
+            if (typeof value !== 'undefined') {
+                return value;
+            }
         }
     }
 

react/features/base/settings/middleware.js

@@ -1,5 +1,6 @@
 // @flow
 
+import { APP_WILL_MOUNT } from '../app';
 import { setAudioOnly } from '../audio-only';
 import { getLocalParticipant, participantUpdated } from '../participants';
 import { MiddlewareRegistry } from '../redux';
@@ -19,15 +20,34 @@ MiddlewareRegistry.register(store => next => action => {
     const result = next(action);
 
     switch (action.type) {
+    case APP_WILL_MOUNT:
+        _initializeCallIntegration(store);
+        break;
     case SETTINGS_UPDATED:
         _maybeHandleCallIntegrationChange(action);
         _maybeSetAudioOnly(store, action);
         _updateLocalParticipant(store, action);
+        break;
     }
 
     return result;
 });
 
+/**
+ * Initializes the audio device handler based on the `disableCallIntegration` setting.
+ *
+ * @param {Store} store - The redux store.
+ * @private
+ * @returns {void}
+ */
+function _initializeCallIntegration({ getState }) {
+    const { disableCallIntegration } = getState()['features/base/settings'];
+
+    if (typeof disableCallIntegration === 'boolean') {
+        handleCallIntegrationChange(disableCallIntegration);
+    }
+}
+
 /**
  * Maps the settings field names to participant names where they don't match.
  * Currently there is only one such field, but may be extended in the future.
@@ -46,7 +66,7 @@ function _mapSettingsFieldToParticipant(settingsField) {
 }
 
 /**
- * Updates {@code startAudioOnly} flag if it's updated in the settings.
+ * Handles a change in the `disableCallIntegration` setting.
  *
  * @param {Object} action - The redux action.
  * @private

react/features/base/util/strings.native.js

@@ -0,0 +1,14 @@
+// @flow
+
+import * as unorm from 'unorm';
+
+/**
+ * Applies NFKC normalization to the given text.
+ * NOTE: Here we use the unorm package because the JSC version in React Native for Android crashes.
+ *
+ * @param {string} text - The text that needs to be normalized.
+ * @returns {string} - The normalized text.
+ */
+export function normalizeNFKC(text: string) {
+    return unorm.nfkc(text);
+}

react/features/base/util/strings.web.js

@@ -0,0 +1,11 @@
+// @flow
+
+/**
+ * Applies NFKC normalization to the given text.
+ *
+ * @param {string} text - The text that needs to be normalized.
+ * @returns {string} - The normalized text.
+ */
+export function normalizeNFKC(text: string) {
+    return text.normalize('NFKC');
+}

react/features/base/util/uri.js

@@ -1,5 +1,7 @@
 // @flow
 
+import { normalizeNFKC } from './strings';
+
 /**
  * The app linking scheme.
  * TODO: This should be read from the manifest files later.
@@ -120,8 +122,8 @@ export function getBackendSafeRoomName(room: ?string): ?string {
         // But in this case we're fine goin on...
     }
 
-    // Normalize the character set
-    room = room.normalize('NFKC');
+    // Normalize the character set.
+    room = normalizeNFKC(room);
 
     // Only decoded and normalized strings can be lowercased properly.
     room = room.toLowerCase();

react/features/conference/components/native/Conference.js

@@ -1,7 +1,7 @@
 // @flow
 
 import React from 'react';
-import { NativeModules, SafeAreaView, StatusBar, View } from 'react-native';
+import { NativeModules, SafeAreaView, StatusBar } from 'react-native';
 import LinearGradient from 'react-native-linear-gradient';
 
 import { appNavigate } from '../../../app';
@@ -279,7 +279,7 @@ class Conference extends AbstractConference<Props, *> {
                         </TintedView>
                 }
 
-                <View
+                <SafeAreaView
                     pointerEvents = 'box-none'
                     style = { styles.toolboxAndFilmstripContainer }>
 
@@ -320,7 +320,7 @@ class Conference extends AbstractConference<Props, *> {
                       */
                         _shouldDisplayTileView ? undefined : <Filmstrip />
                     }
-                </View>
+                </SafeAreaView>
 
                 <SafeAreaView
                     pointerEvents = 'box-none'

react/features/conference/components/web/Subject.js

@@ -2,6 +2,7 @@
 
 import React, { Component } from 'react';
 
+import { getConferenceName } from '../../../base/conference/functions';
 import { connect } from '../../../base/redux';
 import { isToolboxVisible } from '../../../toolbox';
 
@@ -13,7 +14,8 @@ import ParticipantsCount from './ParticipantsCount';
 type Props = {
 
     /**
-     * The subject of the conference.
+     * The subject or the of the conference.
+     * Falls back to conference name.
      */
     _subject: string,
 
@@ -60,10 +62,9 @@ class Subject extends Component<Props> {
  * }}
  */
 function _mapStateToProps(state) {
-    const { subject } = state['features/base/conference'];
 
     return {
-        _subject: subject,
+        _subject: getConferenceName(state),
         _visible: isToolboxVisible(state)
     };
 }

react/features/deep-linking/components/DeepLinkingMobilePage.web.js

@@ -10,6 +10,7 @@ import { DialInSummary } from '../../invite';
 
 import { _TNS } from '../constants';
 import { generateDeepLinkingURL } from '../functions';
+import { renderPromotionalFooter } from '../renderPromotionalFooter';
 
 declare var interfaceConfig: Object;
 
@@ -130,6 +131,7 @@ class DeepLinkingMobilePage extends Component<Props> {
                         { t(`${_TNS}.openApp`) }
                         {/* </button> */}
                     </a>
+                    { renderPromotionalFooter() }
                     <DialInSummary
                         className = 'deep-linking-dial-in'
                         clickableNumbers = { true }

react/features/deep-linking/renderPromotionalFooter.js

@@ -0,0 +1,9 @@
+// @flow
+/**
+ * Method used in order to render a custom promotional footer.
+ *
+ * @returns {HTMLElement}
+ */
+export function renderPromotionalFooter() {
+    return null;
+}

react/features/toolbox/components/native/Toolbox.js

@@ -1,6 +1,6 @@
 // @flow
 
-import React, { Component } from 'react';
+import React, { PureComponent } from 'react';
 import { View } from 'react-native';
 
 import { ColorSchemeRegistry } from '../../../base/color-scheme';
@@ -46,37 +46,10 @@ type Props = {
     dispatch: Function
 };
 
-/**
- * The type of {@link Toolbox}'s React {@code Component} state.
- */
-type State = {
-
-    /**
-     * The detected width for this component.
-     */
-    width: number
-};
-
 /**
  * Implements the conference toolbox on React Native.
  */
-class Toolbox extends Component<Props, State> {
-    state = {
-        width: 0
-    };
-
-    /**
-     *  Initializes a new {@code Toolbox} instance.
-     *
-     * @inheritdoc
-     */
-    constructor(props: Props) {
-        super(props);
-
-        // Bind event handlers so they are only bound once per instance.
-        this._onLayout = this._onLayout.bind(this);
-    }
-
+class Toolbox extends PureComponent<Props> {
     /**
      * Implements React's {@link Component#render()}.
      *
@@ -86,7 +59,6 @@ class Toolbox extends Component<Props, State> {
     render() {
         return (
             <Container
-                onLayout = { this._onLayout }
                 style = { styles.toolbox }
                 visible = { this.props._visible }>
                 { this._renderToolbar() }
@@ -125,20 +97,6 @@ class Toolbox extends Component<Props, State> {
         };
     }
 
-    _onLayout: (Object) => void;
-
-    /**
-     * Handles the "on layout" View's event and stores the width as state.
-     *
-     * @param {Object} event - The "on layout" event object/structure passed
-     * by react-native.
-     * @private
-     * @returns {void}
-     */
-    _onLayout({ nativeEvent: { layout: { width } } }) {
-        this.setState({ width });
-    }
-
     /**
      * Renders the toolbar. In order to avoid a weird visual effect in which the
      * toolbar is (visually) rendered and then visibly changes its size, it is