Revert "drop: debug."

This reverts commit 7d48ea1bca.

.editorconfig

@@ -14,12 +14,3 @@ trim_trailing_whitespace = false
 
 [Makefile]
 indent_style = tab
-
-[*.{java,kt}]
-indent_size = 4
-
-[*.xml]
-indent_size = 2
-
-[*.{swift,m,mm,h}]
-indent_size = 4

.github/workflows/ci.yml

@@ -103,7 +103,7 @@ jobs:
   android-sdk-build:
     name: Build mobile SDK (Android)
     runs-on: ubuntu-latest
-    container: reactnativecommunity/react-native-android:v18.0
+    container: reactnativecommunity/react-native-android:v13.0
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
@@ -139,12 +139,6 @@ jobs:
         xcode-select -p
         sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
         xcodebuild -version
-    - name: clean Xcode
-      run: |
-        rm -rf ios/sdk/out
-        xcodebuild clean \
-          -workspace ios/jitsi-meet.xcworkspace \
-          -scheme JitsiMeetSDK
     - name: setup-cocoapods
       uses: ruby/setup-ruby@v1
       with:
@@ -155,13 +149,15 @@ jobs:
       working-directory: ./ios
       run: bundle exec pod install --repo-update --deployment
     - run: |
-        xcodebuild -downloadPlatform iOS -buildVersion 18.2
+        xcodebuild clean \
+          -workspace ios/jitsi-meet.xcworkspace \
+          -scheme JitsiMeetSDK
         xcodebuild archive \
           -workspace ios/jitsi-meet.xcworkspace \
           -scheme JitsiMeetSDK  \
           -configuration Release \
           -sdk iphoneos \
-          -destination 'generic/platform=iOS' \
+          -destination='generic/platform=iOS' \
           -archivePath ios/sdk/out/ios-device \
           SKIP_INSTALL=NO \
           BUILD_LIBRARY_FOR_DISTRIBUTION=YES

CLAUDE.md

@@ -1,267 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
-## Development Commands
-
-### Building and Development
-- `npm run lint-fix` - Automatically fix linting issues
-- `npm run tsc:ci` - Run TypeScript checks for both web and native platforms
-- `npm run tsc:web` - TypeScript check for web platform only
-- `npm run tsc:native` - TypeScript check for native platform only
-- `npm run lint:ci` - Run ESLint without type checking
-- `make dev` - Start development server with webpack-dev-server
-- `make compile` - Build production bundles
-- `make clean` - Clean build directory
-- `make all` - Full build (compile + deploy)
-
-### Testing
-- `npm test` - Run full test suite using WebDriverIO
-- `npm run test-single -- <spec-file>` - Run single test file
-- `npm run test-dev` - Run tests against development environment
-- `npm run test-dev-single -- <spec-file>` - Run single test in dev mode
-
-
-### Language Tools
-- `npm run lang-sort` - Sort language files
-- `npm run lint:lang` - Validate JSON language files
-
-### Platform-Specific TypeScript
-TypeScript configuration is split between web and native platforms with separate tsconfig files.
-
-## Architecture Overview
-
-### Multi-Platform Structure
-Jitsi Meet supports both web and React Native platforms with platform-specific file extensions and directories:
-- `.web.ts/.web.tsx` - Web-specific implementations
-- `.native.ts/.native.tsx` - React Native-specific implementations
-- `.any.ts/.any.tsx` - Shared cross-platform code
-- `.android.ts/.android.tsx` - Android-specific code
-- `.ios.ts/.ios.tsx` - iOS-specific code
-- `web/` directories - Web-specific components and modules
-- `native/` directories - React Native-specific components and modules
-- `react/features/mobile/` - Native-only features
-
-### Core Directories
-- `react/features/` - Main application features organized by domain (83+ feature modules)
-- `modules/` - Legacy JavaScript modules and APIs
-- `css/` - SCSS stylesheets compiled to CSS
-- `libs/` - Compiled output directory for JavaScript bundles
-- `static/` - Static assets and HTML files
-- `tests/` - WebDriverIO end-to-end tests
-
-### Feature-Driven Architecture
-The application is organized under `react/features/` with each feature containing:
-
-- **`actionTypes.ts`** - Redux action type constants
-- **`actions.ts`** - Redux action creators (platform-specific variants with `.any.ts`, `.web.ts`, `.native.ts`)
-- **`reducer.ts`** - Redux reducer functions
-- **`middleware.ts`** - Redux middleware for side effects
-- **`functions.ts`** - Utility functions and selectors
-- **`constants.ts`** - Feature-specific constants
-- **`logger.ts`** - Feature-specific logger instance
-- **`types.ts`** - TypeScript type definitions
-
-### Key Application Files
-- `app.js` - Main web application entry point
-- `webpack.config.js` - Multi-bundle Webpack configuration
-- `Makefile` - Build system for development and production
-- `package.json` - Dependencies and scripts with version requirements
-
-### Bundle Architecture
-The application builds multiple bundles:
-- `app.bundle.js` / `app.bundle.min.js` - Main application bundle (entry: `./app.js`)
-- `external_api.js` / `external_api.min.js` - External API for embedders (entry: `./modules/API/external/index.js`)
-- `alwaysontop.js` / `alwaysontop.min.js` - Always-on-top window functionality (entry: `./react/features/always-on-top/index.tsx`)
-- `close3.js` / `close3.min.js` - Close3 functionality (entry: `./static/close3.js`)
-- `face-landmarks-worker.js` / `face-landmarks-worker.min.js` - Face landmarks detection worker (entry: `./react/features/face-landmarks/faceLandmarksWorker.ts`)
-- `noise-suppressor-worklet.js` / `noise-suppressor-worklet.min.js` - Audio noise suppression worklet (entry: `./react/features/stream-effects/noise-suppression/NoiseSuppressorWorklet.ts`)
-- `screenshot-capture-worker.js` / `screenshot-capture-worker.min.js` - Screenshot capture worker (entry: `./react/features/screenshot-capture/worker.ts`)
-
-### Redux Architecture
-Features follow a Redux-based architecture with:
-- Actions, reducers, and middleware in each feature directory
-- Cross-platform state management
-- Modular feature organization with clear boundaries
-
-The codebase uses a registry-based Redux architecture:
-- **ReducerRegistry** - Features register their reducers independently
-- **MiddlewareRegistry** - Features register middleware without cross-dependencies
-- **IReduxState** - Global state is strongly typed with 80+ feature states
-
-### Dependencies
-- Uses `lib-jitsi-meet` as the core WebRTC library
-- React with TypeScript support
-- React Native for mobile applications
-- Webpack for bundling with development server
-
-### TypeScript Configuration
-- `tsconfig.web.json` - Web platform TypeScript config (excludes native files)
-- `tsconfig.native.json` - React Native TypeScript config (excludes web files)
-- Strict TypeScript settings with ES2024 target
-- Platform-specific module suffixes (`.web`, `.native`)
-
-### Key Base Features
-- **`base/app/`** - Application lifecycle management
-- **`base/conference/`** - Core conference logic
-- **`base/tracks/`** - Media track management
-- **`base/participants/`** - Participant management
-- **`base/config/`** - Configuration management
-- **`base/redux/`** - Redux infrastructure
-
-### Component Patterns
-- **Abstract Components** - Base classes for cross-platform components
-- **Platform-Specific Components** - Separate implementations in `web/` and `native/` directories
-- **Hook-based patterns** - Modern React patterns for component logic
-### Testing Framework
-- WebDriverIO for end-to-end testing
-- Test files are located in `tests/specs/` and use page objects in `tests/pageobjects/`.
-- Environment configuration via `.env` files
-- Support for Chrome, Firefox, and grid testing
-
-## Development Guidelines
-
-### Adding New Features
-1. Create feature directory under `react/features/[feature-name]/`
-2. Follow the standard file structure (actionTypes, actions, reducer, etc.)
-3. Register reducers and middleware using the registry pattern
-4. Define TypeScript interfaces for state and props
-5. Use platform-specific files for web/native differences
-6. Add feature-specific logger for debugging
-
-### Working with Existing Features
-1. Check for existing `.any.ts`, `.web.ts`, `.native.ts` variants
-2. Follow established action-reducer-middleware patterns
-3. Use existing base utilities rather than creating new ones
-4. Leverage abstract components for cross-platform logic
-5. Maintain type safety across the entire state tree
-
-### Testing
-The project uses WebDriver (WebdriverIO) for end-to-end testing. Test files are located in `tests/specs/` and use page objects in `tests/pageobjects/`.
-
-### Build System
-- **Webpack** - Main build system for web bundles
-- **Makefile** - Coordinates build process and asset deployment
-- **Metro** - React Native bundler (configured in `metro.config.js`)
-
-### Platform-Specific Notes
-- Web builds exclude files matching `**/native/*`, `**/*.native.ts`, etc.
-- Native builds exclude files matching `**/web/*`, `**/*.web.ts`, etc.
-- Use `moduleSuffixes` in TypeScript config to handle platform-specific imports
-- Check `tsconfig.web.json` and `tsconfig.native.json` for platform-specific exclusions
-
-## Environment and Setup Requirements
-
-### System Requirements
-- **Node.js and npm** are required
-- Development server runs at https://localhost:8080/
-- Certificate errors in development are expected (self-signed certificates)
-
-### Development Workflow
-- Development server proxies to configurable target (default: https://alpha.jitsi.net)
-- Hot module replacement enabled for development
-- Bundle analysis available via `ANALYZE_BUNDLE=true` environment variable
-- Circular dependency detection via `DETECT_CIRCULAR_DEPS=true`
-
-## Code Quality Requirements
-- All code must pass `npm run lint:ci` and `npm run tsc:ci` with 0 warnings before committing
-- TypeScript strict mode enabled - avoid `any` type
-- ESLint config extends `@jitsi/eslint-config`
-- Prefer TypeScript for new features, convert existing JavaScript when possible
-
-## Code Style and Standards
-
-### Conventional Commits Format
-Follow [Conventional Commits](https://www.conventionalcommits.org) with **mandatory scopes**:
-```
-feat(feature-name): description
-fix(feature-name): description
-docs(section): description
-```
-Available types: build, chore, ci, docs, feat, fix, perf, refactor, revert, style, test
-
-### Feature Layout Structure
-When adding new features:
-```
-react/features/sample/
-├── actionTypes.ts
-├── actions.ts
-├── components/
-│   ├── AnotherComponent.tsx
-│   └── OneComponent.tsx
-├── middleware.ts
-└── reducer.ts
-```
-
-### TypeScript Requirements
-- All new features must be written in TypeScript
-- Convert JavaScript to TypeScript when modifying existing code
-- Import middleware in `react/features/app/middlewares.{any,native,web}.js`
-- Import reducers in appropriate registry files
-- Avoid `index` files
-
-### Bundle Size Management
-- Bundle size limits are enforced to prevent bloat
-- For increases, analyze first: `npx webpack -p --analyze-bundle`
-- Open analyzer: `npx webpack-bundle-analyzer build/app-stats.json`
-- Justify any dependency additions that increase bundle size
-
-## Testing and Quality Assurance
-
-### Tests
-- End-to-end tests are defined in the tests/
-- Tests run automatically for project member PRs via Jenkins
-- Tests cover peer-to-peer, invites, iOS, Android, and web platforms
-- Beta testing available at https://beta.meet.jit.si/
-
-### Manual Testing Checklist
-- Test with 2 participants (P2P mode)
-- Test with 3+ participants (JVB mode)
-- Verify audio/video in both modes
-- Test mobile apps if changes affect mobile
-- Check that TLS certificate chain is complete for mobile app compatibility
-
-## Common Issues and Debugging
-
-### P2P vs JVB Problems
-- **Works with 2 participants, fails with 3+**: JVB/firewall issue, check UDP 10000
-- **Works on web, fails on mobile apps**: TLS certificate chain issue, need fullchain.pem
-- Use the tests from tests/ directory to verify functionality across platforms
-
-### Development Server Issues
-- Certificate warnings are normal for development (self-signed)
-- Use different backend with WEBPACK_DEV_SERVER_PROXY_TARGET environment variable
-- Check firewall settings if local development fails
-
-### Configuration and Customization
-- Extensive configuration options documented in handbook
-- See `config.js` for client-side options
-- Options marked 🚫 are not overwritable through `configOverwrite`
-- Reference [Configuration Guide](https://jitsi.github.io/handbook/docs/dev-guide/dev-guide-configuration) for details
-
-## Architecture Deep Dive
-
-### Core Application Files
-- **`./conference.js`** - Foundation for user-conference interactions (connection, joining, muting)
-- **`./modules/external-api`** - External API for iframe integration and events
-- **`./lang/`** - Translations in `main-[language].json` files
-- **`./css/`** - SCSS files organized by features, matching React feature structure
-
-### State Management Flow
-1. Actions dispatched from components
-2. Middleware processes side effects
-3. Reducers update state
-4. Components re-render based on state changes
-5. Registry pattern keeps features decoupled
-
-### Cross-Platform Strategy
-- Abstract components handle shared logic
-- Platform files (.web.ts, .native.ts) handle platform differences
-- Build system excludes irrelevant platform files
-- TypeScript configs ensure proper platform targeting
-
-## External Resources
-- [Jitsi Handbook](https://jitsi.github.io/handbook/) - Comprehensive documentation
-- [Community Forum](https://community.jitsi.org/) - Ask questions and get support
-- [Architecture Guide](https://jitsi.github.io/handbook/docs/architecture) - System overview
-- [Contributing Guidelines](https://jitsi.github.io/handbook/docs/dev-guide/contributing) - Detailed contribution process

android/app/build.gradle

@@ -1,5 +1,4 @@
 apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
 
 // Crashlytics integration is done as part of Firebase now, so it gets
 // automagically activated with google-services.json
@@ -28,14 +27,6 @@ android {
         ndk {
             abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
         }
-
-        externalNativeBuild {
-            cmake {
-                arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON", "-DANDROID_STL=c++_shared"
-                cppFlags "-std=c++17"
-                cFlags "-DANDROID_PLATFORM=android-26"
-            }
-        }
     }
 
     signingConfigs {
@@ -54,8 +45,8 @@ android {
             applicationIdSuffix ".debug"
         }
         release {
-            // Uncomment the following line for signing a test release build.
-            // signingConfig signingConfigs.debug
+            // 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}"
@@ -75,18 +66,9 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility rootProject.ext.javaVersion
-        targetCompatibility rootProject.ext.javaVersion
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
-
-    kotlinOptions {
-        jvmTarget = rootProject.ext.jvmTargetVersion
-    }
-
-    kotlin {
-        jvmToolchain(rootProject.ext.jvmToolchainVersion)
-    }
-
     namespace 'org.jitsi.meet'
 }
 
@@ -101,8 +83,10 @@ dependencies {
 
         // Firebase
         //  - Crashlytics
+        //  - Dynamic Links
         implementation 'com.google.firebase:firebase-analytics:21.3.0'
         implementation 'com.google.firebase:firebase-crashlytics:18.4.3'
+        implementation 'com.google.firebase:firebase-dynamic-links:21.1.0'
     }
 
     implementation project(':sdk')
@@ -110,6 +94,8 @@ dependencies {
 
 gradle.projectsEvaluated {
     // Dropbox integration
+    //
+
     def dropboxAppKey
     if (project.file('dropbox.key').exists()) {
         dropboxAppKey = project.file('dropbox.key').text.trim() - 'db-'
@@ -180,6 +166,7 @@ gradle.projectsEvaluated {
 
         packageTask.dependsOn(currentRunPackagerTask)
     }
+
 }
 
 if (googleServicesEnabled) {

android/app/proguard-rules-release.pro

@@ -4,7 +4,3 @@
 -keepattributes *Annotation*
 -keepattributes SourceFile,LineNumberTable
 -keep public class * extends java.lang.Exception
-
-# R8 missing classes - suppress warnings
--dontwarn com.facebook.memory.config.MemorySpikeConfig
--dontwarn kotlinx.parcelize.Parcelize

android/app/proguard-rules.pro

@@ -96,3 +96,8 @@
 
 # Rule to avoid build errors related to SVGs.
 -keep public class com.horcrux.svg.** {*;}
+
+# https://github.com/facebook/fresco/issues/2638
+-keep public class com.facebook.imageutils.** {
+   public *;
+}

android/app/src/main/java/org/jitsi/meet/GoogleServicesHelper.java

@@ -4,6 +4,7 @@ import android.net.Uri;
 import android.util.Log;
 
 import com.google.firebase.crashlytics.FirebaseCrashlytics;
+import com.google.firebase.dynamiclinks.FirebaseDynamicLinks;
 
 import org.jitsi.meet.sdk.JitsiMeet;
 import org.jitsi.meet.sdk.JitsiMeetActivity;
@@ -21,6 +22,18 @@ final class GoogleServicesHelper {
             Log.d(activity.getClass().getSimpleName(), "Initializing Google Services");
 
             FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(!JitsiMeet.isCrashReportingDisabled(activity));
+            FirebaseDynamicLinks.getInstance().getDynamicLink(activity.getIntent())
+                .addOnSuccessListener(activity, pendingDynamicLinkData -> {
+                    Uri dynamicLink = null;
+
+                    if (pendingDynamicLinkData != null) {
+                        dynamicLink = pendingDynamicLinkData.getLink();
+                    }
+
+                    if (dynamicLink != null) {
+                        activity.join(dynamicLink.toString());
+                    }
+                });
         }
     }
 }

android/app/src/main/res/values/colors.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="colorPrimary">#17A0DB</color>
-    <color name="navigationBarColor">#040404</color>
-    <color name="statusBarColor">#040404</color>
+    <color name="navigationBarColor">#161618</color>
 </resources>

android/app/src/main/res/values/styles.xml

@@ -3,7 +3,6 @@
         <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:navigationBarColor">@color/navigationBarColor</item>
-        <item name="android:statusBarColor">@color/statusBarColor</item>
         <item name="android:windowDisablePreview">true</item>
    </style>
 </resources>

android/build.gradle

@@ -5,52 +5,46 @@ import org.gradle.util.VersionNumber
 // sub-projects/modules.
 
 buildscript {
-    ext {
-        kotlinVersion = "2.0.21"
-        gradlePluginVersion = "8.6.0"
-        buildToolsVersion = "35.0.0"
-        compileSdkVersion = 35
-        minSdkVersion    = 26
-        targetSdkVersion = 35
-        supportLibVersion = "28.0.0"
-        ndkVersion = "27.1.12297006"
-
-        // The Maven artifact groupId of the third-party react-native modules which
-        // Jitsi Meet SDK for Android depends on and which are not available in
-        // third-party Maven repositories so we have to deploy to a Maven repository
-        // of ours.
-        moduleGroupId = 'com.facebook.react'
-
-        // Maven repo where artifacts will be published
-        mavenRepo = System.env.MVN_REPO ?: ""
-        mavenUser = System.env.MVN_USER ?: ""
-        mavenPassword = System.env.MVN_PASSWORD ?: ""
-
-        // Libre build
-        libreBuild = (System.env.LIBRE_BUILD ?: "false").toBoolean()
-
-        googleServicesEnabled = project.file('app/google-services.json').exists() && !libreBuild
-
-        //React Native and Hermes Version
-        rnVersion = "0.77.2"
-
-        // Java dependencies
-        javaVersion = JavaVersion.VERSION_17
-        jvmToolchainVersion = 17
-        jvmTargetVersion = '17'
-    }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$rootProject.ext.kotlinVersion"
-        classpath "com.android.tools.build:gradle:$rootProject.ext.gradlePluginVersion"
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath 'com.google.gms:google-services:4.4.0'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
     }
 }
 
+ext {
+    kotlinVersion = "1.9.24"
+    buildToolsVersion = "34.0.0"
+    compileSdkVersion = 34
+    minSdkVersion    = 26
+    targetSdkVersion = 34
+    supportLibVersion = "28.0.0"
+    ndkVersion = "26.1.10909125"
+
+    // The Maven artifact groupId of the third-party react-native modules which
+    // Jitsi Meet SDK for Android depends on and which are not available in
+    // third-party Maven repositories so we have to deploy to a Maven repository
+    // of ours.
+    moduleGroupId = 'com.facebook.react'
+
+    // Maven repo where artifacts will be published
+    mavenRepo = System.env.MVN_REPO ?: ""
+    mavenUser = System.env.MVN_USER ?: ""
+    mavenPassword = System.env.MVN_PASSWORD ?: ""
+
+    // Libre build
+    libreBuild = (System.env.LIBRE_BUILD ?: "false").toBoolean()
+
+    googleServicesEnabled = project.file('app/google-services.json').exists() && !libreBuild
+
+    //React Native and Hermes Version
+    rnVersion = "0.75.5"
+}
+
 allprojects {
     repositories {
         mavenCentral()
@@ -75,6 +69,26 @@ allprojects {
         }
     }
 
+    // Due to a dependency conflict between React Native and the Fresco library used by GiphySDK,
+    // GIFs appear as static images instead of animating
+    // https://github.com/Giphy/giphy-react-native-sdk/commit/7fe466ed6fddfaec95f9cbc959d33bd75ad8f900
+
+    configurations.configureEach {
+        resolutionStrategy {
+            forcedModules = [
+                'com.facebook.fresco:fresco:3.2.0',
+                'com.facebook.fresco:animated-gif:3.2.0',
+                'com.facebook.fresco:animated-base:3.2.0',
+                'com.facebook.fresco:animated-drawable:3.2.0',
+                'com.facebook.fresco:animated-webp:3.2.0',
+                'com.facebook.fresco:webpsupport:3.2.0',
+                'com.facebook.fresco:imagepipeline-okhttp3:3.2.0',
+                'com.facebook.fresco:middleware:3.2.0',
+                'com.facebook.fresco:nativeimagetranscoder:3.2.0'
+            ]
+        }
+    }
+
     // Third-party react-native modules which Jitsi Meet SDK for Android depends
     // on and which are not available in third-party Maven repositories need to
     // be deployed in a Maven repository of ours.
@@ -120,7 +134,7 @@ allprojects {
             project.version = "${json.version}-jitsi-${versionQualifierNumber}"
 
             task jitsiAndroidSourcesJar(type: Jar) {
-                archiveClassifier = 'sources'
+                classifier = 'sources'
                 from android.sourceSets.main.java.source
             }
 
@@ -171,46 +185,16 @@ allprojects {
     }
 }
 
-// Force the version of the Android build tools we have chosen on all subprojects.
+// Force the version of the Android build tools we have chosen on all
+// subprojects. The forcing was introduced for react-native and the third-party
+// modules that we utilize such as react-native-background-timer.
 subprojects { subproject ->
     afterEvaluate{
         if ((subproject.plugins.hasPlugin('android')
                     || subproject.plugins.hasPlugin('android-library'))
                 && rootProject.ext.has('buildToolsVersion')) {
-
             android {
                 buildToolsVersion rootProject.ext.buildToolsVersion
-
-                buildFeatures {
-                    buildConfig true
-                }
-
-                // Set JVM target across all subprojects
-                compileOptions {
-                    sourceCompatibility rootProject.ext.javaVersion
-                    targetCompatibility rootProject.ext.javaVersion
-                }
-
-                // Disable lint errors for problematic third-party modules
-                // react-native-background-timer
-                // react-native-calendar-events
-                lint {
-                    abortOnError = false
-                }
-            }
-        }
-
-        // Add Kotlin configuration for subprojects that use Kotlin
-        if (subproject.plugins.hasPlugin('kotlin-android')) {
-            subproject.kotlin {
-                jvmToolchain(rootProject.ext.jvmToolchainVersion)
-            }
-
-            // Set Kotlin JVM target
-            subproject.android {
-                kotlinOptions {
-                    jvmTarget = rootProject.ext.jvmTargetVersion
-                }
             }
         }
     }

android/gradle.properties

@@ -11,26 +11,20 @@
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx1024m -XX:MaxPermSize=256m
 
-org.gradle.jvmargs=-Xmx4048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
+# This one fixes a weird WebRTC runtime problem on some devices.
+# https://github.com/jitsi/jitsi-meet/issues/7911#issuecomment-714323255
+android.enableDexingArtifactTransform.desugaring=false
+
 android.useAndroidX=true
-
 android.enableJetifier=true
-
-# Use this property to enable support to the new architecture.
-# This will allow you to use TurboModules and the Fabric render in
-# your application. You should enable this flag either if you want
-# to write custom TurboModules/Fabric components OR use libraries that
-# are providing them.
-newArchEnabled=false
-
-# Use this property to enable or disable the Hermes JS engine.
-hermesEnabled=true
+android.bundle.enableUncompressedNativeLibs=false
 
 appVersion=99.0.0
 sdkVersion=0.0.0

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/scripts/check_elf_alignment.sh

@@ -1,113 +0,0 @@
-#!/bin/bash
-progname="${0##*/}"
-progname="${progname%.sh}"
-
-# usage: check_elf_alignment.sh [path to *.so files|path to *.apk]
-
-cleanup_trap() {
-  if [ -n "${tmp}" -a -d "${tmp}" ]; then
-    rm -rf ${tmp}
-  fi
-  exit $1
-}
-
-usage() {
-  echo "Host side script to check the ELF alignment of shared libraries."
-  echo "Shared libraries are reported ALIGNED when their ELF regions are"
-  echo "16 KB or 64 KB aligned. Otherwise they are reported as UNALIGNED."
-  echo
-  echo "Usage: ${progname} [input-path|input-APK|input-APEX]"
-}
-
-if [ ${#} -ne 1 ]; then
-  usage
-  exit
-fi
-
-case ${1} in
-  --help | -h | -\?)
-    usage
-    exit
-    ;;
-
-  *)
-    dir="${1}"
-    ;;
-esac
-
-if ! [ -f "${dir}" -o -d "${dir}" ]; then
-  echo "Invalid file: ${dir}" >&2
-  exit 1
-fi
-
-if [[ "${dir}" == *.apk ]]; then
-  trap 'cleanup_trap' EXIT
-
-  echo
-  echo "Recursively analyzing $dir"
-  echo
-
-  if { zipalign --help 2>&1 | grep -q "\-P <pagesize_kb>"; }; then
-    echo "=== APK zip-alignment ==="
-    zipalign -v -c -P 16 4 "${dir}" | egrep 'lib/arm64-v8a|lib/x86_64|Verification'
-    echo "========================="
-  else
-    echo "NOTICE: Zip alignment check requires build-tools version 35.0.0-rc3 or higher."
-    echo "  You can install the latest build-tools by running the below command"
-    echo "  and updating your \$PATH:"
-    echo
-    echo "    sdkmanager \"build-tools;35.0.0-rc3\""
-  fi
-
-  dir_filename=$(basename "${dir}")
-  tmp=$(mktemp -d -t "${dir_filename%.apk}_out_XXXXX")
-  unzip "${dir}" lib/* -d "${tmp}" >/dev/null 2>&1
-  dir="${tmp}"
-fi
-
-if [[ "${dir}" == *.apex ]]; then
-  trap 'cleanup_trap' EXIT
-
-  echo
-  echo "Recursively analyzing $dir"
-  echo
-
-  dir_filename=$(basename "${dir}")
-  tmp=$(mktemp -d -t "${dir_filename%.apex}_out_XXXXX")
-  deapexer extract "${dir}" "${tmp}" || { echo "Failed to deapex." && exit 1; }
-  dir="${tmp}"
-fi
-
-RED="\e[31m"
-GREEN="\e[32m"
-ENDCOLOR="\e[0m"
-
-unaligned_libs=()
-
-echo
-echo "=== ELF alignment ==="
-
-matches="$(find "${dir}" -type f)"
-IFS=$'\n'
-for match in $matches; do
-  # We could recursively call this script or rewrite it to though.
-  [[ "${match}" == *".apk" ]] && echo "WARNING: doesn't recursively inspect .apk file: ${match}"
-  [[ "${match}" == *".apex" ]] && echo "WARNING: doesn't recursively inspect .apex file: ${match}"
-
-  [[ $(file "${match}") == *"ELF"* ]] || continue
-
-  res="$(objdump -p "${match}" | grep LOAD | awk '{ print $NF }' | head -1)"
-  if [[ $res =~ 2\*\*(1[4-9]|[2-9][0-9]|[1-9][0-9]{2,}) ]]; then
-    echo -e "${match}: ${GREEN}ALIGNED${ENDCOLOR} ($res)"
-  else
-    echo -e "${match}: ${RED}UNALIGNED${ENDCOLOR} ($res)"
-    unaligned_libs+=("${match}")
-  fi
-done
-
-if [ ${#unaligned_libs[@]} -gt 0 ]; then
-  echo -e "${RED}Found ${#unaligned_libs[@]} unaligned libs (only arm64-v8a/x86_64 libs need to be aligned).${ENDCOLOR}"
-elif [ -n "${dir_filename}" ]; then
-  echo -e "ELF Verification Successful"
-fi
-echo "====================="

android/sdk/build.gradle

@@ -44,11 +44,15 @@ dependencies {
     api "com.facebook.react:react-android:$rootProject.ext.rnVersion"
     api "com.facebook.react:hermes-android:$rootProject.ext.rnVersion"
 
+    //noinspection GradleDynamicVersion
+    implementation 'org.webkit:android-jsc:+'
+
+    implementation 'com.facebook.fresco:animated-gif:2.5.0'
     implementation 'com.dropbox.core:dropbox-core-sdk:4.0.1'
     implementation 'com.jakewharton.timber:timber:5.0.1'
+    implementation 'com.squareup.duktape:duktape-android:1.3.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'androidx.startup:startup-runtime:1.1.0'
-    implementation 'com.google.j2objc:j2objc-annotations:3.0.0'
 
     // Only add these packages if we are NOT doing a LIBRE_BUILD
     if (!rootProject.ext.libreBuild) {
@@ -73,6 +77,7 @@ dependencies {
     }
     implementation project(':react-native-gesture-handler')
     implementation project(':react-native-get-random-values')
+    implementation project(':react-native-immersive-mode')
     implementation project(':react-native-keep-awake')
     implementation project(':react-native-orientation-locker')
     implementation project(':react-native-pager-view')
@@ -81,11 +86,10 @@ dependencies {
     implementation project(':react-native-screens')
     implementation project(':react-native-slider')
     implementation project(':react-native-sound')
-    implementation project(':react-native-splash-view')
+    implementation project(':react-native-splash-screen')
     implementation project(':react-native-svg')
     implementation project(':react-native-video')
     implementation project(':react-native-webview')
-    implementation project(':react-native-worklets-core')
 
     // Use `api` here so consumers can use WebRTCModuleOptions.
     api project(':react-native-webrtc')
@@ -136,16 +140,8 @@ android.libraryVariants.all { def variant ->
         def devEnabled = !targetName.toLowerCase().contains("release")
 
         // Run the bundler
-        // Use full path to node to avoid PATH issues in Gradle
-        def nodePath = System.getenv('NVM_BIN') ? "${System.getenv('NVM_BIN')}/node" : "node"
-
-        // Debug: Print the node path and environment
-        println "Using node path: ${nodePath}"
-        println "NVM_BIN: ${System.getenv('NVM_BIN')}"
-        println "Working directory: ${reactRoot}"
-
         commandLine(
-                nodePath,
+                "node",
                 "node_modules/react-native/scripts/bundle.js",
                 "--platform", "android",
                 "--dev", "${devEnabled}",
@@ -158,70 +154,6 @@ android.libraryVariants.all { def variant ->
         enabled !devEnabled
     }
 
-    // GRADLE REQUIREMENTS (Gradle 8.7+ / AGP 8.5.0+):
-    
-    // This task requires explicit dependencies on resource tasks from all React Native modules
-    // due to Gradle's strict validation of task dependencies.
-
-    // Without these dependencies,
-    // builds will fail with errors like:
-    // "Task ':sdk:bundleReleaseJsAndAssets' uses the output of task ':react-native-amplitude:packageReleaseResources'
-    // without declaring a dependency on it."
-
-    // The automatic dependency resolution below ensures all required resource tasks are properly
-    // declared as dependencies before this task executes.
-
-    if (variant.name.toLowerCase().contains("release")) {
-        rootProject.subprojects.each { subproject ->
-            if (
-                subproject.name.startsWith("react-native-") ||
-                subproject.name.startsWith("@react-native-") ||
-                subproject.name.startsWith("@giphy/")
-            ) {
-                [
-                    "packageReleaseResources",
-                    "generateReleaseResValues",
-                    "generateReleaseResources",
-                    "generateReleaseBuildConfig",
-                    "processReleaseManifest",
-                    "writeReleaseAarMetadata",
-                    "generateReleaseRFile",
-                    "compileReleaseLibraryResources",
-                    "compileReleaseJavaWithJavac",
-                    "javaPreCompileRelease",
-                    "bundleLibCompileToJarRelease",
-                    "exportReleaseConsumerProguardFiles",
-                    "mergeReleaseGeneratedProguardFiles",
-                    "mergeReleaseJniLibFolders",
-                    "mergeReleaseShaders",
-                    "packageReleaseAssets",
-                    "processReleaseJavaRes",
-                    "prepareReleaseArtProfile",
-                    "copyReleaseJniLibsProjectOnly",
-                    "extractDeepLinksRelease",
-                    "createFullJarRelease",
-                    "generateReleaseLintModel",
-                    "writeReleaseLintModelMetadata",
-                    "generateReleaseLintVitalModel",
-                    "lintVitalAnalyzeRelease",
-                    "lintReportRelease",
-                    "lintAnalyzeRelease",
-                    "lintReportDebug",
-                    "lintAnalyzeDebug"
-                ].each { taskName ->
-                    if (subproject.tasks.findByName(taskName)) {
-                        currentBundleTask.dependsOn(subproject.tasks.named(taskName))
-                    }
-                }
-
-                // Also depend on the main build task to ensure all sub-tasks are completed
-                if (subproject.tasks.findByName("build")) {
-                    currentBundleTask.dependsOn(subproject.tasks.named("build"))
-                }
-            }
-        }
-    }
-
     currentBundleTask.ext.generatedResFolders = files(resourcesDir).builtBy(currentBundleTask)
     currentBundleTask.ext.generatedAssetsFolders = files(jsBundleDir).builtBy(currentBundleTask)
     variant.registerGeneratedResFolders(currentBundleTask.generatedResFolders)

android/sdk/src/main/AndroidManifest.xml

@@ -62,8 +62,7 @@
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
-            android:exported="false"
-            tools:node="merge">
+            android:exported="false">
             <meta-data  android:name="org.jitsi.meet.sdk.JitsiInitializer"
                 android:value="androidx.startup" />
         </provider>

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

@@ -0,0 +1,57 @@
+/*
+ * Copyright @ 2019-present 8x8, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jitsi.meet.sdk;
+
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.module.annotations.ReactModule;
+import com.squareup.duktape.Duktape;
+
+@ReactModule(name = JavaScriptSandboxModule.NAME)
+class JavaScriptSandboxModule extends ReactContextBaseJavaModule {
+    public static final String NAME = "JavaScriptSandbox";
+
+    public JavaScriptSandboxModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+    }
+
+    /**
+     * Evaluates the given code in a Duktape VM.
+     * @param code - The code that needs to evaluated.
+     * @param promise - Resolved with the output in case of success or rejected with an exception
+     *                in case of failure.
+     */
+    @ReactMethod
+    public void evaluate(String code, Promise promise) {
+        Duktape vm = Duktape.create();
+        try {
+            Object res = vm.evaluate(code);
+            promise.resolve(res.toString());
+        } catch (Throwable tr) {
+            promise.reject(tr);
+        } finally {
+            vm.close();
+        }
+    }
+
+    @Override
+    public String getName() {
+        return NAME;
+    }
+}

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

@@ -23,10 +23,8 @@ import androidx.annotation.NonNull;
 import androidx.startup.Initializer;
 
 import com.facebook.soloader.SoLoader;
-import com.facebook.react.soloader.OpenSourceMergedSoMapping;
 import org.wonday.orientation.OrientationActivityLifecycle;
 
-import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 
@@ -37,11 +35,7 @@ public class JitsiInitializer implements Initializer<Boolean> {
     public Boolean create(@NonNull Context context) {
         Log.d(this.getClass().getCanonicalName(), "create");
 
-        try {
-            SoLoader.init(context, OpenSourceMergedSoMapping.INSTANCE);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+        SoLoader.init(context, /* native exopackage */ false);
 
         // Register our uncaught exception handler.
         JitsiMeetUncaughtExceptionHandler.register();
@@ -49,10 +43,6 @@ public class JitsiInitializer implements Initializer<Boolean> {
         // Register activity lifecycle handler for the orientation locker module.
         ((Application) context).registerActivityLifecycleCallbacks(OrientationActivityLifecycle.getInstance());
 
-        // Initialize ReactInstanceManager during application startup
-        // This ensures it's ready before any Activity onCreate is called
-        ReactInstanceManagerHolder.initReactInstanceManager((Application) context);
-
         return true;
     }
 

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

@@ -22,7 +22,7 @@ import android.os.Bundle;
 
 import com.facebook.react.ReactInstanceManager;
 
-import com.splashview.SplashView;
+import org.devio.rn.splashscreen.SplashScreen;
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 
 public class JitsiMeet {
@@ -92,7 +92,7 @@ public class JitsiMeet {
      */
     public static void showSplashScreen(Activity activity) {
         try {
-            SplashView.INSTANCE.showSplashView(activity);
+            SplashScreen.show(activity);
         } catch (Exception e) {
             JitsiMeetLogger.e(e, "Failed to show splash screen");
         }

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

@@ -24,17 +24,10 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Configuration;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.facebook.react.modules.core.PermissionListener;
@@ -94,27 +87,6 @@ public class JitsiMeetActivity extends AppCompatActivity
         launch(context, options);
     }
 
-    public static void addTopBottomInsets(@NonNull Window w, @NonNull View v) {
-
-        View decorView = w.getDecorView();
-
-        decorView.post(() -> {
-            WindowInsetsCompat insets = ViewCompat.getRootWindowInsets(decorView);
-            if (insets != null) {
-                ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
-                params.topMargin = insets.getInsets(WindowInsetsCompat.Type.systemBars()).top;
-                params.bottomMargin = insets.getInsets(WindowInsetsCompat.Type.systemBars()).bottom;
-                v.setLayoutParams(params);
-
-                decorView.setOnApplyWindowInsetsListener((view, windowInsets) -> {
-                    view.setBackgroundColor(JitsiMeetView.BACKGROUND_COLOR);
-
-                    return windowInsets;
-                });
-            }
-        });
-    }
-
     // Overrides
     //
 
@@ -130,17 +102,7 @@ public class JitsiMeetActivity extends AppCompatActivity
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        // ReactInstanceManager is now initialized by JitsiInitializer during application startup
-        // Just call onHostResume since the manager is already ready
-        JitsiMeetActivityDelegate.onHostResume(this);
-
         setContentView(R.layout.activity_jitsi_meet);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM
-            && getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
-            addTopBottomInsets(getWindow(), findViewById(android.R.id.content));
-        }
-
         this.jitsiView = findViewById(R.id.jitsiView);
 
         registerForBroadcastMessages();

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

@@ -37,6 +37,7 @@ public class JitsiMeetActivityDelegate {
      * React Native module.
      */
     private static PermissionListener permissionListener;
+    private static Callback permissionsCallback;
 
     /**
      * Tells whether or not the permissions request is currently in progress.
@@ -141,6 +142,11 @@ public class JitsiMeetActivityDelegate {
         if (reactInstanceManager != null) {
             reactInstanceManager.onHostResume(activity, new DefaultHardwareBackBtnHandlerImpl(activity));
         }
+
+        if (permissionsCallback != null) {
+            permissionsCallback.invoke();
+            permissionsCallback = null;
+        }
     }
 
     /**
@@ -163,10 +169,15 @@ public class JitsiMeetActivityDelegate {
 
     public static void onRequestPermissionsResult(
             final int requestCode, final String[] permissions, final int[] grantResults) {
-        // Invoke the callback immediately
-        if (permissionListener != null && permissionListener.onRequestPermissionsResult(requestCode, permissions, grantResults)) {  
-            permissionListener = null;
-        }
+        permissionsCallback = new Callback() {
+            @Override
+            public void invoke(Object... args) {
+                if (permissionListener != null
+                        && permissionListener.onRequestPermissionsResult(requestCode, permissions, grantResults)) {
+                    permissionListener = null;
+                }
+            }
+        };
     }
 
     public static void requestPermissions(Activity activity, String[] permissions, int requestCode, PermissionListener listener) {

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

@@ -99,7 +99,6 @@ public class JitsiMeetOngoingConferenceService extends Service implements Ongoin
 
     public static void launch(Context context, HashMap<String, Object> extraData) {
         List<String> permissionsList = new ArrayList<>();
-        Activity activity = (Activity) context;
 
         PermissionListener listener = new PermissionListener() {
             @Override
@@ -135,7 +134,7 @@ public class JitsiMeetOngoingConferenceService extends Service implements Ongoin
 
         if (permissionsArray.length > 0) {
             JitsiMeetActivityDelegate.requestPermissions(
-                activity,
+                (Activity) context,
                 permissionsArray,
                 PERMISSIONS_REQUEST_CODE,
                 listener
@@ -160,20 +159,12 @@ public class JitsiMeetOngoingConferenceService extends Service implements Ongoin
             stopSelf();
             JitsiMeetLogger.w(TAG + " Couldn't start service, notification is null");
         } else {
-            try {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                    startForeground(NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK | ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE);
-                } else if (Build.VERSION.SDK_INT == Build.VERSION_CODES.Q) {
-                    startForeground(NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK);
-                } else {
-                    startForeground(NOTIFICATION_ID, notification);
-                }
-            } catch (Exception e) {
-                // Handle ForegroundServiceStartNotAllowedException when app is in background and cannot start foreground service.
-                // See: https://developer.android.com/develop/background-work/services/fgs/restrictions-bg-start#wiu-restrictions
-                JitsiMeetLogger.w(TAG + " Failed to start foreground service", e);
-                stopSelf();
-                return;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                startForeground(NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK | ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE);
+            } else if (Build.VERSION.SDK_INT == Build.VERSION_CODES.Q) {
+                startForeground(NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK);
+            } else {
+                startForeground(NOTIFICATION_ID, notification);
             }
         }
 

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

@@ -17,7 +17,6 @@
 package org.jitsi.meet.sdk;
 
 import android.app.Activity;
-import android.app.Application;
 import android.content.Context;
 import android.os.Bundle;
 import android.util.AttributeSet;
@@ -36,7 +35,7 @@ public class JitsiMeetView extends FrameLayout {
     /**
      * Background color. Should match the background color set in JS.
      */
-    public static final int BACKGROUND_COLOR = 0xFF040404;
+    private static final int BACKGROUND_COLOR = 0xFF040404;
 
     /**
      * React Native root view.
@@ -197,6 +196,8 @@ public class JitsiMeetView extends FrameLayout {
         }
 
         setBackgroundColor(BACKGROUND_COLOR);
+
+        ReactInstanceManagerHolder.initReactInstanceManager((Activity) context);
     }
 
     /**

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

@@ -10,15 +10,13 @@ package org.jitsi.meet.sdk;
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-import android.media.MediaCodecInfo;
 import androidx.annotation.Nullable;
 
 import com.oney.WebRTCModule.webrtcutils.SoftwareVideoDecoderFactoryProxy;
 
 import org.webrtc.EglBase;
 import org.webrtc.HardwareVideoDecoderFactory;
-import org.webrtc.JitsiPlatformVideoDecoderFactory;
-import org.webrtc.Predicate;
+import org.webrtc.PlatformSoftwareVideoDecoderFactory;
 import org.webrtc.VideoCodecInfo;
 import org.webrtc.VideoDecoder;
 import org.webrtc.VideoDecoderFactory;
@@ -33,34 +31,29 @@ import java.util.LinkedHashSet;
 public class JitsiVideoDecoderFactory implements VideoDecoderFactory {
     private final VideoDecoderFactory hardwareVideoDecoderFactory;
     private final VideoDecoderFactory softwareVideoDecoderFactory = new SoftwareVideoDecoderFactoryProxy();
-    private final VideoDecoderFactory platformSoftwareVideoDecoderFactory;
-
-    /**
-     * Predicate to filter out the AV1 hardware decoder, as we've seen decoding issues with it.
-     */
-    private static final String GOOGLE_AV1_DECODER = "c2.google.av1";
-    private static final Predicate<MediaCodecInfo> hwCodecPredicate = arg -> {
-        // Filter out the Google AV1 codec.
-        return !arg.getName().startsWith(GOOGLE_AV1_DECODER);
-    };
-    private static final Predicate<MediaCodecInfo> swCodecPredicate = arg -> {
-        // Noop, just making sure we can customize it easily if needed.
-        return true;
-    };
+    private final @Nullable VideoDecoderFactory platformSoftwareVideoDecoderFactory;
 
     /**
      * Create decoder factory using default hardware decoder factory.
      */
     public JitsiVideoDecoderFactory(@Nullable EglBase.Context eglContext) {
-        this.hardwareVideoDecoderFactory = new HardwareVideoDecoderFactory(eglContext, hwCodecPredicate);
-        this.platformSoftwareVideoDecoderFactory = new JitsiPlatformVideoDecoderFactory(eglContext, swCodecPredicate);
+        this.hardwareVideoDecoderFactory = new HardwareVideoDecoderFactory(eglContext);
+        this.platformSoftwareVideoDecoderFactory = new PlatformSoftwareVideoDecoderFactory(eglContext);
+    }
+
+    /**
+     * Create decoder factory using explicit hardware decoder factory.
+     */
+    JitsiVideoDecoderFactory(VideoDecoderFactory hardwareVideoDecoderFactory) {
+        this.hardwareVideoDecoderFactory = hardwareVideoDecoderFactory;
+        this.platformSoftwareVideoDecoderFactory = null;
     }
 
     @Override
     public @Nullable VideoDecoder createDecoder(VideoCodecInfo codecType) {
         VideoDecoder softwareDecoder = softwareVideoDecoderFactory.createDecoder(codecType);
         final VideoDecoder hardwareDecoder = hardwareVideoDecoderFactory.createDecoder(codecType);
-        if (softwareDecoder == null) {
+        if (softwareDecoder == null && platformSoftwareVideoDecoderFactory != null) {
             softwareDecoder = platformSoftwareVideoDecoderFactory.createDecoder(codecType);
         }
         if (hardwareDecoder != null && softwareDecoder != null) {
@@ -77,7 +70,10 @@ public class JitsiVideoDecoderFactory implements VideoDecoderFactory {
 
         supportedCodecInfos.addAll(Arrays.asList(softwareVideoDecoderFactory.getSupportedCodecs()));
         supportedCodecInfos.addAll(Arrays.asList(hardwareVideoDecoderFactory.getSupportedCodecs()));
-        supportedCodecInfos.addAll(Arrays.asList(platformSoftwareVideoDecoderFactory.getSupportedCodecs()));
+        if (platformSoftwareVideoDecoderFactory != null) {
+            supportedCodecInfos.addAll(
+                Arrays.asList(platformSoftwareVideoDecoderFactory.getSupportedCodecs()));
+        }
 
         return supportedCodecInfos.toArray(new VideoCodecInfo[supportedCodecInfos.size()]);
     }

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

@@ -17,7 +17,7 @@
 package org.jitsi.meet.sdk;
 
 import android.annotation.SuppressLint;
-import android.app.Application;
+import android.app.Activity;
 
 import androidx.annotation.Nullable;
 
@@ -33,6 +33,7 @@ import com.facebook.react.uimanager.ViewManager;
 import com.oney.WebRTCModule.EglUtils;
 import com.oney.WebRTCModule.WebRTCModuleOptions;
 
+import org.devio.rn.splashscreen.SplashScreenModule;
 import org.jitsi.meet.sdk.log.JitsiMeetLogger;
 import org.webrtc.EglBase;
 
@@ -64,8 +65,10 @@ class ReactInstanceManagerHolder {
                 new AudioModeModule(reactContext),
                 new DropboxModule(reactContext),
                 new ExternalAPIModule(reactContext),
+                new JavaScriptSandboxModule(reactContext),
                 new LocaleDetector(reactContext),
                 new LogBridgeModule(reactContext),
+                new SplashScreenModule(reactContext),
                 new PictureInPictureModule(reactContext),
                 new ProximityModule(reactContext),
                 new org.jitsi.meet.sdk.net.NAT64AddrInfoModule(reactContext)));
@@ -87,7 +90,7 @@ class ReactInstanceManagerHolder {
             new com.reactnativecommunity.asyncstorage.AsyncStoragePackage(),
             new com.ocetnik.timer.BackgroundTimerPackage(),
             new com.calendarevents.RNCalendarEventsPackage(),
-            new com.sayem.keepawake.KCKeepAwakePackage(),
+            new com.corbt.keepawake.KCKeepAwakePackage(),
             new com.facebook.react.shell.MainReactPackage(),
             new com.reactnativecommunity.clipboard.ClipboardPackage(),
             new com.reactnativecommunity.netinfo.NetInfoPackage(),
@@ -101,13 +104,12 @@ class ReactInstanceManagerHolder {
             new com.oney.WebRTCModule.WebRTCModulePackage(),
             new com.swmansion.gesturehandler.RNGestureHandlerPackage(),
             new org.linusu.RNGetRandomValuesPackage(),
+            new com.rnimmersivemode.RNImmersiveModePackage(),
             new com.swmansion.rnscreens.RNScreensPackage(),
             new com.zmxv.RNSound.RNSoundPackage(),
             new com.th3rdwave.safeareacontext.SafeAreaContextPackage(),
             new com.horcrux.svg.SvgPackage(),
             new org.wonday.orientation.OrientationPackage(),
-            new com.splashview.SplashViewPackage(),
-            new com.worklets.WorkletsCorePackage(),
             new ReactPackageAdapter() {
                 @Override
                 public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
@@ -131,7 +133,7 @@ class ReactInstanceManagerHolder {
 
         // GiphyReactNativeSdkPackage
         try {
-            Class<?> giphyPackageClass = Class.forName("com.giphyreactnativesdk.RTNGiphySdkPackage");
+            Class<?> giphyPackageClass = Class.forName("com.giphyreactnativesdk.GiphyReactNativeSdkPackage");
             Constructor<?> constructor = giphyPackageClass.getConstructor();
             packages.add((ReactPackage)constructor.newInstance());
         } catch (Exception e) {
@@ -206,9 +208,9 @@ class ReactInstanceManagerHolder {
      * time. All {@code ReactRootView} instances will be tied to the one and
      * only {@code ReactInstanceManager}.
      *
-     * @param app {@code Application}
+     * @param activity {@code Activity} current running Activity.
      */
-    static void initReactInstanceManager(Application app) {
+    static void initReactInstanceManager(Activity activity) {
         if (reactInstanceManager != null) {
             return;
         }
@@ -230,14 +232,14 @@ class ReactInstanceManagerHolder {
 
         reactInstanceManager
             = ReactInstanceManager.builder()
-                .setApplication(app)
-                .setCurrentActivity(null)
+                .setApplication(activity.getApplication())
+                .setCurrentActivity(activity)
                 .setBundleAssetName("index.android.bundle")
                 .setJSMainModulePath("index.android")
                 .setJavaScriptExecutorFactory(new HermesExecutorFactory())
                 .addPackages(getReactNativePackages())
                 .setUseDeveloperSupport(BuildConfig.DEBUG)
-                .setInitialLifecycleState(LifecycleState.BEFORE_CREATE)
+                .setInitialLifecycleState(LifecycleState.RESUMED)
                 .build();
     }
 }

android/sdk/src/main/java/org/webrtc/JitsiPlatformVideoDecoderFactory.java

@@ -1,40 +0,0 @@
-/*
- *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-package org.webrtc;
-
-import android.media.MediaCodecInfo;
-import androidx.annotation.Nullable;
-
-/** Factory for Android platform software VideoDecoders. */
-public class JitsiPlatformVideoDecoderFactory extends MediaCodecVideoDecoderFactory {
-    /**
-     * Default allowed predicate.
-     */
-    private static final Predicate<MediaCodecInfo> defaultAllowedPredicate =
-        codecInfo -> {
-            // We only want to use the platform software codecs.
-            return MediaCodecUtils.isSoftwareOnly(codecInfo);
-        };
-
-    /**
-     * Creates a PlatformSoftwareVideoDecoderFactory that supports surface texture rendering.
-     *
-     * @param sharedContext The textures generated will be accessible from this context. May be null,
-     *                      this disables texture support.
-     */
-    public JitsiPlatformVideoDecoderFactory(@Nullable EglBase.Context sharedContext) {
-        super(sharedContext, defaultAllowedPredicate);
-    }
-
-    public JitsiPlatformVideoDecoderFactory(@Nullable EglBase.Context sharedContext, @Nullable Predicate<MediaCodecInfo> codecAllowedPredicate) {
-        super(sharedContext, codecAllowedPredicate == null ? defaultAllowedPredicate : codecAllowedPredicate.and(defaultAllowedPredicate));
-    }
-}

android/sdk/src/main/res/values/colors.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="navigationBarColor">#040404</color>
-    <color name="statusBarColor">#040404</color>
-</resources>

android/sdk/src/main/res/values/styles.xml

@@ -1,6 +1,3 @@
 <resources>
-    <style name="JitsiMeetActivityStyle" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:navigationBarColor">@color/navigationBarColor</item>
-        <item name="android:statusBarColor">@color/statusBarColor</item>
-    </style>
+    <style name="JitsiMeetActivityStyle" parent="Theme.AppCompat.Light.NoActionBar"/>
 </resources>

android/settings.gradle

@@ -1,7 +1,9 @@
+rootProject.name = 'jitsi-meet'
+
 include ':app', ':sdk'
 
 include ':react-native-amplitude'
-project(':react-native-amplitude').projectDir = new File(rootProject.projectDir, '../node_modules/@amplitude/analytics-react-native/android')
+project(':react-native-amplitude').projectDir = new File(rootProject.projectDir, '../node_modules/@amplitude/react-native/android')
 include ':react-native-async-storage'
 project(':react-native-async-storage').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-async-storage/async-storage/android')
 include ':react-native-background-timer'
@@ -24,8 +26,10 @@ include ':react-native-giphy'
 project(':react-native-giphy').projectDir = new File(rootProject.projectDir, '../node_modules/@giphy/react-native-sdk/android')
 include ':react-native-google-signin'
 project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-google-signin/google-signin/android')
+include ':react-native-immersive-mode'
+project(':react-native-immersive-mode').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-immersive-mode/android')
 include ':react-native-keep-awake'
-project(':react-native-keep-awake').projectDir = new File(rootProject.projectDir, '../node_modules/@sayem314/react-native-keep-awake/android')
+project(':react-native-keep-awake').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-keep-awake/android')
 include ':react-native-orientation-locker'
 project(':react-native-orientation-locker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-orientation-locker/android')
 include ':react-native-pager-view'
@@ -40,8 +44,8 @@ include ':react-native-slider'
 project(':react-native-slider').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/slider/android')
 include ':react-native-sound'
 project(':react-native-sound').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-sound/android')
-include ':react-native-splash-view'
-project(':react-native-splash-view').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-splash-view/android')
+include ':react-native-splash-screen'
+project(':react-native-splash-screen').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-splash-screen/android')
 include ':react-native-svg'
 project(':react-native-svg').projectDir = new File(rootProject.projectDir, 	'../node_modules/react-native-svg/android')
 include ':react-native-video'
@@ -50,5 +54,3 @@ include ':react-native-webrtc'
 project(':react-native-webrtc').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webrtc/android')
 include ':react-native-webview'
 project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
-include ':react-native-worklets-core'
-project(':react-native-worklets-core').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-worklets-core/android')

babel.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-    presets: [ 'module:@react-native/babel-preset' ],
+    presets: [ 'module:metro-react-native-babel-preset' ],
     env: {
         production: {
             plugins: [ 'react-native-paper/babel' ]
@@ -8,13 +8,9 @@ module.exports = {
 
     // This happens because react native has conflict with @babel/plugin-transform-private-methods plugin
     // https://github.com/ethers-io/ethers.js/discussions/4309#discussioncomment-6694524
-    plugins: [
-        'optional-require',
-        [
-            '@babel/plugin-transform-private-methods', {
-                'loose': true
-            }
-        ],
-        'react-native-worklets-core/plugin'
+    plugins: [ 'optional-require',
+        [ '@babel/plugin-transform-private-methods', {
+            'loose': true
+        } ]
     ]
 };

conference.js

@@ -18,6 +18,8 @@ import {
     maybeRedirectToWelcomePage,
     reloadWithStoredParams
 } from './react/features/app/actions';
+import { showModeratedNotification } from './react/features/av-moderation/actions';
+import { shouldShowModeratedNotification } from './react/features/av-moderation/functions';
 import {
     _conferenceWillJoin,
     authStatusChanged,
@@ -50,8 +52,7 @@ import {
     commonUserJoinedHandling,
     commonUserLeftHandling,
     getConferenceOptions,
-    sendLocalParticipant,
-    updateTrackMuteState
+    sendLocalParticipant
 } from './react/features/base/conference/functions';
 import { getReplaceParticipant, getSsrcRewritingFeatureFlag } from './react/features/base/config/functions';
 import { connect } from './react/features/base/connection/actions.web';
@@ -88,7 +89,7 @@ import {
     setVideoMuted,
     setVideoUnmutePermissions
 } from './react/features/base/media/actions';
-import { MEDIA_TYPE, VIDEO_MUTISM_AUTHORITY, VIDEO_TYPE } from './react/features/base/media/constants';
+import { MEDIA_TYPE, VIDEO_TYPE } from './react/features/base/media/constants';
 import {
     getStartWithAudioMuted,
     getStartWithVideoMuted,
@@ -130,11 +131,11 @@ import {
     createLocalTracksF,
     getLocalJitsiAudioTrack,
     getLocalJitsiVideoTrack,
+    getLocalTracks,
     getLocalVideoTrack,
     isLocalTrackMuted,
     isUserInteractionRequiredForUnmute
 } from './react/features/base/tracks/functions';
-import { getLocalJitsiAudioTrackSettings } from './react/features/base/tracks/functions.web';
 import { downloadJSON } from './react/features/base/util/downloadJSON';
 import { getJitsiMeetGlobalNSConnectionTimes } from './react/features/base/util/helpers';
 import { openLeaveReasonDialog } from './react/features/conference/actions.web';
@@ -153,20 +154,20 @@ import {
     DATA_CHANNEL_CLOSED_NOTIFICATION_ID,
     NOTIFICATION_TIMEOUT_TYPE
 } from './react/features/notifications/constants';
+import { isModerationNotificationDisplayed } from './react/features/notifications/functions';
 import { suspendDetected } from './react/features/power-monitor/actions';
 import { initPrejoin, isPrejoinPageVisible } from './react/features/prejoin/functions';
 import { disableReceiver, stopReceiver } from './react/features/remote-control/actions';
 import { setScreenAudioShareState } from './react/features/screen-share/actions.web';
 import { isScreenAudioShared } from './react/features/screen-share/functions';
 import { toggleScreenshotCaptureSummary } from './react/features/screenshot-capture/actions';
-import { setAudioSettings } from './react/features/settings/actions.web';
 import { AudioMixerEffect } from './react/features/stream-effects/audio-mixer/AudioMixerEffect';
 import { createRnnoiseProcessor } from './react/features/stream-effects/rnnoise';
 import { handleToggleVideoMuted } from './react/features/toolbox/actions.any';
 import { transcriberJoined, transcriberLeft } from './react/features/transcribing/actions';
 import { muteLocal } from './react/features/video-menu/actions.any';
 
-const logger = Logger.getLogger('app:conference-web');
+const logger = Logger.getLogger(__filename);
 let room;
 
 /*
@@ -205,6 +206,23 @@ function sendData(command, value) {
     room.sendCommand(command, { value });
 }
 
+/**
+ * Mute or unmute local audio stream if it exists.
+ * @param {boolean} muted - if audio stream should be muted or unmuted.
+ */
+function muteLocalAudio(muted) {
+    APP.store.dispatch(setAudioMuted(muted));
+}
+
+/**
+ * Mute or unmute local video stream if it exists.
+ * @param {boolean} muted if video stream should be muted or unmuted.
+ *
+ */
+function muteLocalVideo(muted) {
+    APP.store.dispatch(setVideoMuted(muted));
+}
+
 /**
  * A queue for the async replaceLocalTrack action so that multiple audio
  * replacements cannot happen simultaneously. This solves the issue where
@@ -568,15 +586,7 @@ export default {
                 if (browser.isWebKitBased()) {
                     this.muteAudio(true, true);
                 } else {
-                    localTracks = localTracks.filter(track => {
-                        if (track.getType() === MEDIA_TYPE.AUDIO) {
-                            track.stopStream();
-
-                            return false;
-                        }
-
-                        return true;
-                    });
+                    localTracks = localTracks.filter(track => track.getType() !== MEDIA_TYPE.AUDIO);
                 }
             }
 
@@ -699,10 +709,11 @@ export default {
      * Simulates toolbar button click for audio mute. Used by shortcuts and API.
      *
      * @param {boolean} mute true for mute and false for unmute.
+     * @param {boolean} [showUI] when set to false will not display any error
      * dialogs in case of media permissions error.
      * @returns {Promise}
      */
-    async muteAudio(mute) {
+    async muteAudio(mute, showUI = true) {
         const state = APP.store.getState();
 
         if (!mute
@@ -712,7 +723,56 @@ export default {
             return;
         }
 
-        await APP.store.dispatch(setAudioMuted(mute, true));
+        // check for A/V Moderation when trying to unmute
+        if (!mute && shouldShowModeratedNotification(MEDIA_TYPE.AUDIO, state)) {
+            if (!isModerationNotificationDisplayed(MEDIA_TYPE.AUDIO, state)) {
+                APP.store.dispatch(showModeratedNotification(MEDIA_TYPE.AUDIO));
+            }
+
+            return;
+        }
+
+        // Not ready to modify track's state yet
+        if (!this._localTracksInitialized) {
+            // This will only modify base/media.audio.muted which is then synced
+            // up with the track at the end of local tracks initialization.
+            muteLocalAudio(mute);
+            this.updateAudioIconEnabled();
+
+            return;
+        } else if (this.isLocalAudioMuted() === mute) {
+            // NO-OP
+            return;
+        }
+
+        const localAudio = getLocalJitsiAudioTrack(APP.store.getState());
+
+        if (!localAudio && !mute) {
+            const maybeShowErrorDialog = error => {
+                showUI && APP.store.dispatch(notifyMicError(error));
+            };
+
+            APP.store.dispatch(gumPending([ MEDIA_TYPE.AUDIO ], IGUMPendingState.PENDING_UNMUTE));
+
+            await createLocalTracksF({ devices: [ 'audio' ] })
+                .then(([ audioTrack ]) => audioTrack)
+                .catch(error => {
+                    maybeShowErrorDialog(error);
+
+                    // Rollback the audio muted status by using null track
+                    return null;
+                })
+                .then(async audioTrack => {
+                    await this._maybeApplyAudioMixerEffect(audioTrack);
+
+                    return this.useAudioStream(audioTrack);
+                })
+                .finally(() => {
+                    APP.store.dispatch(gumPending([ MEDIA_TYPE.AUDIO ], IGUMPendingState.NONE));
+                });
+        } else {
+            muteLocalAudio(mute);
+        }
     },
 
     /**
@@ -742,9 +802,16 @@ export default {
     /**
      * Simulates toolbar button click for video mute. Used by shortcuts and API.
      * @param mute true for mute and false for unmute.
+     * @param {boolean} [showUI] when set to false will not display any error
      * dialogs in case of media permissions error.
      */
-    muteVideo(mute) {
+    muteVideo(mute, showUI = true) {
+        if (this.videoSwitchInProgress) {
+            logger.warn('muteVideo - unable to perform operations while video switch is in progress');
+
+            return;
+        }
+
         const state = APP.store.getState();
 
         if (!mute
@@ -754,7 +821,65 @@ export default {
             return;
         }
 
-        APP.store.dispatch(setVideoMuted(mute, VIDEO_MUTISM_AUTHORITY.USER, true));
+        // check for A/V Moderation when trying to unmute and return early
+        if (!mute && shouldShowModeratedNotification(MEDIA_TYPE.VIDEO, state)) {
+            return;
+        }
+
+        // If not ready to modify track's state yet adjust the base/media
+        if (!this._localTracksInitialized) {
+            // This will only modify base/media.video.muted which is then synced
+            // up with the track at the end of local tracks initialization.
+            muteLocalVideo(mute);
+            this.setVideoMuteStatus();
+
+            return;
+        } else if (this.isLocalVideoMuted() === mute) {
+            // NO-OP
+            return;
+        }
+
+        const localVideo = getLocalJitsiVideoTrack(state);
+
+        if (!localVideo && !mute && !this.isCreatingLocalTrack) {
+            const maybeShowErrorDialog = error => {
+                showUI && APP.store.dispatch(notifyCameraError(error));
+            };
+
+            this.isCreatingLocalTrack = true;
+
+            APP.store.dispatch(gumPending([ MEDIA_TYPE.VIDEO ], IGUMPendingState.PENDING_UNMUTE));
+
+            // Try to create local video if there wasn't any.
+            // This handles the case when user joined with no video
+            // (dismissed screen sharing screen or in audio only mode), but
+            // decided to add it later on by clicking on muted video icon or
+            // turning off the audio only mode.
+            //
+            // FIXME when local track creation is moved to react/redux
+            // it should take care of the use case described above
+            createLocalTracksF({ devices: [ 'video' ] })
+                .then(([ videoTrack ]) => videoTrack)
+                .catch(error => {
+                    // FIXME should send some feedback to the API on error ?
+                    maybeShowErrorDialog(error);
+
+                    // Rollback the video muted status by using null track
+                    return null;
+                })
+                .then(videoTrack => {
+                    logger.debug(`muteVideo: calling useVideoStream for track: ${videoTrack}`);
+
+                    return this.useVideoStream(videoTrack);
+                })
+                .finally(() => {
+                    this.isCreatingLocalTrack = false;
+                    APP.store.dispatch(gumPending([ MEDIA_TYPE.VIDEO ], IGUMPendingState.NONE));
+                });
+        } else {
+            // FIXME show error dialog if it fails (should be handled by react)
+            muteLocalVideo(mute);
+        }
     },
 
     /**
@@ -1007,6 +1132,7 @@ export default {
 
         // Restore initial state.
         this._localTracksInitialized = false;
+        this.isSharingScreen = false;
         this.roomName = roomName;
 
         const { tryCreateLocalTracks, errors } = this.createInitialLocalTracks(options);
@@ -1185,6 +1311,8 @@ export default {
         return Boolean(APP.store.getState()['features/base/audio-only'].enabled);
     },
 
+    videoSwitchInProgress: false,
+
     /**
      * This fields stores a handler which will create a Promise which turns off
      * the screen sharing and restores the previous video state (was there
@@ -1213,6 +1341,7 @@ export default {
      */
     async _turnScreenSharingOff(didHaveVideo, ignoreDidHaveVideo) {
         this._untoggleScreenSharing = null;
+        this.videoSwitchInProgress = true;
 
         APP.store.dispatch(stopReceiver());
 
@@ -1264,11 +1393,13 @@ export default {
 
         return promise.then(
             () => {
+                this.videoSwitchInProgress = false;
                 sendAnalytics(createScreenSharingEvent('stopped',
                     duration === 0 ? null : duration));
                 logger.info('Screen sharing stopped.');
             },
             error => {
+                this.videoSwitchInProgress = false;
                 logger.error(`_turnScreenSharingOff failed: ${error}`);
 
                 throw error;
@@ -1298,13 +1429,14 @@ export default {
             this._untoggleScreenSharing
                 = this._turnScreenSharingOff.bind(this, didHaveVideo);
 
+            const desktopVideoStream = desktopStreams.find(stream => stream.getType() === MEDIA_TYPE.VIDEO);
             const desktopAudioStream = desktopStreams.find(stream => stream.getType() === MEDIA_TYPE.AUDIO);
 
             if (desktopAudioStream) {
                 desktopAudioStream.on(
                     JitsiTrackEvents.LOCAL_TRACK_STOPPED,
                     () => {
-                        logger.debug('Local screensharing audio track stopped.');
+                        logger.debug(`Local screensharing audio track stopped. ${this.isSharingScreen}`);
 
                         // Handle case where screen share was stopped from  the browsers 'screen share in progress'
                         // window. If audio screen sharing is stopped via the normal UX flow this point shouldn't
@@ -1316,6 +1448,21 @@ export default {
                 );
             }
 
+            if (desktopVideoStream) {
+                desktopVideoStream.on(
+                    JitsiTrackEvents.LOCAL_TRACK_STOPPED,
+                    () => {
+                        logger.debug(`Local screensharing track stopped. ${this.isSharingScreen}`);
+
+                        // If the stream was stopped during screen sharing
+                        // session then we should switch back to video.
+                        this.isSharingScreen
+                            && this._untoggleScreenSharing
+                            && this._untoggleScreenSharing();
+                    }
+                );
+            }
+
             return desktopStreams;
         }, error => {
             throw error;
@@ -1375,7 +1522,7 @@ export default {
             }
 
             APP.store.dispatch(updateRemoteParticipantFeatures(user));
-            logger.log(`USER ${id} connected`);
+            logger.log(`USER ${id} connected:`, user);
             APP.UI.addUser(user);
         });
 
@@ -1463,6 +1610,10 @@ export default {
         room.on(JitsiConferenceEvents.TRACK_MUTE_CHANGED, (track, participantThatMutedUs) => {
             if (participantThatMutedUs) {
                 APP.store.dispatch(participantMutedUs(participantThatMutedUs, track));
+                if (this.isSharingScreen && track.isVideoTrack()) {
+                    logger.debug('TRACK_MUTE_CHANGED while screen sharing');
+                    this._turnScreenSharingOff(false);
+                }
             }
         });
 
@@ -1674,14 +1825,39 @@ export default {
         room.on(
             JitsiConferenceEvents.START_MUTED_POLICY_CHANGED,
             ({ audio, video }) => {
-                APP.store.dispatch(onStartMutedPolicyChanged(audio, video));
-
-                const state = APP.store.getState();
-
-                updateTrackMuteState(state, APP.store.dispatch, true);
-                updateTrackMuteState(state, APP.store.dispatch, false);
+                APP.store.dispatch(
+                    onStartMutedPolicyChanged(audio, video));
             }
         );
+        room.on(JitsiConferenceEvents.STARTED_MUTED, () => {
+            const audioMuted = room.isStartAudioMuted();
+            const videoMuted = room.isStartVideoMuted();
+            const localTracks = getLocalTracks(APP.store.getState()['features/base/tracks']);
+            const promises = [];
+
+            APP.store.dispatch(setAudioMuted(audioMuted));
+            APP.store.dispatch(setVideoMuted(videoMuted));
+
+            // Remove the tracks from the peerconnection.
+            for (const track of localTracks) {
+                // Always add the track on Safari because of a known issue where audio playout doesn't happen
+                // if the user joins audio and video muted, i.e., if there is no local media capture.
+                if (audioMuted && track.jitsiTrack?.getType() === MEDIA_TYPE.AUDIO && !browser.isWebKitBased()) {
+                    promises.push(this.useAudioStream(null));
+                }
+                if (videoMuted && track.jitsiTrack?.getType() === MEDIA_TYPE.VIDEO) {
+                    promises.push(this.useVideoStream(null));
+                }
+            }
+
+            Promise.allSettled(promises)
+                .then(() => {
+                    APP.store.dispatch(showNotification({
+                        titleKey: 'notify.mutedTitle',
+                        descriptionKey: 'notify.muted'
+                    }, NOTIFICATION_TIMEOUT_TYPE.SHORT));
+                });
+        });
 
         room.on(
             JitsiConferenceEvents.DATA_CHANNEL_OPENED, () => {
@@ -1773,11 +1949,7 @@ export default {
             return this.useAudioStream(stream);
         })
         .then(() => {
-            const state = APP.store.getState();
-            const localAudio = getLocalJitsiAudioTrack(state);
-            const settings = getLocalJitsiAudioTrackSettings(state);
-
-            APP.store.dispatch(setAudioSettings(settings));
+            const localAudio = getLocalJitsiAudioTrack(APP.store.getState());
 
             if (localAudio && isDefaultMicSelected) {
                 // workaround for the default device to be shown as selected in the
@@ -1897,7 +2069,8 @@ export default {
     _initDeviceList(setDeviceListChangeHandler = false) {
         const { mediaDevices } = JitsiMeetJS;
 
-        if (mediaDevices.isDeviceChangeAvailable()) {
+        if (mediaDevices.isDeviceListAvailable()
+                && mediaDevices.isDeviceChangeAvailable()) {
             if (setDeviceListChangeHandler) {
                 this.deviceChangeListener = devices =>
                     window.setTimeout(() => this._onDeviceListChanged(devices), 0);

config.js

@@ -117,11 +117,6 @@ var config = {
 
         // Will replace ice candidates IPs with invalid ones in order to fail ice.
         // failICE: true,
-
-        // When running on Spot TV, this controls whether to show the recording consent dialog.
-        // If false (default), Spot instances will not show the recording consent dialog.
-        // If true, Spot instances will show the recording consent dialog like regular clients.
-        // showSpotConsentDialog: false,
     },
 
     // Disables moderator indicators.
@@ -133,15 +128,9 @@ var config = {
     // Disables the reactions moderation feature.
     // disableReactionsModeration: false,
 
-    // Disables the reactions in chat feature.
-    // disableReactionsInChat: false,
-
     // Disables polls feature.
     // disablePolls: false,
 
-    // Disables chat feature entirely including notifications, sounds, and private messages.
-    // disableChat: false,
-
     // Disables demote button from self-view
     // disableSelfDemote: false,
 
@@ -366,7 +355,6 @@ var config = {
     // Desktop sharing
 
     // Optional desktop sharing frame rate options. Default value: min:5, max:5.
-    // Setting higher min/max values will affect the resolution, it makes it worse.
     // desktopSharingFrameRate: {
     //     min: 5,
     //     max: 5,
@@ -413,10 +401,6 @@ var config = {
     //    // If true, mutes audio and video when a recording begins and displays a dialog
     //    // explaining the effect of unmuting.
     //    // requireConsent: true,
-    //    // If true consent will be skipped for users who are already in the meeting.
-    //    // skipConsentInMeeting: true,
-    //    // Link for the recording consent dialog's "Learn more" link.
-    //    // consentLearnMoreLink: 'https://jitsi.org/meet/consent',
     // },
 
     // recordingService: {
@@ -514,15 +498,6 @@ var config = {
     //     // Enables automatic request of subtitles when transcriber is present in the meeting, uses the default
     //     // language that is set
     //     autoCaptionOnTranscribe: false,
-    //
-    //     // Disables everything related to closed captions - the tab in the chat area, the button in the menu,
-    //     // subtitles on stage and the "Show subtitles on stage" checkbox in the settings.
-    //     // Note: Starting transcriptions from the recording dialog will still work.
-    //     disableClosedCaptions: false,
-
-    //     // Whether to invite jigasi when backend transcriptions are enabled (asyncTranscription is true in metadata).
-    //     // By default, we invite it.
-    //     inviteJigasiOnBackendTranscribing: true,
     // },
 
     // Misc
@@ -634,7 +609,6 @@ var config = {
     //     medium: 5000,
     //     long: 10000,
     //     extraLong: 60000,
-    //     sticky: 0,
     // },
 
     // // Options for the recording limit notification.
@@ -726,8 +700,6 @@ var config = {
     //     autoKnock: false,
     //     // Enables the lobby chat. Replaces `enableLobbyChat`.
     //     enableChat: true,
-    //     // Shows the hangup button in the lobby screen.
-    //     showHangUp: true,
     // },
 
     // Configs for the security related UI elements.
@@ -767,7 +739,7 @@ var config = {
     // hideDominantSpeakerBadge: false,
 
     // Default language for the user interface. Cannot be overwritten.
-    // For iframe integrations, use the `lang` option directly instead.
+    // DEPRECATED! Use the `lang` iframe option directly instead.
     // defaultLanguage: 'en',
 
     // Disables profile and the edit of all fields from the profile settings (display name and email)
@@ -797,6 +769,7 @@ var config = {
     // Configs for prejoin page.
     // prejoinConfig: {
     //     // When 'true', it shows an intermediate page before joining, where the user can configure their devices.
+    //     // This replaces `prejoinPageEnabled`. Defaults to true.
     //     enabled: true,
     //     // Hides the participant name editing field in the prejoin screen.
     //     // If requireDisplayName is also set as true, a name should still be provided through
@@ -808,9 +781,7 @@ var config = {
     //     // By setting preCallTestEnabled, you enable the pre-call test in the prejoin page.
     //     // ICE server credentials need to be provided over the preCallTestICEUrl
     //     preCallTestEnabled: false,
-    //     preCallTestICEUrl: '',
-    //     // Shows the hangup button in the lobby screen.
-    //     showHangUp: true,
+    //     preCallTestICEUrl: ''
     // },
 
     // When 'true', the user cannot edit the display name.
@@ -855,7 +826,8 @@ var config = {
     // some other values in config.js to be enabled. Also, the "profile" button will
     // not display for users with a JWT.
     // Notes:
-    // - it's possible to reorder the buttons in the maintoolbar by changing the order of the mainToolbarButtons
+    // - it's impossible to choose which buttons go in the "More actions" menu
+    // - it's impossible to control the placement of buttons
     // - 'desktop' controls the "Share your screen" button
     // - if `toolbarButtons` is undefined, we fallback to enabling all buttons on the UI
     // toolbarButtons: [
@@ -907,8 +879,6 @@ var config = {
     //     alwaysVisible: false,
     //     // Indicates whether the toolbar should still autohide when chat is open
     //     autoHideWhileChatIsOpen: false,
-    //     // Default background color for the main toolbar. Accepts any valid CSS color.
-    //     // backgroundColor: '#ffffff',
     // },
 
     // Overrides the buttons displayed in the main toolbar. Depending on the screen size the number of displayed
@@ -1140,6 +1110,10 @@ var config = {
         // The Amplitude APP Key:
         // amplitudeAPPKey: '<APP_KEY>',
 
+        // Enables Amplitude UTM tracking:
+        // Default value is false.
+        // amplitudeIncludeUTM: false,
+
         // Obfuscates room name sent to analytics (amplitude, rtcstats)
         // Default value is false.
         // obfuscateRoomName: false,
@@ -1283,6 +1257,9 @@ var config = {
     // disableDeepLinking: false,
 
     // The deeplinking config.
+    // For information about the properties of
+    // deeplinking.[ios/android].dynamicLink check:
+    // https://firebase.google.com/docs/dynamic-links/create-manually
     // deeplinking: {
     //
     //     // The desktop deeplinking config, disabled by default.
@@ -1311,6 +1288,13 @@ var config = {
     //         appScheme: 'org.jitsi.meet',
     //         // Custom URL for downloading ios mobile app.
     //         downloadLink: 'https://itunes.apple.com/us/app/jitsi-meet/id1165103905',
+    //         dynamicLink: {
+    //             apn: 'org.jitsi.meet',
+    //             appCode: 'w2atb',
+    //             customDomain: undefined,
+    //             ibi: 'com.atlassian.JitsiMeet.ios',
+    //             isi: '1165103905'
+    //         }
     //     },
 
     //     // The android deeplinking config.
@@ -1323,6 +1307,13 @@ var config = {
     //         // Android app package name.
     //         appPackage: 'org.jitsi.meet',
     //         fDroidUrl: 'https://f-droid.org/en/packages/org.jitsi.meet/',
+    //         dynamicLink: {
+    //             apn: 'org.jitsi.meet',
+    //             appCode: 'w2atb',
+    //             customDomain: undefined,
+    //             ibi: 'com.atlassian.JitsiMeet.ios',
+    //             isi: '1165103905'
+    //         }
     //     }
     // },
 
@@ -1370,13 +1361,18 @@ var config = {
     //     disableKick: true,
     //     // If set to true the 'Grant moderator' button will be disabled.
     //     disableGrantModerator: true,
-    //     // If set to 'all' the 'Private chat' button will be disabled for all participants.
-    //     // If set to 'allow-moderator-chat' the 'Private chat' button will be available for chats with moderators.
-    //     // If set to 'disable-visitor-chat' the 'Private chat' button will be disabled for visitor-main participant
-    //     // conversations.
-    //     disablePrivateChat: 'all' | 'allow-moderator-chat' | 'disable-visitor-chat',
+    //     // If set to true the 'Send private message' button will be disabled.
+    //     disablePrivateChat: true,
     // },
 
+    // Endpoint that enables support for salesforce integration with in-meeting resource linking
+    // This is required for:
+    // listing the most recent records - salesforceUrl/records/recents
+    // searching records - salesforceUrl/records?text=${text}
+    // retrieving record details - salesforceUrl/records/${id}?type=${type}
+    // and linking the meeting - salesforceUrl/sessions/${sessionId}/records/${id}
+    //
+    // salesforceUrl: 'https://api.example.com/',
 
     // If set to true all muting operations of remote participants will be disabled.
     // disableRemoteMute: true,
@@ -1401,13 +1397,6 @@ var config = {
         logoClickUrl: 'https://example-company.org',
         // The url used for the image used as logo
         logoImageUrl: 'https://example.com/logo-img.png',
-        // Endpoint that enables support for salesforce integration with in-meeting resource linking
-        // This is required for:
-        // listing the most recent records - salesforceUrl/records/recents
-        // searching records - salesforceUrl/records?text=${text}
-        // retrieving record details - salesforceUrl/records/${id}?type=${type}
-        // and linking the meeting - salesforceUrl/sessions/${sessionId}/records/${id}
-        // salesforceUrl: 'https://api.example.com/',
         // Overwrite for pool of background images for avatars
         avatarBackgrounds: ['url(https://example.com/avatar-background-1.png)', '#FFF'],
         // The lobby/prejoin screen background
@@ -1589,9 +1578,6 @@ var config = {
     // tokenAuthUrlAutoRedirect: false
     // An option to respect the context.tenant jwt field compared to the current tenant from the url
     // tokenRespectTenant: false,
-    // An option to get for user info (name, picture, email) in the token outside the user context.
-    // Can be used with Firebase tokens.
-    // tokenGetUserInfoOutOfContext: false,
 
     // You can put an array of values to target different entity types in the invite dialog.
     // Valid values are "phone", "room", "sip", "user", "videosipgw" and "email"
@@ -1612,10 +1598,6 @@ var config = {
     //         audio: true,
     //         video: true
     //     },
-    //     // Hides the visitor count for visitors.
-    //     // hideVisitorCountForVisitors: false,
-    //     // Whether to show the join meeting dialog when joining as a visitor.
-    //     // showJoinMeetingDialog: true,
     // },
     // The default type of desktop sharing sources that will be used in the electron app.
     // desktopSharingSources: ['screen', 'window'],
@@ -1795,13 +1777,6 @@ var config = {
     //     // The minimum number of participants that must be in the call for
     //     // the top panel layout to be used.
     //     minParticipantCountForTopPanel: 50,
-
-    //     // The width of the filmstrip on joining meeting. Can be resized afterwards.
-    //     initialWidth: 400,
-
-    //     // Whether the draggable resize bar of the filmstrip is always visible. Setting this to true will make
-    //     // the filmstrip always visible in case `disableResizable` is false.
-    //     alwaysShowResizeBar: true,
     // },
 
     // Tile view related config options.
@@ -1903,16 +1878,6 @@ var config = {
 
     // If true remove the tint foreground on focused user camera in filmstrip
     // disableCameraTintForeground: false,
-
-    // File sharign service.
-    // fileSharing: {
-    //     // The URL of the file sharing service API. See resources/file-sharing.yaml for more details.
-    //     apiUrl: 'https://example.com',
-    //     // Whether the file sharing service is enabled or not.
-    //     enabled: true,
-    //     // Maximum file size limit (-1 value disables any file size limit check)
-    //     maxFileSize: 50,
-    // },
 };
 
 // Set the default values for JaaS customers

css/_chat.scss

@@ -141,6 +141,32 @@
     left: 0;
 }
 
+.smileys-panel {
+    bottom: 100%;
+    box-sizing: border-box;
+    background-color: rgba(0, 0, 0, .6) !important;
+    height: auto;
+    display: flex;
+    overflow: hidden;
+    position: absolute;
+    width: calc(#{$sidebarWidth} - 32px);
+    margin-bottom: 5px;
+    margin-left: -5px;
+
+    /**
+     * CSS transitions do not apply for auto dimensions. So to produce the css
+     * accordion effect for showing and hiding the smiley-panel, while allowing
+     * for variable panel, height, use a very large max-height and animate off
+     * of that.
+     */
+    transition: max-height 0.3s;
+
+    #smileysContainer {
+        background-color: $chatBackgroundColor;
+        border-top: 1px solid #A4B8D1;
+    }
+}
+
 #smileysContainer .smiley {
     font-size: 1.625rem;
 }

css/_participants-pane.scss

@@ -4,3 +4,9 @@
         border-radius: 3px;
     }
 }
+
+.mobile-browser.shift-right {
+    .participants_pane {
+        z-index: -1;
+    }
+}

css/_responsive.scss

@@ -60,3 +60,21 @@
         }
     }
 }
+
+.desktop-browser {
+    &.shift-right {
+
+        @media only screen and (max-width: $verySmallScreen + $sidebarWidth) {
+
+            #videoResolutionLabel {
+                display: none;
+            }
+            .vertical-filmstrip .filmstrip {
+                display: none;
+            }
+            .chrome-extension-banner {
+                display: none;
+            }
+        }
+    }
+}

css/_variables.scss

@@ -22,6 +22,7 @@ $newToolbarSizeWithPadding: calc(#{$newToolbarSize} + 24px);
  * Chat
  */
 $chatBackgroundColor: #131519;
+$sidebarWidth: 315px;
 
 /**
  * Misc.
@@ -90,7 +91,7 @@ $welcomePageHeaderContainerMargin: $welcomePageHeaderContainerMarginTop auto 0;
 $welcomePageHeaderTextTitleMarginBottom: 0;
 $welcomePageHeaderTextTitleFontSize: 2.625rem;
 $welcomePageHeaderTextTitleFontWeight: normal;
-$welcomePageHeaderTextTitleLineHeight: 3.125rem;
+$welcomePageHeaderTextTitleLineHeight: 50px;
 $welcomePageHeaderTextTitleOpacity: 1;
 
 $welcomePageEnterRoomDisplay: flex;

css/filmstrip/_tile_view.scss

@@ -91,3 +91,15 @@
         }
     }
 }
+
+.shift-right .remote-videos > div {
+    /**
+     * Max-width corresponding to the ASPECT_RATIO_BREAKPOINT from features/filmstrip/constants,
+     * from which we subtract the chat size.
+     */
+    @media only screen and (max-width: calc(500px + #{$sidebarWidth})) {
+        video {
+            object-fit: cover;
+        }
+    }
+}

debian/jitsi-meet-prosody.postinst

@@ -154,16 +154,6 @@ case "$1" in
             PROSODY_CONFIG_PRESENT="false"
         fi
 
-        # Start using the polls component
-        if ! grep -q "Component \"polls.$JVB_HOSTNAME\"" $PROSODY_HOST_CONFIG ;then
-            echo -e "\nComponent \"polls.$JVB_HOSTNAME\" \"polls_component\"" >> $PROSODY_HOST_CONFIG
-            PROSODY_CONFIG_PRESENT="false"
-        fi
-        if ! grep -q -- '--"polls";' $PROSODY_HOST_CONFIG ;then
-            sed -i "s/\"polls\";/--\"polls\";/g" $PROSODY_HOST_CONFIG
-            PROSODY_CONFIG_PRESENT="false"
-        fi
-
         # Old versions of jitsi-meet-prosody come with the extra plugin path commented out (https://github.com/jitsi/jitsi-meet/commit/e11d4d3101e5228bf956a69a9e8da73d0aee7949)
         # Make sure it is uncommented, as it contains required modules.
         if grep -q -- '--plugin_paths = { "/usr/share/jitsi-meet/prosody-plugins/" }' $PROSODY_HOST_CONFIG ;then

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

@@ -58,21 +58,28 @@ VirtualHost "jitmeet.example.com"
         key = "/etc/prosody/certs/jitmeet.example.com.key";
         certificate = "/etc/prosody/certs/jitmeet.example.com.crt";
     }
+    av_moderation_component = "avmoderation.jitmeet.example.com"
+    speakerstats_component = "speakerstats.jitmeet.example.com"
+    end_conference_component = "endconference.jitmeet.example.com"
     -- we need bosh
     modules_enabled = {
         "bosh";
         "websocket";
         "smacks";
         "ping"; -- Enable mod_ping
+        "speakerstats";
         "external_services";
-        "features_identity";
         "conference_duration";
+        "end_conference";
         "muc_lobby_rooms";
         "muc_breakout_rooms";
+        "av_moderation";
+        "room_metadata";
     }
     c2s_require_encryption = false
     lobby_muc = "lobby.jitmeet.example.com"
     breakout_rooms_muc = "breakout.jitmeet.example.com"
+    room_metadata_component = "metadata.jitmeet.example.com"
     main_muc = "conference.jitmeet.example.com"
     -- muc_lobby_whitelist = { "recorder.jitmeet.example.com" } -- Here we can whitelist jibri to enter lobby enabled rooms
 
@@ -83,6 +90,7 @@ Component "conference.jitmeet.example.com" "muc"
         "muc_hide_all";
         "muc_meeting_id";
         "muc_domain_mapper";
+        "polls";
         --"token_verification";
         "muc_rate_limit";
         "muc_password_whitelist";
@@ -147,9 +155,6 @@ Component "endconference.jitmeet.example.com" "end_conference"
 Component "avmoderation.jitmeet.example.com" "av_moderation_component"
     muc_component = "conference.jitmeet.example.com"
 
-Component "filesharing.jitmeet.example.com" "filesharing_component"
-    muc_component = "conference.jitmeet.example.com"
-
 Component "lobby.jitmeet.example.com" "muc"
     storage = "memory"
     restrict_room_creation = true
@@ -158,10 +163,9 @@ Component "lobby.jitmeet.example.com" "muc"
     modules_enabled = {
         "muc_hide_all";
         "muc_rate_limit";
+        "polls";
     }
 
 Component "metadata.jitmeet.example.com" "room_metadata_component"
     muc_component = "conference.jitmeet.example.com"
     breakout_rooms_component = "breakout.jitmeet.example.com"
-
-Component "polls.jitmeet.example.com" "polls_component"

giphy-analytics-stub.js

@@ -1,16 +0,0 @@
-// Stub replacement for @giphy/js-analytics to prevent beforeunload handlers
-// This completely disables all Giphy analytics functionality
-
-export const pingback = () => {
-    // Completely disabled - do nothing
-
-};
-
-export const mergeAttributes = (attributes, newAttributes) => {
-    // Return merged attributes without any analytics calls
-    return { ...attributes,
-        ...newAttributes };
-};
-
-// Ensure no beforeunload handlers are ever registered
-export default pingback;

interface_config.js

@@ -192,6 +192,17 @@ var interfaceConfig = {
 
     // NATIVE_APP_NAME: 'Jitsi Meet',
 
+    /**
+     * Specify Firebase dynamic link properties for the mobile apps.
+     */
+    // MOBILE_DYNAMIC_LINK: {
+    //    APN: 'org.jitsi.meet',
+    //    APP_CODE: 'w2atb',
+    //    CUSTOM_DOMAIN: undefined,
+    //    IBI: 'com.atlassian.JitsiMeet.ios',
+    //    ISI: '1165103905'
+    // },
+
     /**
      * Hide the logo on the deep linking pages.
      */

ios/Podfile

@@ -19,6 +19,7 @@ target 'JitsiMeet' do
 
   pod 'Firebase/Analytics', '~> 8.0'
   pod 'Firebase/Crashlytics', '~> 8.0'
+  pod 'Firebase/DynamicLinks', '~> 8.0'
 end
 
 target 'JitsiMeetSDK' do
@@ -33,7 +34,6 @@ target 'JitsiMeetSDK' do
     :path => config[:reactNativePath],
     :hermes_enabled => true,
     :fabric_enabled => false,
-    :new_arch_enabled => false,
     # An absolute path to your application root.
     :app_path => "#{Pod::Config.instance.installation_root}/.."
   )
@@ -44,6 +44,7 @@ target 'JitsiMeetSDK' do
   pod 'giphy-react-native-sdk', :path => '../node_modules/@giphy/react-native-sdk'
   pod 'RNCalendarEvents', :path => '../node_modules/react-native-calendar-events'
   pod 'RNGoogleSignin', :path => '../node_modules/@react-native-google-signin/google-signin'
+  pod 'RNWatch', :path => '../node_modules/react-native-watch-connectivity'
 
   # Native pod dependencies
   #
@@ -66,7 +67,6 @@ target 'JitsiMeetSDKLite' do
       :path => config[:reactNativePath],
       :hermes_enabled => true,
       :fabric_enabled => false,
-      :new_arch_enabled => false,
       # An absolute path to your application root.
       :app_path => "#{Pod::Config.instance.installation_root}/.."
     )
@@ -78,12 +78,10 @@ target 'JitsiMeetSDKLite' do
 end
 
 post_install do |installer|
-
   react_native_post_install(
     installer,
     use_native_modules![:reactNativePath],
-    :mac_catalyst_enabled => false,
-    # :ccache_enabled => true
+    :mac_catalyst_enabled => false
   )
   installer.pods_project.targets.each do |target|
     # https://github.com/CocoaPods/CocoaPods/issues/11402
@@ -102,5 +100,4 @@ post_install do |installer|
 
   # Patch SocketRocket to support TLS 1.3
   %x(patch Pods/SocketRocket/SocketRocket/SRSecurityPolicy.m -N < patches/ws-tls13.diff)
-
 end

ios/app/PrivacyInfo.xcprivacy

@@ -30,14 +30,6 @@
 				<string>35F9.1</string>
 			</array>
 		</dict>
-		<dict>
-			<key>NSPrivacyAccessedAPIType</key>
-			<string>NSPrivacyAccessedAPICategoryDiskSpace</string>
-			<key>NSPrivacyAccessedAPITypeReasons</key>
-			<array>
-				<string>85F4.1</string>
-			</array>
-		</dict>
 	</array>
 	<key>NSPrivacyCollectedDataTypes</key>
 	<array/>

ios/app/app.xcodeproj/project.pbxproj

@@ -7,7 +7,17 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		13B07FBD1A68108700A75B9A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.storyboard */; };
+		0B5418471F7C5D8C00A2DD86 /* MeetingRowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B5418461F7C5D8C00A2DD86 /* MeetingRowController.swift */; };
+		0B7001701F7C51CC005944F4 /* InCallController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B70016F1F7C51CC005944F4 /* InCallController.swift */; };
+		0BEA5C291F7B8F73000D0AB4 /* Interface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0BEA5C271F7B8F73000D0AB4 /* Interface.storyboard */; };
+		0BEA5C2B1F7B8F73000D0AB4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0BEA5C2A1F7B8F73000D0AB4 /* Assets.xcassets */; };
+		0BEA5C321F7B8F73000D0AB4 /* JitsiMeetCompanion Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 0BEA5C311F7B8F73000D0AB4 /* JitsiMeetCompanion Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		0BEA5C371F7B8F73000D0AB4 /* InterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BEA5C361F7B8F73000D0AB4 /* InterfaceController.swift */; };
+		0BEA5C391F7B8F73000D0AB4 /* ExtensionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BEA5C381F7B8F73000D0AB4 /* ExtensionDelegate.swift */; };
+		0BEA5C3B1F7B8F73000D0AB4 /* ComplicationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BEA5C3A1F7B8F73000D0AB4 /* ComplicationController.swift */; };
+		0BEA5C3D1F7B8F73000D0AB4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0BEA5C3C1F7B8F73000D0AB4 /* Assets.xcassets */; };
+		0BEA5C411F7B8F73000D0AB4 /* JitsiMeetCompanion.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 0BEA5C251F7B8F73000D0AB4 /* JitsiMeetCompanion.app */; };
+		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		2681BB562C7A0B42CFBA6719 /* libPods-JitsiMeet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D6152FF9E9F7B0E86F70A21D /* libPods-JitsiMeet.a */; };
 		361974E2A13624D7735D619D /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 5C1BE20ECD5DEEB48FED90B5 /* PrivacyInfo.xcprivacy */; };
@@ -26,11 +36,27 @@
 		DEA9F28A258A6EA800D4CD74 /* JitsiMeetSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		DED016F128ECBC9D009D5E8D /* WebRTC.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DED016F028ECBC9D009D5E8D /* WebRTC.xcframework */; };
 		DED016F228ECBC9D009D5E8D /* WebRTC.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DED016F028ECBC9D009D5E8D /* WebRTC.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		E588011722789D43008B0561 /* JitsiMeetContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = E58801132278944E008B0561 /* JitsiMeetContext.swift */; };
+		E5C97B63227A1EB400199214 /* JitsiMeetCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5C97B62227A1EB400199214 /* JitsiMeetCommands.swift */; };
 		FD572B9827EDF32300A800FB /* GiphyUISDK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = FD572B9727EDF32300A800FB /* GiphyUISDK.xcframework */; };
 		FD572B9927EDF32300A800FB /* GiphyUISDK.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = FD572B9727EDF32300A800FB /* GiphyUISDK.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+		0BEA5C331F7B8F73000D0AB4 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 0BEA5C301F7B8F73000D0AB4;
+			remoteInfo = "JitsiMeetCompanion Extension";
+		};
+		0BEA5C3F1F7B8F73000D0AB4 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 0BEA5C241F7B8F73000D0AB4;
+			remoteInfo = JitsiMeetCompanion;
+		};
 		4EB06029260E026600F524C5 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
@@ -55,12 +81,24 @@
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		0BEA5C471F7B8F73000D0AB4 /* Embed App Extensions */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 13;
+			files = (
+				0BEA5C321F7B8F73000D0AB4 /* JitsiMeetCompanion Extension.appex in Embed App Extensions */,
+			);
+			name = "Embed App Extensions";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		0BEA5C491F7B8F73000D0AB4 /* Embed Watch Content */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "$(CONTENTS_FOLDER_PATH)/Watch";
 			dstSubfolderSpec = 16;
 			files = (
+				0BEA5C411F7B8F73000D0AB4 /* JitsiMeetCompanion.app in Embed Watch Content */,
 			);
 			name = "Embed Watch Content";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -80,9 +118,21 @@
 
 /* Begin PBXFileReference section */
 		0B26BE6D1EC5BC3C00EEFB41 /* JitsiMeet.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = JitsiMeet.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		0B5418461F7C5D8C00A2DD86 /* MeetingRowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeetingRowController.swift; sourceTree = "<group>"; };
+		0B70016F1F7C51CC005944F4 /* InCallController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InCallController.swift; sourceTree = "<group>"; };
 		0BD6B4361EF82A6B00D1F4CD /* WebRTC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebRTC.framework; path = "../../node_modules/react-native-webrtc/ios/WebRTC.framework"; sourceTree = "<group>"; };
+		0BEA5C251F7B8F73000D0AB4 /* JitsiMeetCompanion.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JitsiMeetCompanion.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		0BEA5C281F7B8F73000D0AB4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Interface.storyboard; sourceTree = "<group>"; };
+		0BEA5C2A1F7B8F73000D0AB4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		0BEA5C2C1F7B8F73000D0AB4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		0BEA5C311F7B8F73000D0AB4 /* JitsiMeetCompanion Extension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "JitsiMeetCompanion Extension.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
+		0BEA5C361F7B8F73000D0AB4 /* InterfaceController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InterfaceController.swift; sourceTree = "<group>"; };
+		0BEA5C381F7B8F73000D0AB4 /* ExtensionDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionDelegate.swift; sourceTree = "<group>"; };
+		0BEA5C3A1F7B8F73000D0AB4 /* ComplicationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComplicationController.swift; sourceTree = "<group>"; };
+		0BEA5C3C1F7B8F73000D0AB4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		0BEA5C3E1F7B8F73000D0AB4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		13B07F961A680F5B00A75B9A /* jitsi-meet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "jitsi-meet.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = src/Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
+		13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
 		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		3E0F4ED943C0B12BE77F6B45 /* Pods-JitsiMeet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.release.xcconfig"; path = "Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.release.xcconfig"; sourceTree = "<group>"; };
@@ -106,10 +156,19 @@
 		DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = JitsiMeetSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		DED016F028ECBC9D009D5E8D /* WebRTC.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = WebRTC.xcframework; path = ../Pods/JitsiWebRTC/WebRTC.xcframework; sourceTree = "<group>"; };
 		DEFDBBDB25656E3B00344B23 /* WebRTC.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = WebRTC.xcframework; path = "../../node_modules/react-native-webrtc/ios/WebRTC.xcframework"; sourceTree = "<group>"; };
+		E58801132278944E008B0561 /* JitsiMeetContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JitsiMeetContext.swift; sourceTree = "<group>"; };
+		E5C97B62227A1EB400199214 /* JitsiMeetCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JitsiMeetCommands.swift; sourceTree = "<group>"; };
 		FD572B9727EDF32300A800FB /* GiphyUISDK.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:925PGC4MV7:Giphy, Inc."; lastKnownFileType = wrapper.xcframework; name = GiphyUISDK.xcframework; path = ../Pods/Giphy/GiphySDK/GiphyUISDK.xcframework; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
+		0BEA5C2E1F7B8F73000D0AB4 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		13B07F8C1A680F5B00A75B9A /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -122,6 +181,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		1F021A8A5B056078665DE530 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		4EB06020260E026600F524C5 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -150,12 +216,41 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		0BEA5C261F7B8F73000D0AB4 /* Watch app */ = {
+			isa = PBXGroup;
+			children = (
+				0BEA5C271F7B8F73000D0AB4 /* Interface.storyboard */,
+				0BEA5C2A1F7B8F73000D0AB4 /* Assets.xcassets */,
+				0BEA5C2C1F7B8F73000D0AB4 /* Info.plist */,
+			);
+			name = "Watch app";
+			path = watchos/app;
+			sourceTree = "<group>";
+		};
+		0BEA5C351F7B8F73000D0AB4 /* WatchKit extension */ = {
+			isa = PBXGroup;
+			children = (
+				0BEA5C361F7B8F73000D0AB4 /* InterfaceController.swift */,
+				0BEA5C381F7B8F73000D0AB4 /* ExtensionDelegate.swift */,
+				0BEA5C3A1F7B8F73000D0AB4 /* ComplicationController.swift */,
+				0BEA5C3C1F7B8F73000D0AB4 /* Assets.xcassets */,
+				0BEA5C3E1F7B8F73000D0AB4 /* Info.plist */,
+				0B70016F1F7C51CC005944F4 /* InCallController.swift */,
+				0B5418461F7C5D8C00A2DD86 /* MeetingRowController.swift */,
+				E58801132278944E008B0561 /* JitsiMeetContext.swift */,
+				E5C97B62227A1EB400199214 /* JitsiMeetCommands.swift */,
+			);
+			name = "WatchKit extension";
+			path = watchos/extension;
+			sourceTree = "<group>";
+		};
 		13B07FAE1A68108700A75B9A /* src */ = {
 			isa = PBXGroup;
 			children = (
 				DEA0B7132D7EF7590062A9F6 /* AppDelegate.swift */,
 				13B07FB51A68108700A75B9A /* Images.xcassets */,
 				13B07FB61A68108700A75B9A /* Info.plist */,
+				13B07FB11A68108700A75B9A /* LaunchScreen.xib */,
 				DEA0B7112D7EF16E0062A9F6 /* ViewController.swift */,
 			);
 			path = src;
@@ -185,10 +280,11 @@
 				0B26BE711EC5BC4D00EEFB41 /* Frameworks */,
 				83CBBA001A601CBA00E9B192 /* Products */,
 				13B07FAE1A68108700A75B9A /* src */,
+				0BEA5C261F7B8F73000D0AB4 /* Watch app */,
+				0BEA5C351F7B8F73000D0AB4 /* WatchKit extension */,
 				4EB06025260E026600F524C5 /* JitsiMeetBroadcast Extension */,
 				CDD71F5E1157E9F283DF92A8 /* Pods */,
 				5C1BE20ECD5DEEB48FED90B5 /* PrivacyInfo.xcprivacy */,
-				DEAC44E22E97D2C200AD7BEE /* Recovered References */,
 			);
 			indentWidth = 2;
 			sourceTree = "<group>";
@@ -198,6 +294,8 @@
 			isa = PBXGroup;
 			children = (
 				13B07F961A680F5B00A75B9A /* jitsi-meet.app */,
+				0BEA5C251F7B8F73000D0AB4 /* JitsiMeetCompanion.app */,
+				0BEA5C311F7B8F73000D0AB4 /* JitsiMeetCompanion Extension.appex */,
 				4EB06023260E026600F524C5 /* JitsiMeetBroadcastExtension.appex */,
 			);
 			name = Products;
@@ -213,17 +311,44 @@
 			path = ../Pods;
 			sourceTree = "<group>";
 		};
-		DEAC44E22E97D2C200AD7BEE /* Recovered References */ = {
-			isa = PBXGroup;
-			children = (
-				13B07FB11A68108700A75B9A /* LaunchScreen.storyboard */,
-			);
-			name = "Recovered References";
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
+		0BEA5C241F7B8F73000D0AB4 /* JitsiMeetCompanion */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 0BEA5C481F7B8F73000D0AB4 /* Build configuration list for PBXNativeTarget "JitsiMeetCompanion" */;
+			buildPhases = (
+				0BEA5C231F7B8F73000D0AB4 /* Resources */,
+				0BEA5C471F7B8F73000D0AB4 /* Embed App Extensions */,
+				1F021A8A5B056078665DE530 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				0BEA5C341F7B8F73000D0AB4 /* PBXTargetDependency */,
+			);
+			name = JitsiMeetCompanion;
+			productName = JitsiMeetCompanion;
+			productReference = 0BEA5C251F7B8F73000D0AB4 /* JitsiMeetCompanion.app */;
+			productType = "com.apple.product-type.application.watchapp2";
+		};
+		0BEA5C301F7B8F73000D0AB4 /* JitsiMeetCompanion Extension */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 0BEA5C461F7B8F73000D0AB4 /* Build configuration list for PBXNativeTarget "JitsiMeetCompanion Extension" */;
+			buildPhases = (
+				0BEA5C2D1F7B8F73000D0AB4 /* Sources */,
+				0BEA5C2E1F7B8F73000D0AB4 /* Frameworks */,
+				0BEA5C2F1F7B8F73000D0AB4 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "JitsiMeetCompanion Extension";
+			productName = "JitsiMeetCompanion Extension";
+			productReference = 0BEA5C311F7B8F73000D0AB4 /* JitsiMeetCompanion Extension.appex */;
+			productType = "com.apple.product-type.watchkit2-extension";
+		};
 		13B07F861A680F5B00A75B9A /* JitsiMeet */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "JitsiMeet" */;
@@ -245,6 +370,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				0BEA5C401F7B8F73000D0AB4 /* PBXTargetDependency */,
 				4EB0602A260E026600F524C5 /* PBXTargetDependency */,
 			);
 			name = JitsiMeet;
@@ -279,6 +405,16 @@
 				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = Jitsi;
 				TargetAttributes = {
+					0BEA5C241F7B8F73000D0AB4 = {
+						CreatedOnToolsVersion = 9.0;
+						DevelopmentTeam = FC967L3QRG;
+						ProvisioningStyle = Automatic;
+					};
+					0BEA5C301F7B8F73000D0AB4 = {
+						CreatedOnToolsVersion = 9.0;
+						DevelopmentTeam = FC967L3QRG;
+						ProvisioningStyle = Automatic;
+					};
 					13B07F861A680F5B00A75B9A = {
 						LastSwiftMigration = 1620;
 						SystemCapabilities = {
@@ -309,18 +445,37 @@
 			projectRoot = "";
 			targets = (
 				13B07F861A680F5B00A75B9A /* JitsiMeet */,
+				0BEA5C241F7B8F73000D0AB4 /* JitsiMeetCompanion */,
+				0BEA5C301F7B8F73000D0AB4 /* JitsiMeetCompanion Extension */,
 				4EB06022260E026600F524C5 /* JitsiMeetBroadcastExtension */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
+		0BEA5C231F7B8F73000D0AB4 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				0BEA5C2B1F7B8F73000D0AB4 /* Assets.xcassets in Resources */,
+				0BEA5C291F7B8F73000D0AB4 /* Interface.storyboard in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		0BEA5C2F1F7B8F73000D0AB4 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				0BEA5C3D1F7B8F73000D0AB4 /* Assets.xcassets in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		13B07F8E1A680F5B00A75B9A /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
-				13B07FBD1A68108700A75B9A /* LaunchScreen.storyboard in Resources */,
+				13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
 				361974E2A13624D7735D619D /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -384,7 +539,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "#if test \"$PRODUCT_BUNDLE_IDENTIFIER\" = \"com.atlassian.JitsiMeet.ios\"; then\n#    ENTITLEMENTS_PLIST=\"$PROJECT_DIR/app.entitlements\"\n#    \n#    /usr/libexec/PlistBuddy -c \"Add :com.apple.developer.avfoundation.multitasking-camera-access bool 1\" $ENTITLEMENTS_PLIST\n#fi\n";
+			shellScript = "if test \"$PRODUCT_BUNDLE_IDENTIFIER\" = \"com.atlassian.JitsiMeet.ios\"; then\n    ENTITLEMENTS_PLIST=\"$PROJECT_DIR/app.entitlements\"\n    \n    /usr/libexec/PlistBuddy -c \"Add :com.apple.developer.avfoundation.multitasking-camera-access bool 1\" $ENTITLEMENTS_PLIST\nfi\n";
 		};
 		69BC5020DBE393B56BD76636 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -468,6 +623,20 @@
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
+		0BEA5C2D1F7B8F73000D0AB4 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				0B7001701F7C51CC005944F4 /* InCallController.swift in Sources */,
+				E5C97B63227A1EB400199214 /* JitsiMeetCommands.swift in Sources */,
+				0B5418471F7C5D8C00A2DD86 /* MeetingRowController.swift in Sources */,
+				E588011722789D43008B0561 /* JitsiMeetContext.swift in Sources */,
+				0BEA5C391F7B8F73000D0AB4 /* ExtensionDelegate.swift in Sources */,
+				0BEA5C371F7B8F73000D0AB4 /* InterfaceController.swift in Sources */,
+				0BEA5C3B1F7B8F73000D0AB4 /* ComplicationController.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		13B07F871A680F5B00A75B9A /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -492,6 +661,16 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
+		0BEA5C341F7B8F73000D0AB4 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 0BEA5C301F7B8F73000D0AB4 /* JitsiMeetCompanion Extension */;
+			targetProxy = 0BEA5C331F7B8F73000D0AB4 /* PBXContainerItemProxy */;
+		};
+		0BEA5C401F7B8F73000D0AB4 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 0BEA5C241F7B8F73000D0AB4 /* JitsiMeetCompanion */;
+			targetProxy = 0BEA5C3F1F7B8F73000D0AB4 /* PBXContainerItemProxy */;
+		};
 		4EB0602A260E026600F524C5 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 4EB06022260E026600F524C5 /* JitsiMeetBroadcastExtension */;
@@ -500,21 +679,174 @@
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
-		13B07FB11A68108700A75B9A /* LaunchScreen.storyboard */ = {
+		0BEA5C271F7B8F73000D0AB4 /* Interface.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				0BEA5C281F7B8F73000D0AB4 /* Base */,
+			);
+			name = Interface.storyboard;
+			sourceTree = "<group>";
+		};
+		13B07FB11A68108700A75B9A /* LaunchScreen.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
 				13B07FB21A68108700A75B9A /* Base */,
 			);
-			name = LaunchScreen.storyboard;
+			name = LaunchScreen.xib;
 			sourceTree = "<group>";
 		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
+		0BEA5C421F7B8F73000D0AB4 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_STYLE = Automatic;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = FC967L3QRG;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				IBSC_MODULE = JitsiMeetCompanion_Extension;
+				INFOPLIST_FILE = watchos/app/Info.plist;
+				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet.watchkit;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = watchos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 4;
+				WATCHOS_DEPLOYMENT_TARGET = 4.0;
+			};
+			name = Debug;
+		};
+		0BEA5C431F7B8F73000D0AB4 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_STYLE = Automatic;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = FC967L3QRG;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				IBSC_MODULE = JitsiMeetCompanion_Extension;
+				INFOPLIST_FILE = watchos/app/Info.plist;
+				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet.watchkit;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = watchos;
+				SKIP_INSTALL = YES;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 4;
+				WATCHOS_DEPLOYMENT_TARGET = 4.0;
+			};
+			name = Release;
+		};
+		0BEA5C441F7B8F73000D0AB4 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_STYLE = Automatic;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = FC967L3QRG;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				INFOPLIST_FILE = watchos/extension/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@executable_path/../../Frameworks",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet.watchkit.extension;
+				PRODUCT_NAME = "${TARGET_NAME}";
+				SDKROOT = watchos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 4;
+				WATCHOS_DEPLOYMENT_TARGET = 4.0;
+			};
+			name = Debug;
+		};
+		0BEA5C451F7B8F73000D0AB4 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_STYLE = Automatic;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = FC967L3QRG;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				INFOPLIST_FILE = watchos/extension/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@executable_path/../../Frameworks",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet.watchkit.extension;
+				PRODUCT_NAME = "${TARGET_NAME}";
+				SDKROOT = watchos;
+				SKIP_INSTALL = YES;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 4;
+				WATCHOS_DEPLOYMENT_TARGET = 4.0;
+			};
+			name = Release;
+		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 756FCE06C08D9B947653C98A /* Pods-JitsiMeet.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDebug;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = app.entitlements;
@@ -551,6 +883,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 3E0F4ED943C0B12BE77F6B45 /* Pods-JitsiMeet.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconRelease;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = app.entitlements;
@@ -799,6 +1132,24 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
+		0BEA5C461F7B8F73000D0AB4 /* Build configuration list for PBXNativeTarget "JitsiMeetCompanion Extension" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				0BEA5C441F7B8F73000D0AB4 /* Debug */,
+				0BEA5C451F7B8F73000D0AB4 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		0BEA5C481F7B8F73000D0AB4 /* Build configuration list for PBXNativeTarget "JitsiMeetCompanion" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				0BEA5C421F7B8F73000D0AB4 /* Debug */,
+				0BEA5C431F7B8F73000D0AB4 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "JitsiMeet" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

ios/app/src/AppDelegate.swift

@@ -37,7 +37,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         let vc = ViewController()
         self.window?.rootViewController = vc
-        jitsiMeet.showSplashScreen()
+        jitsiMeet.showSplashScreen(vc.view)
 
         self.window?.makeKeyAndVisible()
 
@@ -54,6 +54,19 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     // MARK: Linking delegate methods
 
     func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
+        if self.appContainsRealServiceInfoPlist() {
+            let handled = DynamicLinks.dynamicLinks().handleUniversalLink(userActivity.webpageURL!) { dynamicLink, error in
+                if let firebaseUrl = self.extractURL(from: dynamicLink) {
+                    userActivity.webpageURL = firebaseUrl
+                    JitsiMeet.sharedInstance().application(application, continue: userActivity, restorationHandler: restorationHandler)
+                }
+            }
+
+            if handled {
+                return handled
+            }
+        }
+
         return JitsiMeet.sharedInstance().application(application, continue: userActivity, restorationHandler: restorationHandler)
     }
 
@@ -62,7 +75,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             return false
         }
 
-        return JitsiMeet.sharedInstance().application(app, open: url, options: options)
+        var openUrl = url
+
+        if self.appContainsRealServiceInfoPlist() {
+            if let dynamicLink = DynamicLinks.dynamicLinks().dynamicLink(fromCustomSchemeURL: url),
+               let firebaseUrl = self.extractURL(from: dynamicLink) {
+                openUrl = firebaseUrl
+            }
+        }
+
+        return JitsiMeet.sharedInstance().application(app, open: openUrl, options: options)
     }
 
     func application(_ application: UIApplication, supportedInterfaceOrientationsFor window: UIWindow?) -> UIInterfaceOrientationMask {
@@ -75,4 +97,13 @@ extension AppDelegate {
     func appContainsRealServiceInfoPlist() -> Bool {
         return InfoPlistUtil.containsRealServiceInfoPlist(in: Bundle.main)
     }
+
+    func extractURL(from dynamicLink: DynamicLink?) -> URL? {
+        guard let dynamicLink = dynamicLink,
+              let dynamicLinkURL = dynamicLink.url,
+              dynamicLink.matchType == .unique || dynamicLink.matchType == .default else {
+            return nil
+        }
+        return dynamicLinkURL
+    }
 }

ios/app/src/Base.lproj/LaunchScreen.storyboard

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <device id="retina4_7" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="EHf-IW-A2E">
-            <objects>
-                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="iN0-l3-epB">
-                        <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <imageView opaque="NO" userInteractionEnabled="NO" contentMode="center" image="LaunchScreen" translatesAutoresizingMaskIntoConstraints="NO" id="4B8-Xf-NDE">
-                                <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
-                            </imageView>
-                        </subviews>
-                        <color key="backgroundColor" red="0.090196078431372548" green="0.62745098039215685" blue="0.85882352941176465" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <constraints>
-                            <constraint firstAttribute="bottom" secondItem="4B8-Xf-NDE" secondAttribute="bottom" id="aFF-BR-glX"/>
-                            <constraint firstItem="4B8-Xf-NDE" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="glR-YN-1GF"/>
-                            <constraint firstAttribute="trailing" secondItem="4B8-Xf-NDE" secondAttribute="trailing" id="tva-gl-jRX"/>
-                            <constraint firstItem="4B8-Xf-NDE" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="yaV-1V-oEh"/>
-                        </constraints>
-                        <nil key="simulatedStatusBarMetrics"/>
-                        <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-                        <point key="canvasLocation" x="548" y="455"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <resources>
-                <image name="LaunchScreen" width="480" height="480"/>
-            </resources>
-        </scene>
-    </scenes>
-</document>

ios/app/src/Base.lproj/LaunchScreen.xib

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <imageView opaque="NO" userInteractionEnabled="NO" contentMode="center" image="LaunchScreen" translatesAutoresizingMaskIntoConstraints="NO" id="4B8-Xf-NDE">
+                    <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
+                </imageView>
+            </subviews>
+            <color key="backgroundColor" red="0.090196078431372548" green="0.62745098039215685" blue="0.85882352941176465" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstAttribute="bottom" secondItem="4B8-Xf-NDE" secondAttribute="bottom" id="aFF-BR-glX"/>
+                <constraint firstItem="4B8-Xf-NDE" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="glR-YN-1GF"/>
+                <constraint firstAttribute="trailing" secondItem="4B8-Xf-NDE" secondAttribute="trailing" id="tva-gl-jRX"/>
+                <constraint firstItem="4B8-Xf-NDE" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="yaV-1V-oEh"/>
+            </constraints>
+            <nil key="simulatedStatusBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <point key="canvasLocation" x="548" y="455"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="LaunchScreen" width="480" height="480"/>
+    </resources>
+</document>

ios/app/src/Info.plist

@@ -90,7 +90,7 @@
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
-		<string>arm64</string>
+		<string>armv7</string>
 	</array>
 	<key>UIStatusBarStyle</key>
 	<string>UIStatusBarStyleLightContent</string>

ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,92 @@
+{
+  "images" : [
+    {
+      "size" : "24x24",
+      "idiom" : "watch",
+      "filename" : "Icon-24@2x.png",
+      "scale" : "2x",
+      "role" : "notificationCenter",
+      "subtype" : "38mm"
+    },
+    {
+      "size" : "27.5x27.5",
+      "idiom" : "watch",
+      "filename" : "Icon-27.5@2x.png",
+      "scale" : "2x",
+      "role" : "notificationCenter",
+      "subtype" : "42mm"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "watch",
+      "filename" : "Icon-29@2x.png",
+      "role" : "companionSettings",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "watch",
+      "filename" : "Icon-29@3x.png",
+      "role" : "companionSettings",
+      "scale" : "3x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "watch",
+      "filename" : "Icon-40@2x.png",
+      "scale" : "2x",
+      "role" : "appLauncher",
+      "subtype" : "38mm"
+    },
+    {
+      "size" : "44x44",
+      "idiom" : "watch",
+      "filename" : "Icon-88@2x.png",
+      "scale" : "2x",
+      "role" : "appLauncher",
+      "subtype" : "40mm"
+    },
+    {
+      "size" : "50x50",
+      "idiom" : "watch",
+      "filename" : "Icon-100@2x.png",
+      "scale" : "2x",
+      "role" : "appLauncher",
+      "subtype" : "44mm"
+    },
+    {
+      "size" : "86x86",
+      "idiom" : "watch",
+      "filename" : "Icon-86@2x.png",
+      "scale" : "2x",
+      "role" : "quickLook",
+      "subtype" : "38mm"
+    },
+    {
+      "size" : "98x98",
+      "idiom" : "watch",
+      "filename" : "Icon-98@2x.png",
+      "scale" : "2x",
+      "role" : "quickLook",
+      "subtype" : "42mm"
+    },
+    {
+      "size" : "108x108",
+      "idiom" : "watch",
+      "filename" : "Icon-216@2x.png",
+      "scale" : "2x",
+      "role" : "quickLook",
+      "subtype" : "44mm"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "watch-marketing",
+      "filename" : "Icon-1024@1x.png",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

ios/app/watchos/app/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

ios/app/watchos/app/Assets.xcassets/hangup.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "hangup@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

ios/app/watchos/app/Assets.xcassets/mute-off.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mute-off@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

ios/app/watchos/app/Assets.xcassets/mute-on.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mute-on@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

ios/app/watchos/app/Base.lproj/Interface.storyboard

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="14490.70" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="AgC-eL-Hgc">
+    <device id="watch38" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="watchOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="14490.21"/>
+    </dependencies>
+    <scenes>
+        <!--Meetings-->
+        <scene sceneID="aou-V4-d1y">
+            <objects>
+                <controller title="Meetings" id="AgC-eL-Hgc" customClass="InterfaceController" customModule="JitsiMeetCompanion" customModuleProvider="target">
+                    <items>
+                        <label alignment="left" textAlignment="left" numberOfLines="0" id="OQN-sx-tDt"/>
+                        <table alignment="left" id="gpO-ql-Xsr">
+                            <items>
+                                <tableRow identifier="MeetingRowType" id="GGl-av-xeJ" customClass="MeetingRowController" customModule="JitsiMeetCompanion_Extension">
+                                    <group key="rootItem" width="1" height="0.0" alignment="left" layout="vertical" id="5XE-gq-qzG">
+                                        <items>
+                                            <label alignment="left" text="Label" id="Sij-up-N4p"/>
+                                            <label alignment="left" text="Label" id="V5K-sm-jEH">
+                                                <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                                                <fontDescription key="font" style="UICTFontTextStyleFootnote"/>
+                                            </label>
+                                        </items>
+                                        <connections>
+                                            <segue destination="9RD-qP-1Z0" kind="push" id="Boa-6E-eZs"/>
+                                        </connections>
+                                    </group>
+                                    <connections>
+                                        <outlet property="roomLabel" destination="Sij-up-N4p" id="PdS-SO-ylc"/>
+                                        <outlet property="rowGroup" destination="5XE-gq-qzG" id="GZN-2c-2Gz"/>
+                                        <outlet property="timeLabel" destination="V5K-sm-jEH" id="fWQ-kx-vE4"/>
+                                    </connections>
+                                </tableRow>
+                            </items>
+                        </table>
+                    </items>
+                    <connections>
+                        <outlet property="infoLabel" destination="OQN-sx-tDt" id="Juv-tb-SNj"/>
+                        <outlet property="table" destination="gpO-ql-Xsr" id="aVV-iZ-z3l"/>
+                    </connections>
+                </controller>
+            </objects>
+            <point key="canvasLocation" x="-99" y="117"/>
+        </scene>
+        <!--Meetings-->
+        <scene sceneID="ns4-Kh-qqU">
+            <objects>
+                <controller identifier="InCallController" title="Meetings" hidesWhenLoading="NO" id="9RD-qP-1Z0" customClass="InCallController" customModule="JitsiMeetCompanion" customModuleProvider="target">
+                    <items>
+                        <label alignment="center" text="Label" id="vFt-lL-SNY"/>
+                        <timer alignment="center" textAlignment="center" previewedSeconds="0" id="W8S-uZ-MPm">
+                            <color key="textColor" red="0.024725984125768763" green="1" blue="0.24241188365329402" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <fontDescription key="font" style="UICTFontTextStyleHeadline"/>
+                        </timer>
+                        <group alignment="center" verticalAlignment="bottom" spacing="10" id="Hfk-a0-uWj">
+                            <items>
+                                <button width="60" height="60" alignment="left" verticalAlignment="bottom" backgroundImage="hangup" id="8jF-SI-UHz">
+                                    <connections>
+                                        <action selector="hangupClicked" destination="9RD-qP-1Z0" id="cXK-lw-tsd"/>
+                                    </connections>
+                                </button>
+                                <button width="60" height="60" alignment="right" verticalAlignment="bottom" backgroundImage="mute-off" id="LmN-FI-aQq">
+                                    <connections>
+                                        <action selector="muteClicked" destination="9RD-qP-1Z0" id="dJg-kV-cqH"/>
+                                    </connections>
+                                </button>
+                            </items>
+                        </group>
+                    </items>
+                    <connections>
+                        <outlet property="mutedButton" destination="LmN-FI-aQq" id="gfi-4T-gdN"/>
+                        <outlet property="roomLabel" destination="vFt-lL-SNY" id="cYB-Tf-Efz"/>
+                        <outlet property="timer" destination="W8S-uZ-MPm" id="r7T-j1-9VJ"/>
+                    </connections>
+                </controller>
+            </objects>
+            <point key="canvasLocation" x="213" y="117"/>
+        </scene>
+    </scenes>
+</document>

ios/app/watchos/app/Info.plist

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>Jitsi Meet</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>99.0.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+	</array>
+	<key>WKCompanionAppBundleIdentifier</key>
+	<string>org.jitsi.meet</string>
+	<key>WKWatchKitApp</key>
+	<true/>
+</dict>
+</plist>

ios/app/watchos/extension/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

ios/app/watchos/extension/Assets.xcassets/jitsi.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "jitsi@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

ios/app/watchos/extension/ComplicationController.swift

@@ -0,0 +1,81 @@
+/*
+ * Copyright @ 2018-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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import ClockKit
+
+
+class ComplicationController: NSObject, CLKComplicationDataSource {
+
+    // MARK: - Timeline Configuration
+
+    func getSupportedTimeTravelDirections(for complication: CLKComplication, withHandler handler: @escaping (CLKComplicationTimeTravelDirections) -> Void) {
+        handler([])
+    }
+
+    func getPrivacyBehavior(for complication: CLKComplication, withHandler handler: @escaping (CLKComplicationPrivacyBehavior) -> Void) {
+        handler(.showOnLockScreen)
+    }
+
+    // MARK: - Timeline Population
+
+    func getCurrentTimelineEntry(for complication: CLKComplication, withHandler handler: @escaping (CLKComplicationTimelineEntry?) -> Void) {
+        // Call the handler with the current timeline entry
+        getLocalizableSampleTemplate(for: complication) {template in
+            guard let template = template else {
+                handler(nil)
+                return
+            }
+            handler(CLKComplicationTimelineEntry(date: Date(), complicationTemplate: template))
+        }
+    }
+
+    func getTimelineEntries(for complication: CLKComplication, before date: Date, limit: Int, withHandler handler: @escaping ([CLKComplicationTimelineEntry]?) -> Void) {
+        // Call the handler with the timeline entries prior to the given date
+        handler(nil)
+    }
+
+    func getTimelineEntries(for complication: CLKComplication, after date: Date, limit: Int, withHandler handler: @escaping ([CLKComplicationTimelineEntry]?) -> Void) {
+        // Call the handler with the timeline entries after to the given date
+        handler(nil)
+    }
+
+    // MARK: - Placeholder Templates
+
+    func getLocalizableSampleTemplate(for complication: CLKComplication, withHandler handler: @escaping (CLKComplicationTemplate?) -> Void) {
+        // This method will be called once per supported complication, and the results will be cached
+
+        let imageProvider = CLKImageProvider(onePieceImage: UIImage(named: "jitsi")!)
+        if complication.family == .circularSmall {
+            let small = CLKComplicationTemplateCircularSmallRingImage()
+            small.imageProvider = imageProvider
+            small.ringStyle = .closed
+            small.fillFraction = 0
+            handler(small)
+        } else if complication.family == .utilitarianSmall {
+            let utilitarian = CLKComplicationTemplateUtilitarianSmallSquare()
+            utilitarian.imageProvider = imageProvider
+            handler(utilitarian)
+        } else if complication.family == .modularSmall {
+            let modular = CLKComplicationTemplateModularSmallRingImage()
+            modular.imageProvider = imageProvider
+            modular.ringStyle = .closed
+            modular.fillFraction = 0
+            handler(modular)
+        }
+    }
+
+}

ios/app/watchos/extension/ExtensionDelegate.swift

@@ -0,0 +1,103 @@
+/*
+ * Copyright @ 2018-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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import WatchConnectivity
+import WatchKit
+
+class ExtensionDelegate: NSObject, WCSessionDelegate, WKExtensionDelegate {
+
+    var currentContext : JitsiMeetContext = JitsiMeetContext()
+
+    static var currentJitsiMeetContext: JitsiMeetContext {
+        get {
+            return (WKExtension.shared().delegate as! ExtensionDelegate).currentContext
+        }
+    }
+
+    func applicationDidFinishLaunching() {
+        // Start Watch Connectivity
+        if WCSession.isSupported() {
+            let session  = WCSession.default
+            session.delegate = self
+            session.activate()
+        }
+    }
+
+    func handle(_ backgroundTasks: Set<WKRefreshBackgroundTask>) {
+        // Sent when the system needs to launch the application in the background to process tasks. Tasks arrive in a set, so loop through and process each one.
+        for task in backgroundTasks {
+            // Use a switch statement to check the task type
+            switch task {
+            case let backgroundTask as WKApplicationRefreshBackgroundTask:
+                // Be sure to complete the background task once you’re done.
+                backgroundTask.setTaskCompletedWithSnapshot(false)
+            case let snapshotTask as WKSnapshotRefreshBackgroundTask:
+                // Snapshot tasks have a unique completion call, make sure to set your expiration date
+                snapshotTask.setTaskCompleted(restoredDefaultState: true, estimatedSnapshotExpiration: Date.distantFuture, userInfo: nil)
+            case let connectivityTask as WKWatchConnectivityRefreshBackgroundTask:
+                // Be sure to complete the connectivity task once you’re done.
+                connectivityTask.setTaskCompletedWithSnapshot(false)
+            case let urlSessionTask as WKURLSessionRefreshBackgroundTask:
+                // Be sure to complete the URL session task once you’re done.
+                urlSessionTask.setTaskCompletedWithSnapshot(false)
+            default:
+                // make sure to complete unhandled task types
+                task.setTaskCompletedWithSnapshot(false)
+            }
+        }
+    }
+
+    func session(_ session: WCSession, activationDidCompleteWith
+        activationState: WCSessionActivationState, error: Error?) {
+        if let error = error {
+            print("WATCH Session activation failed with error: \(error.localizedDescription)")
+            return
+        }
+        print("WATCH Session activated with state: \(activationState.rawValue)")
+    }
+
+    func session(_ session: WCSession, didReceiveApplicationContext applicationContext: [String : Any]) {
+        DispatchQueue.main.async {
+            let newContext = JitsiMeetContext(context: applicationContext)
+
+            print("WATCH got new context: \(newContext.description)");
+
+            // Update context on the root controller which displays the recent list
+            let controller = WKExtension.shared().rootInterfaceController as! InterfaceController
+            controller.updateUI(newContext)
+
+            // If the current controller is not the in-call controller and we have a
+            // conference URL, show the in-call controller
+            if let currentController = WKExtension.shared().visibleInterfaceController as? InterfaceController {
+                // Go to the in-call controller only if the conference URL has changed, because the user may have
+                // clicked the back button
+                if newContext.conferenceURL != nil
+                        && self.currentContext.conferenceURL != newContext.conferenceURL {
+                      currentController.pushController(withName: "InCallController", context: newContext)
+                }
+            } else if let inCallController = WKExtension.shared().visibleInterfaceController as? InCallController {
+                if newContext.conferenceURL == nil {
+                      inCallController.popToRootController()
+                } else {
+                      inCallController.updateUI(newContext)
+                }
+            }
+
+            self.currentContext = newContext;
+        }
+    }
+}

ios/app/watchos/extension/InCallController.swift

@@ -0,0 +1,109 @@
+/*
+ * Copyright @ 2018-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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import WatchConnectivity
+import WatchKit
+import Foundation
+
+
+class InCallController: WKInterfaceController {
+    @IBOutlet var mutedButton: WKInterfaceButton!
+    @IBOutlet var roomLabel: WKInterfaceLabel!
+    @IBOutlet var timer: WKInterfaceTimer!
+
+    @IBAction func hangupClicked() {
+      sendCommand(JitsiMeetCommands.CMD_HANG_UP, message: nil)
+    }
+
+    @IBAction func muteClicked() {
+        if var micMuted = ExtensionDelegate.currentJitsiMeetContext.micMuted {
+            micMuted = !micMuted;
+            sendCommand(
+                JitsiMeetCommands.CMD_SET_MUTED,
+                message: [
+                  "muted": micMuted ? "true" : "false"
+                ])
+            updateMutedButton(withMuted: micMuted)
+        }
+    }
+
+  func sendCommand(_ command: JitsiMeetCommands, message: [String : Any]?) {
+        if WCSession.isSupported() {
+            let session = WCSession.default
+            var data = [String: Any]()
+
+            if let sessionID = ExtensionDelegate.currentJitsiMeetContext.sessionID {
+                if message != nil {
+                    message!.forEach { data[$0] = $1 }
+                }
+              
+                data["command"] = command.rawValue;
+                data["sessionID"] = sessionID;
+              
+                session.sendMessage(data, replyHandler: nil, errorHandler: nil)
+            }
+        }
+    }
+  
+    func updateUI(_ newContext: JitsiMeetContext) {
+        var conferenceURL = newContext.conferenceURL
+
+        if let joinConferenceURL = newContext.joinConferenceURL {
+            sendCommand(JitsiMeetCommands.CMD_JOIN_CONFERENCE, message: [ "data" : joinConferenceURL ])
+            conferenceURL = joinConferenceURL
+        }
+
+        let newRoomName = conferenceURL != nil ? conferenceURL!.components(separatedBy: "/").last : ""
+      
+        roomLabel.setText(newRoomName)
+      
+        if let newTimestamp = newContext.conferenceTimestamp {
+            restartTimer(newTimestamp)
+        }
+        if let newMuted = newContext.micMuted {
+            updateMutedButton(withMuted: newMuted)
+        }
+    }
+
+    func restartTimer(_ conferenceTimestamp: Int64) {
+        if (conferenceTimestamp != 0) {
+            let newDate = Date(timeIntervalSince1970: TimeInterval(conferenceTimestamp / 1000))
+            timer.setDate(newDate)
+            timer.start();
+            print("WATCH timer set date to: \(newDate) and start")
+        } else {
+            print("WATCH timer stop")
+            timer.stop();
+        }
+    }
+
+    func updateMutedButton(withMuted isMuted: Bool) {
+      if isMuted {
+          mutedButton.setBackgroundImageNamed("mute-on.png")
+      } else {
+          mutedButton.setBackgroundImageNamed("mute-off.png")
+      }
+    }
+
+    override func awake(withContext context: Any?) {
+        super.awake(withContext: context)
+
+        if let data = context as? JitsiMeetContext {
+          updateUI(data)
+        }
+    }
+}

ios/app/watchos/extension/Info.plist

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>Jitsi Meet Companion Extension</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>XPC!</string>
+	<key>CFBundleShortVersionString</key>
+	<string>99.0.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>CLKComplicationPrincipalClass</key>
+	<string>$(PRODUCT_MODULE_NAME).ComplicationController</string>
+	<key>CLKComplicationSupportedFamilies</key>
+	<array>
+		<string>CLKComplicationFamilyModularSmall</string>
+		<string>CLKComplicationFamilyUtilitarianSmall</string>
+		<string>CLKComplicationFamilyCircularSmall</string>
+	</array>
+	<key>NSExtension</key>
+	<dict>
+		<key>NSExtensionAttributes</key>
+		<dict>
+			<key>WKAppBundleIdentifier</key>
+			<string>org.jitsi.meet.watchkit</string>
+		</dict>
+		<key>NSExtensionPointIdentifier</key>
+		<string>com.apple.watchkit</string>
+	</dict>
+	<key>WKExtensionDelegateClassName</key>
+	<string>$(PRODUCT_MODULE_NAME).ExtensionDelegate</string>
+</dict>
+</plist>

ios/app/watchos/extension/InterfaceController.swift

@@ -0,0 +1,94 @@
+/*
+ * Copyright @ 2018-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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import WatchKit
+import WatchConnectivity
+import Foundation
+
+
+class InterfaceController: WKInterfaceController {
+
+    @IBOutlet var infoLabel: WKInterfaceLabel!
+    @IBOutlet var table: WKInterfaceTable!
+
+    override func didAppear(){
+        self.updateUI(ExtensionDelegate.currentJitsiMeetContext)
+    }
+
+    func updateUI(_ newContext:JitsiMeetContext) {
+      if (newContext.recentURLs == nil || newContext.recentURLs!.count == 0) {
+        infoLabel.setText("There are no recent meetings. Please use the app on the phone to start a new call.")
+
+        table.setHidden(true)
+        infoLabel.setHidden(false)
+      } else {
+        updateRecents(withRecents: newContext.recentURLs!, currentContext: newContext)
+
+        table.setHidden(false)
+        infoLabel.setHidden(true)
+      }
+    }
+
+    private func updateRecents(withRecents recents: NSArray, currentContext: JitsiMeetContext) {
+        // Updating the # of rows only if it actually changed prevents from blinking the UI
+        if (table.numberOfRows != recents.count) {
+            table.setNumberOfRows(recents.count, withRowType: "MeetingRowType")
+        }
+
+        for (index, entry) in recents.enumerated() {
+            let entryDict = entry as! NSDictionary
+            let roomURL = entryDict["conference"] as! NSString
+            let timestamp = entryDict["date"] as! NSNumber
+
+            // Prepare values
+            let room = roomURL.components(separatedBy: "/").last
+            let date = Date(timeIntervalSince1970: timestamp.doubleValue / 1000)  // timestamp is taken with Date.now() in JS, which uses milliseconds
+            let dateFormatter = DateFormatter()
+            dateFormatter.timeZone = TimeZone.current
+            dateFormatter.locale = NSLocale.current
+            dateFormatter.dateFormat = "HH:mm yyyy-MM-dd"
+            let strDate = dateFormatter.string(from: date)
+
+            // Update row controller
+            let controller = table.rowController(at: index) as! MeetingRowController
+            controller.room = room
+            controller.roomUrl = roomURL as String
+            controller.roomLabel.setText(room)
+            controller.timeLabel.setText(strDate)
+
+            // Change the background for the active meeting
+            if (controller.roomUrl == currentContext.conferenceURL) {
+                controller.rowGroup.setBackgroundColor(UIColor(red: 0.125, green: 0.58, blue: 0.98, alpha: 1))
+            } else {
+                controller.rowGroup.setBackgroundColor(UIColor(red: 0.949, green: 0.956, blue: 1, alpha: 0.14))
+            }
+        }
+    }
+
+    override func contextForSegue(withIdentifier segueIdentifier: String, in table: WKInterfaceTable, rowIndex: Int) -> Any? {
+        let controller = table.rowController(at: rowIndex) as! MeetingRowController
+        let currentContext = ExtensionDelegate.currentJitsiMeetContext
+
+        // Copy the current context and add the joinConferenceURL to trigger the command when the in-call screen is displayed
+        let actionContext = JitsiMeetContext(jmContext: currentContext)
+        actionContext.joinConferenceURL = controller.roomUrl
+
+        print("WATCH contextForSegue: \(actionContext.description)");
+
+        return actionContext;
+    }
+}

ios/app/watchos/extension/JitsiMeetCommands.swift

@@ -0,0 +1,27 @@
+/*
+ * Copyright @ 2018-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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// This needs to be in sync with features/mobile/watchos/constants.js
+enum JitsiMeetCommands : String {
+  typealias RawValue = String
+  
+  case CMD_HANG_UP = "hangup";
+  
+  case CMD_JOIN_CONFERENCE = "joinConference";
+  
+  case CMD_SET_MUTED = "setMuted";
+}

ios/app/watchos/extension/JitsiMeetContext.swift

@@ -0,0 +1,71 @@
+/*
+ * Copyright @ 2018-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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import Foundation
+
+class JitsiMeetContext {
+    private var dictionary : [String : Any]
+
+    var joinConferenceURL : String? = nil;
+
+    init() {
+        dictionary = [:]
+    }
+  
+    init(context: [String : Any]) {
+        dictionary = context
+    }
+  
+    init(jmContext: JitsiMeetContext) {
+        dictionary = jmContext.dictionary
+        joinConferenceURL = jmContext.joinConferenceURL
+    }
+  
+    var conferenceURL : String? {
+        get {
+            return dictionary["conferenceURL"] as? String
+        }
+    }
+  
+    var conferenceTimestamp : Int64? {
+        get {
+            return dictionary["conferenceTimestamp"] as? Int64;
+        }
+    }
+  
+    var sessionID : Int64? {
+        get {
+            return dictionary["sessionID"] as? Int64;
+        }
+    }
+  
+    var recentURLs : NSArray? {
+        get {
+            return dictionary["recentURLs"] as? NSArray
+        }
+    }
+  
+    var micMuted : Bool? {
+        get {
+            return (dictionary["micMuted"] as? NSNumber)?.boolValue ?? nil;
+        }
+    }
+  
+    public var description: String {
+        return "JitsiMeetContext[conferenceURL: \(String(describing: conferenceURL)), conferenceTimestamp: \(String(describing:conferenceTimestamp)), sessionID: \(String(describing:sessionID)), recentURLs: \(String(describing:recentURLs)), joinConferenceURL: \(String(describing:joinConferenceURL)) "
+    }
+}

ios/app/watchos/extension/MeetingRowController.swift

@@ -0,0 +1,27 @@
+/*
+ * Copyright @ 2018-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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import WatchKit
+
+class MeetingRowController: NSObject {
+  @IBOutlet var roomLabel: WKInterfaceLabel!
+  @IBOutlet var timeLabel: WKInterfaceLabel!
+  @IBOutlet var rowGroup: WKInterfaceGroup!
+
+  var room: String!
+  var roomUrl: String!
+}

ios/fastlane/Fastfile

@@ -39,6 +39,36 @@ platform :ios do
       end
     )
 
+    # Set the (watch) app identifier
+    update_app_identifier(
+      xcodeproj: "app/app.xcodeproj",
+      plist_path: "watchos/app/Info.plist",
+      app_identifier: "com.atlassian.JitsiMeet.ios.watchkit"
+    )
+
+    # Set the (watch) extension identifier
+    update_app_identifier(
+      xcodeproj: "app/app.xcodeproj",
+      plist_path: "watchos/extension/Info.plist",
+      app_identifier: "com.atlassian.JitsiMeet.ios.watchkit.extension"
+    )
+
+    update_info_plist(
+      xcodeproj: "app/app.xcodeproj",
+      plist_path: "watchos/app/Info.plist",
+      block: proc do |plist|
+        plist["WKCompanionAppBundleIdentifier"] = "com.atlassian.JitsiMeet.ios"
+      end
+    )
+
+    update_info_plist(
+      xcodeproj: "app/app.xcodeproj",
+      plist_path: "watchos/extension/Info.plist",
+      block: proc do |plist|
+        plist["NSExtension"]["NSExtensionAttributes"]["WKAppBundleIdentifier"] = "com.atlassian.JitsiMeet.ios.watchkit"
+      end
+    )
+
     # Increment the build number by 1
     increment_build_number(
       build_number: Time.now.to_i,

ios/sdk/sdk.xcodeproj/project.pbxproj

@@ -51,6 +51,7 @@
 		C81E9AB925AC5AD800B134D9 /* ExternalAPI.h in Headers */ = {isa = PBXBuildFile; fileRef = C81E9AB825AC5AD800B134D9 /* ExternalAPI.h */; };
 		C8AFD27F2462C613000293D2 /* InfoPlistUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = C8AFD27D2462C613000293D2 /* InfoPlistUtil.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C8AFD2802462C613000293D2 /* InfoPlistUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = C8AFD27E2462C613000293D2 /* InfoPlistUtil.m */; };
+		DE438CDA2350934700DD541D /* JavaScriptSandbox.m in Sources */ = {isa = PBXBuildFile; fileRef = DE438CD82350934700DD541D /* JavaScriptSandbox.m */; };
 		DE65AACA2317FFCD00290BEC /* LogUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = DE65AAC92317FFCD00290BEC /* LogUtils.h */; };
 		DE65AACC2318028300290BEC /* JitsiMeetBaseLogHandler+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = DE65AACB2318028300290BEC /* JitsiMeetBaseLogHandler+Private.h */; };
 		DE762DB422AFDE76000DEBD6 /* JitsiMeetUserInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = DE762DB322AFDE76000DEBD6 /* JitsiMeetUserInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -97,6 +98,7 @@
 		DE9A015C289A9A9A00E41CBB /* JitsiMeetLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = DE81A2D32316AC4D00AE1940 /* JitsiMeetLogger.m */; };
 		DE9A015E289A9A9A00E41CBB /* JitsiMeetView.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B412F171EDEC65D00B1A0A6 /* JitsiMeetView.m */; };
 		DE9A015F289A9A9A00E41CBB /* JitsiMeet.m in Sources */ = {isa = PBXBuildFile; fileRef = DEFE535321FB1BF800011A3A /* JitsiMeet.m */; };
+		DE9A0160289A9A9A00E41CBB /* JavaScriptSandbox.m in Sources */ = {isa = PBXBuildFile; fileRef = DE438CD82350934700DD541D /* JavaScriptSandbox.m */; };
 		DE9A0162289A9A9A00E41CBB /* Intents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0BB9AD781F5EC6D7001C08DB /* Intents.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		DE9A0163289A9A9A00E41CBB /* CallKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0BB9AD761F5EC6CE001C08DB /* CallKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		DE9A0166289A9A9A00E41CBB /* CallKitIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 0BC4B8681F8C01E100CE8B21 /* CallKitIcon.png */; };
@@ -159,6 +161,7 @@
 		C81E9AB825AC5AD800B134D9 /* ExternalAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExternalAPI.h; sourceTree = "<group>"; };
 		C8AFD27D2462C613000293D2 /* InfoPlistUtil.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InfoPlistUtil.h; sourceTree = "<group>"; };
 		C8AFD27E2462C613000293D2 /* InfoPlistUtil.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InfoPlistUtil.m; sourceTree = "<group>"; };
+		DE438CD82350934700DD541D /* JavaScriptSandbox.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JavaScriptSandbox.m; sourceTree = "<group>"; };
 		DE65AAC92317FFCD00290BEC /* LogUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LogUtils.h; sourceTree = "<group>"; };
 		DE65AACB2318028300290BEC /* JitsiMeetBaseLogHandler+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JitsiMeetBaseLogHandler+Private.h"; sourceTree = "<group>"; };
 		DE762DB322AFDE76000DEBD6 /* JitsiMeetUserInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetUserInfo.h; sourceTree = "<group>"; };
@@ -247,6 +250,7 @@
 				C69EFA02209A0EFD0027712B /* callkit */,
 				A4A934E7212F3AB8001E9388 /* dropbox */,
 				0BD906E91EC0C00300C8C18E /* Info.plist */,
+				DE438CD82350934700DD541D /* JavaScriptSandbox.m */,
 				0BD906E81EC0C00300C8C18E /* JitsiMeet.h */,
 				DEFE535821FB311F00011A3A /* JitsiMeet+Private.h */,
 				DEA9F283258A5D9900D4CD74 /* JitsiMeetSDK.h */,
@@ -677,6 +681,7 @@
 				DE81A2D52316AC4D00AE1940 /* JitsiMeetLogger.m in Sources */,
 				0B412F191EDEC65D00B1A0A6 /* JitsiMeetView.m in Sources */,
 				DEFE535421FB1BF800011A3A /* JitsiMeet.m in Sources */,
+				DE438CDA2350934700DD541D /* JavaScriptSandbox.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -709,6 +714,7 @@
 				4E0EF63328CA2FB3005D1B03 /* JMCallKitEmitter.m in Sources */,
 				DE9A015E289A9A9A00E41CBB /* JitsiMeetView.m in Sources */,
 				DE9A015F289A9A9A00E41CBB /* JitsiMeet.m in Sources */,
+				DE9A0160289A9A9A00E41CBB /* JavaScriptSandbox.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

ios/sdk/src/JavaScriptSandbox.m

@@ -0,0 +1,55 @@
+/*
+ * Copyright @ 2019-present 8x8, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@import JavaScriptCore;
+
+#import <React/RCTBridgeModule.h>
+
+
+@interface JavaScriptSandbox : NSObject<RCTBridgeModule>
+@end
+
+@implementation JavaScriptSandbox
+
+RCT_EXPORT_MODULE();
+
++ (BOOL)requiresMainQueueSetup {
+    return NO;
+}
+
+#pragma mark - Exported methods
+
+RCT_EXPORT_METHOD(evaluate:(NSString *)code
+                  resolve:(RCTPromiseResolveBlock)resolve
+                   reject:(RCTPromiseRejectBlock)reject) {
+    __block BOOL hasError = NO;
+    JSContext *ctx = [[JSContext alloc] init];
+    ctx.exceptionHandler = ^(JSContext *context, JSValue *exception) {
+        hasError = YES;
+        reject(@"evaluate", [exception toString], nil);
+    };
+    JSValue *ret = [ctx evaluateScript:code];
+    if (!hasError) {
+        NSString *result = [ret toString];
+        if (result == nil) {
+            reject(@"evaluate", @"Error in string coercion", nil);
+        } else {
+            resolve(result);
+        }
+    }
+}
+
+@end

ios/sdk/src/JitsiMeet.h

@@ -100,9 +100,6 @@ typedef NS_ENUM(NSInteger, WebRTCLoggingSeverity) {
 
 - (BOOL)isCrashReportingDisabled;
 
-/**
- * Shows the splash screen.
- */
-- (void)showSplashScreen;
+- (void)showSplashScreen:(UIView * _Nonnull) rootView;
 
 @end

ios/sdk/src/JitsiMeet.m

@@ -23,6 +23,7 @@
 #import "JitsiMeetView+Private.h"
 #import "RCTBridgeWrapper.h"
 #import "ReactUtils.h"
+#import "RNSplashScreen.h"
 #import "ScheenshareEventEmiter.h"
 
 #import <react-native-webrtc/WebRTCModuleOptions.h>
@@ -220,17 +221,8 @@
     return nil;
 }
 
-- (void)showSplashScreen {
-    Class splashClass = NSClassFromString(@"SplashView");
-    if (splashClass && [splashClass respondsToSelector:@selector(sharedInstance)]) {
-        id splashInstance = [splashClass performSelector:@selector(sharedInstance)];
-        if (splashInstance && [splashInstance respondsToSelector:@selector(showSplash)]) {
-            [splashInstance performSelector:@selector(showSplash)];
-            NSLog(@"✅ Splash Screen Shown Successfully");
-        }
-    } else {
-        NSLog(@"⚠️ SplashView module not found");
-    }
+- (void)showSplashScreen:(UIView*)rootView {
+    [RNSplashScreen showSplash:@"LaunchScreen" inRootView:rootView];
 }
 
 #pragma mark - Property getter / setters

ios/travis-ci/build-ipa.sh

@@ -0,0 +1,127 @@
+#!/bin/bash
+set -e
+
+# The script is based on tutorial written by Antonis Tsakiridis published at:
+# https://medium.com/@atsakiridis/continuous-deployment-for-ios-using-travis-ci-55dcea342d9
+#
+# It is intended to be executed through the Travis CI REST API call, as it
+# requires few arguments which are mandatory with no default values provided:
+# PR_REPO_SLUG - the Github name of the repo to be merged into the origin/master
+# PR_BRANCH - the branch to be merged, if set to "master" no merge will happen
+# IPA_DEPLOY_LOCATION - the location understandable by the "scp" command
+# executed at the end of the script to deploy the output .ipa file
+# LIB_JITSI_MEET_PKG (optional) - the npm package for lib-jitsi-meet which will
+# be put in place of the current version in the package.json file.
+#
+# Other than that the script requires the following env variables to be set
+# (reading the tutorial mentioned above will help in understanding the
+# variables):
+#
+# APPLE_CERT_URL - the URL pointing to Apple certificate (set to
+# http://developer.apple.com/certificationauthority/AppleWWDRCA.cer by default)
+# DEPLOY_SSH_CERT_URL - the SSH private key used by the 'scp' command to deploy
+# the .ipa. It is expected to be encrypted with the $ENCRYPTION_PASSWORD.
+# ENCRYPTION_PASSWORD - the password used to decrypt certificate/key files used
+# in the script.
+# IOS_DEV_CERT_KEY_URL - URL pointing to provisioning profile certificate key
+# file (development-key.p12.enc from the tutorial) encrypted with the
+# $ENCRYPTION_PASSWORD.
+# IOS_DEV_CERT_URL - URL pointing to provisioning profile certificate file
+# (development-cert.cer.enc from the tutorial) encrypted with the
+# $ENCRYPTION_PASSWORD.
+# IOS_DEV_PROV_PROFILE_URL - URL pointing to provisioning profile file
+# (profile-development-olympus.mobileprovision.enc from the tutorial) encrypted
+# with the $ENCRYPTION_PASSWORD.
+# IOS_SIGNING_CERT_PASSWORD - the password to the provisioning profile
+# certificate key (used to open development-key.p12 from the tutorial).
+# IOS_TEAM_ID - the team ID inserted into build-ipa-.plist.template file in
+# place of "YOUR_TEAM_ID".
+
+
+# Travis will not print the last echo if there's no sleep 1
+function echoSleepAndExit1() {
+    echo $1
+    sleep 1
+    exit 1
+}
+
+echo "TRAVIS_BRANCH=${TRAVIS_BRANCH}"
+echo "TRAVIS_REPO_SLUG=${TRAVIS_REPO_SLUG}"
+
+if [ -z $PR_REPO_SLUG ]; then
+    echoSleepAndExit1 "No PR_REPO_SLUG defined"
+fi
+if [ -z $PR_BRANCH ]; then
+    echoSleepAndExit1 "No PR_BRANCH defined"
+fi
+if [ -z $IPA_DEPLOY_LOCATION ]; then
+    echoSleepAndExit1 "No IPA_DEPLOY_LOCATION defined"
+fi
+
+echo "PR_REPO_SLUG=${PR_REPO_SLUG} PR_BRANCH=${PR_BRANCH}"
+
+# do the merge and git log
+
+if [ $PR_BRANCH != "master" ]; then
+    echo "Will merge ${PR_REPO_SLUG}/${PR_BRANCH} into master"
+    git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
+    git fetch origin master
+    git checkout master
+    git pull https://github.com/${PR_REPO_SLUG}.git $PR_BRANCH --no-edit
+fi
+
+# Link this lib-jitsi-meet checkout in jitsi-meet through the package.json
+if [ ! -z ${LIB_JITSI_MEET_PKG} ];
+then
+    echo "Adjusting lib-jitsi-meet package in package.json to ${LIB_JITSI_MEET_PKG}"
+    # escape for the sed
+    LIB_JITSI_MEET_PKG=$(echo $LIB_JITSI_MEET_PKG | sed -e 's/\\/\\\\/g; s/\//\\\//g; s/&/\\\&/g')
+    sed -i.bak -e "s/\"lib-jitsi-meet.*/\"lib-jitsi-meet\"\: \"${LIB_JITSI_MEET_PKG}\",/g" package.json
+    echo "Package.json lib-jitsi-meet line:"
+    grep lib-jitsi-meet package.json
+else
+    echo "LIB_JITSI_MEET_PKG var not set - will not modify the package.json"
+fi
+
+git log -20 --graph --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ar%Creset'
+
+#certificates
+CERT_DIR="ios/travis-ci/certs"
+
+mkdir -p $CERT_DIR
+
+./ios/ci/setup-certificates.sh $CERT_DIR
+
+curl -L -o ${CERT_DIR}/id_rsa.enc ${DEPLOY_SSH_CERT_URL}
+openssl aes-256-cbc -k "$ENCRYPTION_PASSWORD" -in ${CERT_DIR}/id_rsa.enc -d -a -out ${CERT_DIR}/id_rsa
+chmod 0600 ${CERT_DIR}/id_rsa
+ssh-add ${CERT_DIR}/id_rsa
+
+npm install
+
+# Ever since the Apple Watch app has been added the bitcode for WebRTC needs to be downloaded in order to build successfully
+./node_modules/react-native-webrtc/tools/downloadBitcode.sh
+
+cd ios
+pod install --repo-update --no-ansi
+cd ..
+
+mkdir -p /tmp/jitsi-meet/
+
+xcodebuild archive -quiet -workspace ios/jitsi-meet.xcworkspace -scheme jitsi-meet -configuration Release -archivePath /tmp/jitsi-meet/jitsi-meet.xcarchive
+
+sed -e "s/YOUR_TEAM_ID/${IOS_TEAM_ID}/g" ios/ci/build-ipa.plist.template > ios/ci/build-ipa.plist
+
+IPA_EXPORT_DIR=/tmp/jitsi-meet/jitsi-meet-ipa
+
+xcodebuild -quiet -exportArchive -archivePath /tmp/jitsi-meet/jitsi-meet.xcarchive -exportPath $IPA_EXPORT_DIR  -exportOptionsPlist ios/ci/build-ipa.plist
+
+echo "Will try deploy the .ipa to: ${IPA_DEPLOY_LOCATION}"
+
+if [ ! -z ${SCP_PROXY_HOST} ];
+then
+    scp -o ProxyCommand="ssh -t -A -l %r ${SCP_PROXY_HOST} -o \"StrictHostKeyChecking no\" -o \"BatchMode yes\" -W %h:%p"  -o StrictHostKeyChecking=no -o LogLevel=DEBUG "${IPA_EXPORT_DIR}/jitsi-meet.ipa" "${IPA_DEPLOY_LOCATION}"
+else
+    scp -o StrictHostKeyChecking=no -o LogLevel=DEBUG "${IPA_EXPORT_DIR}/jitsi-meet.ipa" "${IPA_DEPLOY_LOCATION}"
+fi
+

lang/languages.json

@@ -12,13 +12,13 @@
     "en": "English",
     "eo": "Esperanto",
     "es": "Español",
-    "es-US": "Español (Latinoamérica)",
+    "esUS": "Español (Latinoamérica)",
     "et": "Eesti",
     "eu": "Euskara",
     "fa": "فارسی",
     "fi": "Suomi",
     "fr": "Français",
-    "fr-CA": "Français (Canada)",
+    "frCA": "Français (Canada)",
     "gl": "Galego",
     "he": "עברית",
     "hi": "हिन्दी",
@@ -43,7 +43,7 @@
     "oc": "Occitan",
     "pl": "Polski",
     "pt": "Português",
-    "pt-BR": "Português (Brasil)",
+    "ptBR": "Português (Brasil)",
     "ro": "Română",
     "ru": "Русский",
     "sc": "Sardu",
@@ -56,6 +56,6 @@
     "tr": "Türkçe",
     "uk": "Українська",
     "vi": "Tiếng Việt",
-    "zh-CN": "中文（简体）",
-    "zh-TW": "中文（繁體）"
+    "zhCN": "中文（简体）",
+    "zhTW": "中文（繁體）"
 }

lang/main-ar.json

@@ -835,6 +835,7 @@
         "or": "أو",
         "premeeting": "ما قبل المُلتقى",
         "screenSharingError": "خطأ في مشاركة الشاشة:",
+        "showScreen": "تفعيل واجهة ما قبل المُلتقى",
         "startWithPhone": "البدء مع جهاز الصوت من الجوال",
         "videoOnlyError": "خطأ في الفيديو:",
         "videoTrackError": "لم نتمكن من إنشاء ملف الفيديو",

lang/main-ca.json

@@ -842,6 +842,7 @@
         "or": "o",
         "premeeting": "Prereunió",
         "screenSharingError": "Error en compartir la pantalla:",
+        "showScreen": "Activa la pantalla de prereunió",
         "startWithPhone": "Comença amb àudio de telèfon",
         "videoOnlyError": "Error del vídeo:",
         "videoTrackError": "No s'ha pogut crear la pista de vídeo.",
@@ -915,7 +916,7 @@
         "localRecordingStartWarningTitle": "Atura l'enregistrament per a desar-lo",
         "localRecordingVideoStop": "Aturar el vídeo també aturarà l'enregistrament local. Segur que voleu continuar?",
         "localRecordingVideoWarning": "Per a enregistrar el vostre vídeo, cal que ho feu en començar l'enregistrament",
-        "localRecordingWarning": "Assegureu-vos de triar la pestanya actual per a poder usar el vídeo i àudios correctes.",
+        "localRecordingWarning": "Assegureu-vos de triar la pestanya actual per a poder usar el vídeo i àudios correctes. L'enregistrament actualment està limitat a 1 GB. Això són, aproximadament, 100 minuts.",
         "loggedIn": "Sessió iniciada com a {{userName}}",
         "noStreams": "No s'ha detectat flux d'àudio ni vídeo.",
         "off": "S'ha aturat l'enregistrament",

lang/main-cs.json

@@ -976,6 +976,7 @@
         "proceedAnyway": "Přesto pokračujte",
         "recordingWarning": "Ostatní účastníci mohou tento hovor nahrávat",
         "screenSharingError": "Chyba sdílení obrazovky:",
+        "showScreen": "Zapnout obrazovku před setkáním",
         "startWithPhone": "Začít se zvukem přes telefon",
         "unsafeRoomConsent": "Chápu rizika, chci se připojit k setkání",
         "videoOnlyError": "Chyba videa:",
@@ -1046,7 +1047,7 @@
         "localRecordingStartWarningTitle": "Zastavte záznam, abyste jej uložili",
         "localRecordingVideoStop": "Zastavením videa se zastaví také místní nahrávání. Opravdu chcete pokračovat?",
         "localRecordingVideoWarning": "Chcete-li nahrát video, musíte jej mít zapnutý při zahájení nahrávání",
-        "localRecordingWarning": "Ujistěte se, že jste vybrali aktuální kartu, abyste mohli použít správné video a zvuk.",
+        "localRecordingWarning": "Ujistěte se, že jste vybrali aktuální kartu, abyste mohli použít správné video a zvuk. Záznam je aktuálně omezen na 1GB, což je kolem 100 minut.",
         "loggedIn": "Přihlášen/a jako {{userName}}",
         "noMicPermission": "Kanál mikrofonu nelze vytvořit. Udělte prosím povolení k použití mikrofonu.",
         "noStreams": "Nebyl zjištěn žádný audio nebo video stream.",

lang/main-de.json

@@ -122,9 +122,7 @@
         "nickname": {
             "popover": "Wähle einen Alias",
             "title": "Geben Sie einen Alias zum Chatten ein",
-            "titleWithCC": "Geben Sie einen Alias zum Chatten und für Untertitel ein",
-            "titleWithPolls": "Geben Sie einen Alias zum Chatten und für Umfragen ein",
-            "titleWithPollsAndCC": "Geben Sie einen Alias zum Chatten, für Umfragen und Untertitel ein"
+            "titleWithPolls": "Geben Sie einen Alias zum Chatten ein"
         },
         "noMessagesMessage": "Es gibt noch keine Nachricht in dieser Konferenz. Starten Sie hier eine Unterhaltung!",
         "privateNotice": "Private Nachricht an {{recipient}}",
@@ -133,13 +131,10 @@
         "systemDisplayName": "System",
         "tabs": {
             "chat": "Chatten",
-            "closedCaptions": "Untertitel",
             "polls": "Umfragen"
         },
         "title": "Chatten",
-        "titleWithCC": "Chatten und Untertitel",
         "titleWithPolls": "Chatten und Umfragen",
-        "titleWithPollsAndCC": "Chatten, Umfragen und Untertitel",
         "you": "Sie"
     },
     "chromeExtensionBanner": {
@@ -149,10 +144,6 @@
         "dontShowAgain": "Hinweis nicht mehr anzeigen",
         "installExtensionText": "Installieren Sie die Erweiterung für die Integration von Google Calendar und Office 365"
     },
-    "closedCaptionsTab": {
-        "emptyState": "Die Untertitel sind verfügbar, sobald sie von der Moderation gestartet wurden",
-        "startClosedCaptionsButton": "Untertitel starten"
-    },
     "connectingOverlay": {
         "joiningRoom": "Eine Verbindung zu Ihrer Konferenz wird hergestellt…"
     },
@@ -272,8 +263,7 @@
         "Remove": "Entfernen",
         "Share": "Teilen",
         "Submit": "OK",
-        "Understand": "Verstanden, Stummschaltung beibehalten",
-        "UnderstandAndUnmute": "Verstanden, bitte Stummschaltung aufheben",
+        "Understand": "Verstanden",
         "WaitForHostMsg": "Die Konferenz wurde noch nicht gestartet. Falls Sie die Konferenz leiten, authentifizieren Sie sich bitte. Warten Sie andernfalls, bis die Konferenz gestartet wird.",
         "WaitForHostNoAuthMsg": "Die Konferenz wurde noch nicht gestartet. Bitte warten Sie, bis die Konferenz gestartet wird.",
         "WaitingForHostButton": "Auf Moderation warten",
@@ -310,7 +300,6 @@
         "conferenceReloadMsg": "Wir versuchen das zu beheben. Verbinde in {{seconds}} Sekunden …",
         "conferenceReloadTitle": "Leider ist etwas schiefgegangen.",
         "confirm": "Bestätigen",
-        "confirmBack": "Zurück",
         "confirmNo": "Nein",
         "confirmYes": "Ja",
         "connectError": "Oh! Es hat etwas nicht geklappt und der Konferenz konnte nicht beigetreten werden.",
@@ -348,7 +337,6 @@
         "kickParticipantTitle": "Person entfernen?",
         "kickSystemTitle": "Autsch! Sie wurden aus der Konferenz geworfen",
         "kickTitle": "Autsch! {{participantDisplayName}} hat Sie aus der Konferenz geworfen",
-        "learnMore": "Mehr erfahren",
         "linkMeeting": "Konferenz verlinken",
         "linkMeetingTitle": "Konferenz mit Salesforce verlinken",
         "liveStreaming": "Livestreaming",
@@ -406,9 +394,7 @@
         "recentlyUsedObjects": "Ihre zuletzt verwendeten Objekte",
         "recording": "Aufnahme",
         "recordingDisabledBecauseOfActiveLiveStreamingTooltip": "Während eines Livestreams nicht möglich",
-        "recordingInProgressDescription": "Diese Konferenz wird aufgezeichnet und von KI analysiert {{learnMore}}. Ihr Ton und Video ist deaktiviert, wenn Sie es aktivieren, stimmen Sie der Aufzeichnung zu.",
-        "recordingInProgressDescriptionFirstHalf": "Diese Konferenz wird aufgezeichnet und von KI analysiert",
-        "recordingInProgressDescriptionSecondHalf": ". Ihr Ton und Video ist deaktiviert, wenn Sie es aktivieren, stimmen Sie der Aufzeichnung zu.",
+        "recordingInProgressDescription": "Diese Konferenz wird aufgezeichnet. Ihr Ton und Video ist deaktiviert, wenn Sie es aktivieren, stimmen Sie der Aufzeichnung zu.",
         "recordingInProgressTitle": "Aufnahme läuft",
         "rejoinNow": "Jetzt erneut beitreten",
         "remoteControlAllowedMessage": "{{user}} hat die Anfrage zur Fernsteuerung angenommen!",
@@ -998,6 +984,7 @@
         "proceedAnyway": "Trotzdem fortsetzen",
         "recordingWarning": "Diese Konferenz wird möglicherweise von anderen Personen aufgezeichnet",
         "screenSharingError": "Fehler bei Bildschirmfreigabe:",
+        "showScreen": "Konferenzvorschau aktivieren",
         "startWithPhone": "Mit Telefonaudio starten",
         "unsafeRoomConsent": "Ich verstehe das Risiko und möchte der Konferenz beitreten",
         "videoOnlyError": "Videofehler:",
@@ -1068,7 +1055,7 @@
         "localRecordingStartWarningTitle": "Aufzeichnung zum Speichern beenden",
         "localRecordingVideoStop": "Wenn Sie ihre Kamera abschalten wird auch die Aufnahme beendet. Sind Sie sicher, dass Sie fortfahren möchten?",
         "localRecordingVideoWarning": "Um Ihr eigenes Kamerabild aufzuzeichnen, müssen Sie Ihre Kamera beim Start der Aufnahme einschalten",
-        "localRecordingWarning": "Bitte prüfen Sie, dass das aktuelle Tab auswählen, um Bild und Ton aufzuzeichnen.",
+        "localRecordingWarning": "Bitte prüfen Sie, dass das aktuelle Tab auswählen, um Bild und Ton aufzuzeichnen. Die Länge der Aufzeichnung ist aktuell auf 1GB beschränkt, was ungefähr 100 Minuten entspricht.",
         "loggedIn": "Als {{userName}} angemeldet",
         "noMicPermission": "Zugriff auf Mikrofon fehlgeschlagen. Bitte erlauben Sie den Zugriff auf das Mikrofon.",
         "noStreams": "Kein Ton oder Video erkannt.",
@@ -1152,7 +1139,6 @@
         "selectMic": "Mikrofon",
         "selfView": "Eigene Ansicht",
         "shortcuts": "Tastaturkürzel",
-        "showSubtitlesOnStage": "Untertitel in Hauptansicht anzeigen",
         "speakers": "Lautsprecher",
         "startAudioMuted": "Alle Personen treten stummgeschaltet bei",
         "startReactionsMuted": "Interaktionstöne für alle deaktivieren",
@@ -1249,7 +1235,6 @@
             "closeChat": "Chat schließen",
             "closeMoreActions": "„Weitere Einstellungen“ schließen",
             "closeParticipantsPane": "Anwesendenliste schließen",
-            "closedCaptions": "Untertitel",
             "collapse": "Einklappen",
             "document": "Geteiltes Dokument schließen",
             "documentClose": "Geteiltes Dokument schließen",
@@ -1340,7 +1325,6 @@
         "closeChat": "Chat schließen",
         "closeParticipantsPane": "Anwesenheitsliste schließen",
         "closeReactionsMenu": "Interaktionsmenü schließen",
-        "closedCaptions": "Untertitel",
         "disableNoiseSuppression": "Rauschunterdrückung deaktivieren",
         "disableReactionSounds": "Sie können die Interaktionstöne für diese Konferenz deaktivieren",
         "documentClose": "Geteiltes Dokument schließen",
@@ -1433,16 +1417,13 @@
         "failed": "Transkribieren fehlgeschlagen",
         "labelTooltip": "Die Konferenz wird transkribiert",
         "labelTooltipExtra": "Zusätzlich wird das Transkript später verfügbar sein.",
-        "openClosedCaptions": "Untertitel öffnen",
-        "original": "Original",
         "sourceLanguageDesc": "Aktuell ist die Sprache der Konferenz auf <b>{{sourceLanguage}}</b> eingestellt. <br/> Sie könne dies hier ",
         "sourceLanguageHere": "ändern",
         "start": "Anzeige der Untertitel starten",
         "stop": "Anzeige der Untertitel stoppen",
         "subtitles": "Untertitel",
         "subtitlesOff": "Ausschalten",
-        "tr": "TR",
-        "translateTo": "Übersetzen in"
+        "tr": "TR"
     },
     "unpinParticipant": "{{participantName}} - Nicht mehr anheften",
     "userMedia": {

lang/main-dsb.json

@@ -845,6 +845,7 @@
         "or": "abo",
         "premeeting": "naglěd",
         "screenSharingError": "zmólenje pśi sobuźělenju monitora:",
+        "showScreen": "naglěd konferency aktiwěrowaś",
         "startWithPhone": "zachopiś z telefonowym audio",
         "videoOnlyError": "zmólenje wideo:",
         "videoTrackError": "Sćažka wideo njejo mógła se załožyś.",
@@ -915,7 +916,7 @@
         "localRecordingStartWarningTitle": "nagrawanje dokóńcowaś a zachowaś",
         "localRecordingVideoStop": "Gaž kameru wušaltujośo, ga teke lokalne nagrawanje se dokóńcujo. Sćo-li napšawdu wěste, až to cośo?",
         "localRecordingVideoWarning": "Aby bildu ze swójeje samskeje kamery nagrawali, musyśo swóju kameru na zachopjeńku nagrawanja zašaltowaś.",
-        "localRecordingWarning": "Pśespytujśo, lěc sćo aktuelnu kórtu wuzwólili, aby wideo a zuk nagrawali.",
+        "localRecordingWarning": "Pśespytujśo, lěc sćo aktuelnu kórtu wuzwólili, aby wideo a zuk nagrawali. Dłujkosć nagrawanja jo tuchylu na 1 GB wobgranicowana, což dosega za jadnab 100 minutow.",
         "loggedIn": "ako {{userName}} zalogowany/-a",
         "noMicPermission": "",
         "noStreams": "Žeden zuk a žeden wideo njejo namakany.",

lang/main-el.json

@@ -862,6 +862,7 @@
         "or": "ή",
         "premeeting": "Προ σύσκεψη",
         "screenSharingError": "Σφάλμα διαμοιρασμού οθόνης:",
+        "showScreen": "Ενεργοποίηση οθόνης προ σύσκεψης",
         "startWithPhone": "Ξεκινήστε με ήχο τηλεφώνου",
         "videoOnlyError": "Σφάλμα βίντεο:",
         "videoTrackError": "Δεν ήταν δυνατή η δημιουργία κομματιού βίντεο.",
@@ -929,7 +930,7 @@
         "localRecordingStartWarningTitle": "Σταματήστε τη καταγραφή για να την αποθηκεύσετε",
         "localRecordingVideoStop": "Σταματώντας το βίντεο σας θα σταματήσει και η τοπική καταγραφή. Θέλετε να συνεχίσετε;",
         "localRecordingVideoWarning": "Για να καταγράψετε το βίντεο σας πρέπει να είναι ήδη ενεργό όταν ξεκινήσει η καταγραφή",
-        "localRecordingWarning": "Βεβαιωθείτε ότι επιλέξατε τη τρέχουσα σελίδα ώστε να χρησιμοποιηθούν το σωστό βίντεο και ήχος.",
+        "localRecordingWarning": "Βεβαιωθείτε ότι επιλέξατε τη τρέχουσα σελίδα ώστε να χρησιμοποιηθούν το σωστό βίντεο και ήχος. Αυτή τη στιγμή η καταγραφή είναι μέχρι 1GB, περίπου 100 λεπτά.",
         "loggedIn": "Συνδέθηκε ως {{userName}}",
         "noMicPermission": "Δεν ήταν δυνατή η δημιουργία του κομματιού του μικροφώνου. Παρακαλώ δώστε την άδεια για χρήση του.",
         "noStreams": "Δεν εντοπίστηκε ροή ήχου ή βίντεο.",

lang/main-eo.json

@@ -935,6 +935,7 @@
         "premeeting": "Antaŭkunveno",
         "proceedAnyway": "Daŭrigi",
         "screenSharingError": "Eraro kun la ekrandividado:",
+        "showScreen": "Ebligu antaŭkunvenon ekranon",
         "startWithPhone": "Komencu kun la telefona sono",
         "unsafeRoomConsent": "Akceptu la riskojn, kaj daŭrigi",
         "videoOnlyError": "Eraro kun la videaĵo:",
@@ -1006,7 +1007,7 @@
         "localRecordingStartWarningTitle": "Ĉesigu la registradon por konservi ĝin.",
         "localRecordingVideoStop": "Ĉesigi vian videaĵon ankaŭ ĉesos la lokan registradon. Ĉu vi certas, ke vi volas daŭrigi?",
         "localRecordingVideoWarning": "Por registri vian videon, ŝaltu la kameraon antaŭ vi komencas la registradon.",
-        "localRecordingWarning": "Certigu, ke vi elektas la nunan langeton por uzi la ĝustajn filmetojn kaj sonojn.",
+        "localRecordingWarning": "Certigu, ke vi elektas la nunan langeton por uzi la ĝustajn filmetojn kaj sonojn. La registrado estas nuntempe limigita al 1GB, kio estas proksimume 100 minutoj.",
         "loggedIn": "Ensalutinta kiel {{userName}}",
         "noMicPermission": "Mikrofono ne povis esti uzata. Bonvole donu permeson uzi la mikrofonon.",
         "noStreams": "Neniu aŭdio aŭ videofluo detektita.",

lang/main-es.json

@@ -886,6 +886,7 @@
         "premeeting": "Pre-reunión",
         "proceedAnyway": "Continuar de todos modos",
         "screenSharingError": "Error al compartir pantalla:",
+        "showScreen": "Habilitar pantalla pre-reunión",
         "startWithPhone": "Iniciar con audio de llamada telefónica",
         "unsafeRoomConsent": "Comprendo los riesgos, quiero unirme a la reunión",
         "videoOnlyError": "Error con el vídeo:",
@@ -957,7 +958,7 @@
         "localRecordingStartWarningTitle": "Detenga la grabación para guardarla",
         "localRecordingVideoStop": "Detener su video también detendrá la grabación local. ¿Está seguro de querer continuar?",
         "localRecordingVideoWarning": "Para grabar su video debe tenerlo encendido al iniciar la grabación",
-        "localRecordingWarning": "Asegúrese de seleccionar la pestaña actual para usar el video y audio correctos.",
+        "localRecordingWarning": "Asegúrese de seleccionar la pestaña actual para usar el video y audio correctos. La grabación está actualmente limitada a 1GB, que son aproximadamente 100 minutos.",
         "loggedIn": "Sesión iniciada como {{userName}}",
         "noMicPermission": "No se pudo crear la pista de micrófono. Por favor otorgue permiso para usar el micrófono.",
         "noStreams": "",

lang/main-esUS.json

@@ -759,6 +759,7 @@
         "or": "o",
         "premeeting": "Pre-reunión",
         "screenSharingError": "Error al compartir pantalla:",
+        "showScreen": "Habilitar pantalla pre-reunión",
         "startWithPhone": "Iniciar con audio de llamada telefónica",
         "videoOnlyError": "Error con el video:",
         "videoTrackError": "No se pudo crear la pista de video.",

lang/main-eu.json

@@ -646,6 +646,7 @@
         "or": "edo",
         "premeeting": "Aurre-bilera",
         "screenSharingError": "Errorea pantaila partekatzean:",
+        "showScreen": "Aktibatu bileraren aurreko pantaila",
         "startWithPhone": "Telefono diearen audioarekin hasi",
         "videoOnlyError": "Errorea bideoan:",
         "videoTrackError": "Ezin izan da bideo pista sortu.",

lang/main-fa.json

@@ -894,6 +894,7 @@
         "premeeting": "پیش‌جلسه",
         "proceedAnyway": "در هر صورت انجام شود",
         "screenSharingError": "خطا در هم‌رسانی صفحه:",
+        "showScreen": "فعال‌سازی صفحهٔ پیش‌جلسه",
         "startWithPhone": "شروع با صدای گوشی",
         "unsafeRoomConsent": "من خطر احتمالی را درک می‌کنم؛ می‌خواهم به جلسه بپیوندم",
         "videoOnlyError": "خطای ویدیو:",

lang/main-fr.json

@@ -109,26 +109,20 @@
         }
     },
     "chat": {
-        "disabled": "L'envoi de messages de chat est désactivé.",
         "enter": "Entrez dans le salon",
         "error": "Erreur : votre message n'a pas été envoyé. Raison : {{error}}",
-        "everyone": "Tout le monde",
         "fieldPlaceHolder": "Tapez votre message ici",
-        "guestsChatIndicator": "(invité)",
         "lobbyChatMessageTo": "Message de salle d'attente à {{recipient}}",
         "message": "Message",
         "messageAccessibleTitle": "{{user}} dit: ",
         "messageAccessibleTitleMe": "Je dis: ",
         "messageTo": "Message privé à {{recipient}}",
-        "messagebox": "Envoyer un message",
+        "messagebox": "Saisissez un message",
         "newMessages": "Nouveaux messages",
         "nickname": {
             "popover": "Choisissez un pseudonyme",
             "title": "Entrez un pseudonyme pour utiliser le chat",
-            "titleWithCC": "Entrez un pseudonyme pour utiliser le chat et les sous-titres",
-            "titleWithPolls": "Entrez un pseudonyme pour utiliser le chat et les sondages",
-            "titleWithPollsAndCC": "Entrez un pseudonyme pour utiliser le chat, les sondages et les sous-titres",
-            "titleWithPollsAndCCAndFileSharing": "Entrez un pseudonyme pour utiliser le chat, les sondages, les sous-titres et les fichiers"
+            "titleWithPolls": "Entrez un pseudonyme pour utiliser le chat et les sondages"
         },
         "noMessagesMessage": "Il n'y a pas encore de messages dans cette réunion. Démarrez une conversation ici !",
         "privateNotice": "Message privé à {{recipient}}",
@@ -137,14 +131,9 @@
         "systemDisplayName": "Système",
         "tabs": {
             "chat": "Chat",
-            "closedCaptions": "ST",
-            "fileSharing": "Fichiers",
             "polls": "Sondages"
         },
         "title": "Chat",
-        "titleWithCC": "ST",
-        "titleWithFeatures": "Chat et",
-        "titleWithFileSharing": "Fichiers",
         "titleWithPolls": "Chat et Sondages",
         "you": "vous"
     },
@@ -155,10 +144,6 @@
         "dontShowAgain": "Ne plus m'afficher ceci",
         "installExtensionText": "Installer l'extension pour l'intégration de Google Calendar et Office 365"
     },
-    "closedCaptionsTab": {
-        "emptyState": "Le contenu des sous-titres sera disponible une fois qu'un modérateur l'aura démarré",
-        "startClosedCaptionsButton": "Démarrer les sous-titres"
-    },
     "connectingOverlay": {
         "joiningRoom": "Connexion à la réunion…"
     },
@@ -278,8 +263,7 @@
         "Remove": "Supprimer",
         "Share": "Partager",
         "Submit": "Soumettre",
-        "Understand": "Je comprends, gardez-moi en sourdine pour l'instant",
-        "UnderstandAndUnmute": "Je comprends, veuillez me réactiver s'il vous plaît",
+        "WaitForHostMsg": "La conférence n'a pas encore commencé. Si vous en êtes l'hôte, veuillez vous authentifier. Sinon, veuillez attendre son arrivée.",
         "WaitForHostNoAuthMsg": "La conférence n'a pas encore commencé car aucun modérateur n'est encore arrivé. Veuillez patienter.",
         "WaitingForHostButton": "Attendre l'hôte",
         "WaitingForHostTitle": "En attente de l'hôte…",
@@ -301,12 +285,6 @@
         "alreadySharedVideoTitle": "Une seule vidéo partagée est autorisée à la fois",
         "applicationWindow": "Fenêtre d'application",
         "authenticationRequired": "Authentification requise",
-        "cameraCaptureDialog": {
-            "description": "Prendre et envoyer une photo en utilisant votre caméra mobile",
-            "ok": "Ouvrir la caméra",
-            "reject": "Pas maintenant",
-            "title": "Prendre une photo"
-        },
         "cameraConstraintFailedError": "Votre caméra ne satisfait pas certaines des contraintes nécessaires.",
         "cameraNotFoundError": "La caméra n'a pas été trouvée.",
         "cameraNotSendingData": "Impossible d'accéder à votre caméra. Veuillez sélectionner un autre périphérique dans les paramètres ou rafraîchir la page.",
@@ -321,7 +299,6 @@
         "conferenceReloadMsg": "On essaie d'arranger ça. Reconnexion dans {{seconds}} secondes…",
         "conferenceReloadTitle": "Malheureusement, un problème est survenu",
         "confirm": "Confirmer",
-        "confirmBack": "Retour",
         "confirmNo": "Non",
         "confirmYes": "Oui",
         "connectError": "Oups ! Un problème est survenu et la connexion à la conférence est impossible.",
@@ -359,7 +336,6 @@
         "kickParticipantTitle": "Expulser ce participant ?",
         "kickSystemTitle": "Oups ! Vous avez été expulsé de la réunion",
         "kickTitle": "Oups ! vous avez été expulsé(e) par {{participantDisplayName}}",
-        "learnMore": "en savoir plus",
         "linkMeeting": "Relier la conférence",
         "linkMeetingTitle": "Relier la conférence à Salesforce",
         "liveStreaming": "Direct",
@@ -382,34 +358,22 @@
         "micTimeoutError": "Impossible de démarrer la source audio. Délai dépassé!",
         "micUnknownError": "Vous ne pouvez pas utiliser le microphone pour une raison inconnue.",
         "moderationAudioLabel": "Autoriser les participants à réactiver leur micro",
-        "moderationDesktopLabel": "Autoriser les non-modérateurs à partager leur écran",
         "moderationVideoLabel": "Autoriser les participants à démarrer leur vidéo",
         "muteEveryoneDialog": "Êtes-vous sûr de vouloir couper les micros de tout le monde ? Vous ne pourrez plus réactiver leur micro, mais ils pourront l'activer par eux-mêmes à tout moment.",
         "muteEveryoneDialogModerationOn": "Les participants peuvent demander à parler n'importe quand",
         "muteEveryoneElseDialog": "Une fois leur micro coupé, vous ne pourrez plus le réactiver, mais ils pourront l'activer par eux-mêmes à tout moment.",
         "muteEveryoneElseTitle": "Couper le micro de tout le monde sauf de {{whom}} ?",
-        "muteEveryoneElsesDesktopDialog": "Une fois le partage arrêté, vous ne pourrez pas le redémarrer, mais ils peuvent le faire à tout moment.",
-        "muteEveryoneElsesDesktopTitle": "Arrêter le partage d'écran de tout le monde sauf {{whom}} ?",
         "muteEveryoneElsesVideoDialog": "Une fois la caméra coupée, vous ne pourrez plus la rallumer, mais ils peuvent la rallumer à tout moment.",
         "muteEveryoneElsesVideoTitle": "Couper la vidéo de tout le monde sauf {{whom}}?",
         "muteEveryoneSelf": "vous",
         "muteEveryoneStartMuted": "Tout le monde démarre avec le micro coupé",
         "muteEveryoneTitle": "Couper le micro de tout le monde ?",
-        "muteEveryonesDesktopDialog": "Les participants peuvent partager leur écran à tout moment.",
-        "muteEveryonesDesktopDialogModerationOn": "Les participants peuvent envoyer une demande pour partager leur écran à tout moment.",
-        "muteEveryonesDesktopTitle": "Arrêter le partage d'écran de tout le monde ?",
         "muteEveryonesVideoDialog": "Êtes-vous sûr de vouloir couper la caméra de tout le monde? Vous ne pourrez pas la réactiver, mais ils peuvent la remettre à tout moment.",
         "muteEveryonesVideoDialogModerationOn": "Les participants peuvent demander à activer leur caméra n'importe quand.",
         "muteEveryonesVideoDialogOk": "Désactiver",
         "muteEveryonesVideoTitle": "Couper la caméra de tout le monde?",
         "muteParticipantBody": "Vous ne pourrez plus réactiver son micro, mais il pourra l'activer par lui-même à tout moment.",
         "muteParticipantButton": "Couper le micro",
-        "muteParticipantsDesktopBody": "Vous ne pourrez pas démarrer leur partage d'écran, mais ils peuvent le faire à tout moment.",
-        "muteParticipantsDesktopBodyModerationOn": "Vous ne pourrez pas démarrer leur partage d'écran et eux non plus.",
-        "muteParticipantsDesktopButton": "Arrêter le partage d'écran",
-        "muteParticipantsDesktopDialog": "Êtes-vous sûr de vouloir désactiver le partage d'écran de ce participant ? Vous ne pourrez pas le redémarrer, mais ils peuvent le faire à tout moment.",
-        "muteParticipantsDesktopDialogModerationOn": "Êtes-vous sûr de vouloir désactiver le partage d'écran de ce participant ? Vous ne pourrez pas réactiver l'écran et eux non plus.",
-        "muteParticipantsDesktopTitle": "Désactiver le partage d'écran de ce participant ?",
         "muteParticipantsVideoBody": "Vous ne pourrez pas rallumer la caméra, mais ils peuvent la rallumer à tout moment.",
         "muteParticipantsVideoBodyModerationOn": "Ni vous ni le participant ne pourront rallumer la caméra.",
         "muteParticipantsVideoButton": "Couper la caméra",
@@ -429,10 +393,6 @@
         "recentlyUsedObjects": "Vos objets récemment utilisés",
         "recording": "Enregistrement",
         "recordingDisabledBecauseOfActiveLiveStreamingTooltip": "Impossible durant le direct",
-        "recordingInProgressDescription": "Cette réunion est en cours d'enregistrement et d'analyse par IA{{learnMore}}. Votre audio et vidéo ont été coupés. Si vous choisissez de vous réactiver, vous consentez à être enregistré.",
-        "recordingInProgressDescriptionFirstHalf": "Cette réunion est en cours d'enregistrement et d'analyse par IA",
-        "recordingInProgressDescriptionSecondHalf": ". Votre audio et vidéo ont été coupés. Si vous choisissez de vous réactiver, vous consentez à être enregistré.",
-        "recordingInProgressTitle": "Enregistrement en cours",
         "rejoinNow": "Rejoindre maintenant",
         "remoteControlAllowedMessage": "{{user}} a accepté votre demande de prise en main à distance !",
         "remoteControlDeniedMessage": "{{user}} a refusé votre demande de prise en main à distance !",
@@ -562,23 +522,6 @@
         "veryBad": "Très mauvais",
         "veryGood": "Très bon"
     },
-    "fileSharing": {
-        "downloadFailedDescription": "Veuillez réessayer.",
-        "downloadFailedTitle": "Échec du téléchargement",
-        "downloadFile": "Télécharger",
-        "downloadStarted": "Téléchargement de fichier démarré",
-        "dragAndDrop": "Glissez et déposez des fichiers ici ou n'importe où sur l'écran",
-        "fileAlreadyUploaded": "Le fichier a déjà été téléchargé vers cette réunion.",
-        "fileTooLargeDescription": "Veuillez vous assurer que le fichier ne dépasse pas {{ maxFileSize }}.",
-        "fileTooLargeTitle": "Le fichier sélectionné est trop volumineux",
-        "fileUploadProgress": "Progression du téléchargement de fichier",
-        "fileUploadedSuccessfully": "Fichier téléchargé avec succès",
-        "removeFile": "Supprimer",
-        "removeFileSuccess": "Fichier supprimé avec succès",
-        "uploadFailedDescription": "Veuillez réessayer.",
-        "uploadFailedTitle": "Échec du téléchargement",
-        "uploadFile": "Partager un fichier"
-    },
     "filmstrip": {
         "accessibilityLabel": {
             "heading": "Vignettes vidéos"
@@ -747,8 +690,7 @@
         "notificationTitle": "Salle d'attente",
         "passwordJoinButton": "Rejoindre",
         "title": "Salle d'attente",
-        "toggleLabel": "Activer la salle d'attente",
-        "waitForModerator": "La conférence n'a pas encore commencé car aucun modérateur n'est encore arrivé. Si vous souhaitez devenir modérateur, veuillez vous connecter. Sinon, veuillez attendre."
+        "toggleLabel": "Activer la salle d'attente"
     },
     "localRecording": {
         "clientState": {
@@ -791,10 +733,7 @@
     "me": "moi",
     "notify": {
         "OldElectronAPPTitle": "Faille de sécurité !",
-        "allowAll": "Tout autoriser",
-        "allowAudio": "Autoriser l'audio",
-        "allowDesktop": "Autoriser le partage d'écran",
-        "allowVideo": "Autoriser la vidéo",
+        "allowAction": "Permettre",
         "allowedUnmute": "Vous pouvez réactiver votre écran, votre caméra ou partager votre écran.",
         "audioUnmuteBlockedDescription": "Le rétablissement du son a été bloqué temporairement en raison de limites système.",
         "audioUnmuteBlockedTitle": "Rétablissement du son bloqué !",
@@ -807,10 +746,8 @@
         "dataChannelClosedDescription": "Le canal de communication avec le Bridge a été interrompu, la qualité vidéo se trouve limitée à sa valeur la plus faible.",
         "dataChannelClosedDescriptionWithAudio": "Le canal de pont est fermé, ce qui peut entraîner des perturbations de l'audio et de la vidéo.",
         "dataChannelClosedWithAudio": "La qualité de l'audio et de la vidéo peut être altérée",
-        "desktopMutedRemotelyTitle": "Votre partage d'écran a été arrêté par {{participantDisplayName}}",
         "disabledIframe": "L'intégration Iframe est uniquement destinée à des démos, cet appel se terminera dans {{timeout}} minutes.",
-        "disabledIframeSecondaryNative": "L'intégration de {{domain}} est uniquement destinée aux fins de démonstration, cet appel se terminera dans {{timeout}} minutes.",
-        "disabledIframeSecondaryWeb": "L'intégration de {{domain}} est uniquement destinée aux fins de démonstration, cet appel se terminera dans {{timeout}} minutes. Veuillez utiliser <a href='{{jaasDomain}}' rel='noopener noreferrer' target='_blank'>Jitsi as a Service</a> pour l'intégration en production !",
+        "disabledIframeSecondary": "L'intégration Iframe de {{domaine}} est uniquement destinée à des démos, cet appel se terminera dans {{timeout}} minutes.",
         "disconnected": "déconnecté",
         "displayNotifications": "Afficher les notifications pour",
         "dontRemindMe": "Ne pas me le rappeler",
@@ -865,7 +802,6 @@
         "oldElectronClientDescription1": "Vous semblez utiliser une ancienne version du client Jitsi Meet qui présente des failles de sécurité connues. Veuillez vous assurer de mettre à jour vers notre ",
         "oldElectronClientDescription2": "dernière build",
         "oldElectronClientDescription3": " rapidement !",
-        "openChat": "Ouvrir le chat",
         "participantWantsToJoin": "souhaite rejoindre la réunion",
         "participantsWantToJoin": "souhaitent rejoindre la réunion",
         "passwordRemovedRemotely": "Le $t(lockRoomPassword) a été supprimé par un autre participant",
@@ -889,8 +825,6 @@
         "suggestRecordingDescription": "Souhaitez-vous démarrer un enregistrement ?",
         "suggestRecordingTitle": "Enregistrer cette réunion",
         "unmute": "Rétablir le son",
-        "unmuteScreen": "Démarrer le partage d'écran",
-        "unmuteVideo": "Réactiver la vidéo",
         "videoMutedRemotelyDescription": "Vous pouvez toujours la réactiver.",
         "videoMutedRemotelyTitle": "Votre caméra a été coupée par {{participantDisplayName}}!",
         "videoUnmuteBlockedDescription": "Le rétablissement de la vidéo a été bloqué temporairement en raison de limites système.",
@@ -909,14 +843,11 @@
             "admit": "Accepter",
             "admitAll": "Tout accepter",
             "allow": "Autoriser les participants à:",
-            "allowDesktop": "Autoriser le partage d'écran",
             "allowVideo": "permettre la vidéo",
-            "askDesktop": "Demander de partager l'écran",
             "askUnmute": "Demander de réactiver le micro",
             "audioModeration": "Rouvrir leur micro",
             "blockEveryoneMicCamera": "Bloquer tous les micros et caméras",
             "breakoutRooms": "Salles annexes",
-            "desktopModeration": "Démarrer le partage d'écran",
             "goLive": "Passer en direct",
             "invite": "Inviter quelqu'un",
             "lowerAllHands": "Abaisser toutes les mains",
@@ -928,8 +859,6 @@
             "muteAll": "Couper le micro de tout le monde",
             "muteEveryoneElse": "Couper le micro de tous les autres",
             "reject": "Refuser",
-            "stopDesktop": "Arrêter le partage d'écran",
-            "stopEveryonesDesktop": "Arrêter le partage d'écran de tout le monde",
             "stopEveryonesVideo": "Couper toutes les caméras",
             "stopVideo": "Couper la vidéo",
             "unblockEveryoneMicCamera": "Débloquer tous les micros et caméras",
@@ -939,15 +868,12 @@
         "headings": {
             "lobby": "Salle d'attente ({{count}})",
             "participantsList": "Participants de la réunion ({{count}})",
-            "viewerRequests": "Demandes des spectateurs {{count}}",
             "visitorInQueue": " (en attente {{count}})",
             "visitorRequests": "(Demande {{count}} )",
             "visitors": "Visiteurs {{count}}",
-            "visitorsList": "Spectateurs ({{count}})",
             "waitingLobby": "Dans la salle d'attente ({{count}})"
         },
         "search": "Rechercher des participants",
-        "searchDescription": "Commencez à taper pour filtrer les participants",
         "title": "Participants"
     },
     "passwordDigitsOnly": "Jusqu'à {{number}} chiffres",
@@ -1050,6 +976,7 @@
         "proceedAnyway": "Continuer quand même",
         "recordingWarning": "D'autres participants peuvent enregistrer cet appel",
         "screenSharingError": "Erreur de partage d'écran:",
+        "showScreen": "Activer l'écran de pré-séance",
         "startWithPhone": "Commencez avec l'audio du téléphone",
         "unsafeRoomConsent": "Je comprends les risques et je veux quand même rejoindre cette réunion",
         "videoOnlyError": "Erreur vidéo:",
@@ -1120,7 +1047,7 @@
         "localRecordingStartWarningTitle": "Arrêter l’enregistrement pour le sauvegarder",
         "localRecordingVideoStop": "Arrêter votre vidéo va aussi arrêter votre enregistrement local. Êtes-vous sûrs de vouloir continuer ?",
         "localRecordingVideoWarning": "Pour enregistrer votre vidéo, vous devez avoir celle-ci active au moment de commencer l’enregistrement.",
-        "localRecordingWarning": "Assurez-vous de sélectionner l’onglet courant pour utiliser le bon son et la bonne vidéo.",
+        "localRecordingWarning": "Assurez-vous de sélectionner l’onglet courant pour utiliser le bon son et la bonne vidéo. L’enregistrement est pour le moment limité à 1 Go, soit approximativement 100 minutes.",
         "loggedIn": "Connecté en tant que {{userName}}",
         "noMicPermission": "La piste microphone ne peut pas être créée. Veuillez autoriser l’utilisation du microphone.",
         "noStreams": "Aucun flux audio ou vidéo détectés.",
@@ -1174,7 +1101,6 @@
             "signedIn": "Accès aux événements du calendrier {{email}}. Cliquez sur le bouton se déconnecter ci-dessous pour arrêter l'accès aux événements du calendrier.",
             "title": "Calendrier"
         },
-        "chatWithPermissions": "Le chat nécessite une autorisation",
         "desktopShareFramerate": "Images par seconde pour le Partage d'écran",
         "desktopShareHighFpsWarning": "Augmenter le nombre d'images par seconde pour le partage d'écran peut impacter votre bande passante. Vous devez repartager l'écran pour que ces paramètres soient utilisés.",
         "desktopShareWarning": "Vous devez repartager l'écran pour que ces paramètres soient utilisés.",
@@ -1204,7 +1130,6 @@
         "selectMic": "Microphone",
         "selfView": "Affichage de votre propre vidéo",
         "shortcuts": "Raccourcis",
-        "showSubtitlesOnStage": "Afficher les sous-titres sur l'écran",
         "speakers": "Haut-parleurs",
         "startAudioMuted": "Tout le monde commence en muet",
         "startReactionsMuted": "Tout le monde commence avec les réactions sonores bloquées",
@@ -1258,13 +1183,11 @@
         "fearful": "Effrayé",
         "happy": "Content",
         "hours": "{{count}}h",
-        "labelTooltip": "Nombre de participants : {{count}}",
         "minutes": "{{count}}m",
         "name": "Nom",
         "neutral": "Indifférent",
         "sad": "Triste",
         "search": "Recherche",
-        "searchDescription": "Commencez à taper pour filtrer les participants",
         "searchHint": "Recherche des participants",
         "seconds": "{{count}}s",
         "speakerStats": "Statistiques de l'interlocuteur",
@@ -1301,7 +1224,6 @@
             "closeChat": "Fermer la discussion instantanée",
             "closeMoreActions": "Fermer le menu plus d'actions",
             "closeParticipantsPane": "Fermer le panneau des participants",
-            "closedCaptions": "Sous-titres",
             "collapse": "Plier",
             "document": "Activer / Désactiver le document partagé",
             "documentClose": "Fermer le document partagé",
@@ -1380,20 +1302,6 @@
             "videounmute": "Activer votre vidéo"
         },
         "addPeople": "Ajouter des personnes à votre appel",
-        "advancedAudioSettings": {
-            "aec": {
-                "label": "Suppression d'écho acoustique"
-            },
-            "agc": {
-                "label": "Contrôle automatique du gain"
-            },
-            "ns": {
-                "label": "Suppression de bruit"
-            },
-            "stereo": {
-                "label": "Stéréo"
-            }
-        },
         "audioOnlyOff": "Désactiver le mode bande passante réduite",
         "audioOnlyOn": "Activer le mode bande passante réduite",
         "audioRoute": "Sélectionner la source audio",
@@ -1406,7 +1314,6 @@
         "closeChat": "Fermer le chat",
         "closeParticipantsPane": "Fermer le panneau des participants",
         "closeReactionsMenu": "Fermer le menu réactions",
-        "closedCaptions": "Sous-titres",
         "disableNoiseSuppression": "Arrêter la suppression du bruit",
         "disableReactionSounds": "Vous pouvez interdire les réactions sonores à cette réunion",
         "documentClose": "Fermer le document partagé",
@@ -1465,7 +1372,6 @@
         "reactionHeart": "Envoyer une réaction en forme de cœur",
         "reactionLaugh": "Envoyer réaction rire",
         "reactionLike": "Envoyer réaction approuver",
-        "reactionLove": "Envoyer une réaction d'amour",
         "reactionSilence": "Envoyer réaction silence",
         "reactionSurprised": "Envoyer réaction surprise",
         "reactions": "Reactions",
@@ -1498,18 +1404,14 @@
         "ccButtonTooltip": "Activer / Désactiver les sous-titres",
         "expandedLabel": "La transcription est actuellement activée",
         "failed": "La transcription a échoué",
-        "labelTooltip": "La transcription de la réunion est en cours",
-        "labelTooltipExtra": "Une transcription sera disponible plus tard.",
-        "openClosedCaptions": "Ouvrir les sous-titres",
-        "original": "Original",
+        "labelToolTip": "La transcription de la réunion est en cours",
         "sourceLanguageDesc": "Actuellement, la langue de la réunion est sélectionnée à <b>{{sourceLanguage}}</b>. <br/> Vous pouvez la changer à partir de ",
         "sourceLanguageHere": "ici",
         "start": "Activer les sous-titres",
         "stop": "Désactiver les sous-titres",
         "subtitles": "sous-titres",
         "subtitlesOff": "off",
-        "tr": "TR",
-        "translateTo": "Traduire vers"
+        "tr": "TR"
     },
     "unpinParticipant": "Désépingler - {{participantName}}",
     "userMedia": {
@@ -1551,8 +1453,6 @@
         "connectionInfo": "Informations de la connexion",
         "demote": "Déplacer en visiteur",
         "domute": "Couper le micro",
-        "domuteDesktop": "Arrêter le partage d'écran",
-        "domuteDesktopOfOthers": "Arrêter le partage d'écran de tous les autres",
         "domuteOthers": "Couper le micro de tous les autres",
         "domuteVideo": "Couper la caméra",
         "domuteVideoOfOthers": "Couper la caméra des autres",
@@ -1617,8 +1517,6 @@
             "noMainParticipantsTitle": "Cette réunion n'a pas encore commencé.",
             "noVisitorLobby": "Vous ne pouvez pas rejoindre tant qu'une salle d'attente est activée pour la réunion.",
             "notAllowedPromotion": "Un participant doit d'abord autoriser votre demande.",
-            "requestToJoin": "Main levée",
-            "requestToJoinDescription": "Votre demande a été envoyée aux modérateurs.",
             "title": "Vous êtes visiteur dans cette réunion"
         },
         "waitingMessage": "Vous rejoindrez la réunion dès qu'elle sera en direct !"