chore(android/sdk): check also for sdk version that the app targets

*Update Android navigation color and add status bar color for both app and sdk.

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

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

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

@@ -3,6 +3,7 @@
         <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/gradle.properties

@@ -32,5 +32,5 @@ newArchEnabled=false
 # Use this property to enable or disable the Hermes JS engine.
 hermesEnabled=true
 
-appVersion=99.0.0
-sdkVersion=0.0.0
+appVersion=25.6.1
+sdkVersion=11.6.3

android/sdk/src/main/AndroidManifest.xml

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

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

@@ -135,7 +135,12 @@ public class JitsiMeetActivity extends AppCompatActivity
         JitsiMeetActivityDelegate.onHostResume(this);
 
         setContentView(R.layout.activity_jitsi_meet);
-        addTopBottomInsets(getWindow(),findViewById(android.R.id.content));
+
+        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/res/values/colors.xml

@@ -0,0 +1,5 @@
+<?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,3 +1,6 @@
 <resources>
-    <style name="JitsiMeetActivityStyle" parent="Theme.AppCompat.Light.NoActionBar"/>
+    <style name="JitsiMeetActivityStyle" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:navigationBarColor">@color/navigationBarColor</item>
+        <item name="android:statusBarColor">@color/statusBarColor</item>
+    </style>
 </resources>

ios/Podfile

@@ -44,7 +44,6 @@ 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
   #

ios/Podfile.lock

@@ -1473,7 +1473,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-webrtc (124.0.4):
+  - react-native-webrtc (124.0.7):
     - JitsiWebRTC (~> 124.0.0)
     - React-Core
   - react-native-webview (13.13.5):
@@ -1870,8 +1870,6 @@ PODS:
     - React-Core
   - RNSVG (15.11.2):
     - React-Core
-  - RNWatch (1.1.0):
-    - React
   - SocketRocket (0.7.1)
   - SplashView (0.0.18):
     - DoubleConversion
@@ -1993,7 +1991,6 @@ DEPENDENCIES:
   - RNScreens (from `../node_modules/react-native-screens`)
   - RNSound (from `../node_modules/react-native-sound`)
   - RNSVG (from `../node_modules/react-native-svg`)
-  - RNWatch (from `../node_modules/react-native-watch-connectivity`)
   - SplashView (from `../node_modules/react-native-splash-view`)
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
@@ -2203,8 +2200,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-sound"
   RNSVG:
     :path: "../node_modules/react-native-svg"
-  RNWatch:
-    :path: "../node_modules/react-native-watch-connectivity"
   SplashView:
     :path: "../node_modules/react-native-splash-view"
   Yoga:
@@ -2279,7 +2274,7 @@ SPEC CHECKSUMS:
   react-native-safe-area-context: 0f7bf11598f9a61b7ceac8dc3f59ef98697e99e1
   react-native-slider: 1205801a8d29b28cacc14eef08cb120015cdafcb
   react-native-video: eb861d67a71dfef1bbf6086a811af5f338b13781
-  react-native-webrtc: 2261a482150195092246fe70b3aff976f2e11ec5
+  react-native-webrtc: e8f0ce746353adc2744a2b933645e1aeb41eaa74
   react-native-webview: 079eca50edf657503318b66687dadfb903731aa8
   react-native-worklets-core: b59cf88762c8fb6132d8796babd4cec15217d6f0
   React-nativeconfig: ecf4dc92c40b97e2b3f0c619938f78bfd6507b08
@@ -2321,11 +2316,10 @@ SPEC CHECKSUMS:
   RNScreens: 9ef996b6041d0960a4794a845f7d0808b171b4ef
   RNSound: 314cc5226453ef4a3314a196c65e8a65e5106a7b
   RNSVG: 67de7abef81f367387b708ba6d2acefe7d4f5895
-  RNWatch: 28fe1f5e0c6410d45fd20925f4796fce05522e3f
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   SplashView: ed71a114c3ffe60dc3a9e5aa2cefb352c3794a70
   Yoga: 31a098f74c16780569aebd614a0f37a907de0189
 
-PODFILE CHECKSUM: eac4bba07b2f30174fc20bccbaf64f86676d9b1f
+PODFILE CHECKSUM: 7c37a89916893e11159576c8b308b7b5c25246c9
 
 COCOAPODS: 1.16.2

ios/app/app.xcodeproj/project.pbxproj

@@ -7,16 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		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.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.storyboard */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		2681BB562C7A0B42CFBA6719 /* libPods-JitsiMeet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D6152FF9E9F7B0E86F70A21D /* libPods-JitsiMeet.a */; };
@@ -36,27 +26,11 @@
 		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 */;
@@ -81,24 +55,12 @@
 			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;
@@ -118,19 +80,7 @@
 
 /* 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>"; };
 		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
@@ -156,19 +106,10 @@
 		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;
@@ -181,13 +122,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		1F021A8A5B056078665DE530 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		4EB06020260E026600F524C5 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -216,34 +150,6 @@
 			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 = (
@@ -279,11 +185,10 @@
 				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>";
@@ -293,8 +198,6 @@
 			isa = PBXGroup;
 			children = (
 				13B07F961A680F5B00A75B9A /* jitsi-meet.app */,
-				0BEA5C251F7B8F73000D0AB4 /* JitsiMeetCompanion.app */,
-				0BEA5C311F7B8F73000D0AB4 /* JitsiMeetCompanion Extension.appex */,
 				4EB06023260E026600F524C5 /* JitsiMeetBroadcastExtension.appex */,
 			);
 			name = Products;
@@ -310,44 +213,17 @@
 			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" */;
@@ -369,7 +245,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				0BEA5C401F7B8F73000D0AB4 /* PBXTargetDependency */,
 				4EB0602A260E026600F524C5 /* PBXTargetDependency */,
 			);
 			name = JitsiMeet;
@@ -404,16 +279,6 @@
 				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 = {
@@ -444,31 +309,12 @@
 			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;
@@ -622,20 +468,6 @@
 /* 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;
@@ -660,16 +492,6 @@
 /* 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 */;
@@ -678,14 +500,6 @@
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
-		0BEA5C271F7B8F73000D0AB4 /* Interface.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				0BEA5C281F7B8F73000D0AB4 /* Base */,
-			);
-			name = Interface.storyboard;
-			sourceTree = "<group>";
-		};
 		13B07FB11A68108700A75B9A /* LaunchScreen.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -697,155 +511,10 @@
 /* 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;
@@ -882,7 +551,6 @@
 			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;
@@ -1131,24 +799,6 @@
 /* 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/broadcast-extension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>99.0.0</string>
+	<string>25.6.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>

ios/app/src/Info.plist

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

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

@@ -1,92 +0,0 @@
-{
-  "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

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

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

@@ -1,21 +0,0 @@
-{
-  "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

@@ -1,21 +0,0 @@
-{
-  "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

@@ -1,21 +0,0 @@
-{
-  "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

@@ -1,85 +0,0 @@
-<?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

@@ -1,33 +0,0 @@
-<?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

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

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

@@ -1,21 +0,0 @@
-{
-  "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

@@ -1,81 +0,0 @@
-/*
- * 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

@@ -1,103 +0,0 @@
-/*
- * 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

@@ -1,109 +0,0 @@
-/*
- * 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

@@ -1,44 +0,0 @@
-<?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

@@ -1,94 +0,0 @@
-/*
- * 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

@@ -1,27 +0,0 @@
-/*
- * 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

@@ -1,71 +0,0 @@
-/*
- * 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

@@ -1,27 +0,0 @@
-/*
- * 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,36 +39,6 @@ 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/src/Info.plist

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

ios/sdk/src/Lite-Info.plist

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

ios/travis-ci/build-ipa.sh

@@ -1,127 +0,0 @@
-#!/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
-

package-lock.json

@@ -100,8 +100,7 @@
         "react-native-tab-view": "3.5.2",
         "react-native-url-polyfill": "2.0.0",
         "react-native-video": "6.13.0",
-        "react-native-watch-connectivity": "1.1.0",
-        "react-native-webrtc": "124.0.4",
+        "react-native-webrtc": "124.0.7",
         "react-native-webview": "13.13.5",
         "react-native-worklets-core": "https://github.com/jitsi/react-native-worklets-core.git#8c5dfab2a5907305da8971696a781b60f0f9cb18",
         "react-native-youtube-iframe": "2.3.0",
@@ -18534,11 +18533,6 @@
       "integrity": "sha512-AZV+GsS/6ckvPOVQPXSiFFacKvKB4kOQu6ynt9wz0F3LO4R9Ij4K1ddYsIytDpSgLz88JHd9P+oaLeej5/Sl7Q==",
       "dev": true
     },
-    "node_modules/lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
-    },
     "node_modules/lodash.throttle": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
@@ -22476,22 +22470,11 @@
         "react-native": "*"
       }
     },
-    "node_modules/react-native-watch-connectivity": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/react-native-watch-connectivity/-/react-native-watch-connectivity-1.1.0.tgz",
-      "integrity": "sha512-s+zlKOVENRXgkVQvJt5f73CyqpC6ZhKlRsXLybtaFIsR1KR3ARzExm0yTm3DAb5K9AqtCpYX+1SOd4d0Af2ZNQ==",
-      "dependencies": {
-        "lodash.sortby": "^4.7.0"
-      },
-      "peerDependencies": {
-        "react": ">=15.1",
-        "react-native": ">=0.40"
-      }
-    },
     "node_modules/react-native-webrtc": {
-      "version": "124.0.4",
-      "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-124.0.4.tgz",
-      "integrity": "sha512-ZbhSz1f+kc1v5VE0B84+v6ujIWTHa2fIuocrYzGUIFab7E5izmct7PNHb9dzzs0xhBGqh4c2rUa49jbL+P/e2w==",
+      "version": "124.0.7",
+      "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-124.0.7.tgz",
+      "integrity": "sha512-gnXPdbUS8IkKHq9WNaWptW/yy5s6nMyI6cNn90LXdobPVCgYSk6NA2uUGdT4c4J14BRgaFA95F+cR28tUPkMVA==",
+      "license": "MIT",
       "dependencies": {
         "base64-js": "1.5.1",
         "debug": "4.3.4",
@@ -39949,11 +39932,6 @@
       "integrity": "sha512-AZV+GsS/6ckvPOVQPXSiFFacKvKB4kOQu6ynt9wz0F3LO4R9Ij4K1ddYsIytDpSgLz88JHd9P+oaLeej5/Sl7Q==",
       "dev": true
     },
-    "lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
-    },
     "lodash.throttle": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
@@ -42706,18 +42684,10 @@
       "resolved": "https://registry.npmjs.org/react-native-video/-/react-native-video-6.13.0.tgz",
       "integrity": "sha512-eY6jgLcmYKAAlAZhsZbp8wfCVrGu7jmUYTTspn8udN8j4jqr4Fq90ROOM/QegGkwNs4waclL0IkzGuq61kT4DQ=="
     },
-    "react-native-watch-connectivity": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/react-native-watch-connectivity/-/react-native-watch-connectivity-1.1.0.tgz",
-      "integrity": "sha512-s+zlKOVENRXgkVQvJt5f73CyqpC6ZhKlRsXLybtaFIsR1KR3ARzExm0yTm3DAb5K9AqtCpYX+1SOd4d0Af2ZNQ==",
-      "requires": {
-        "lodash.sortby": "^4.7.0"
-      }
-    },
     "react-native-webrtc": {
-      "version": "124.0.4",
-      "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-124.0.4.tgz",
-      "integrity": "sha512-ZbhSz1f+kc1v5VE0B84+v6ujIWTHa2fIuocrYzGUIFab7E5izmct7PNHb9dzzs0xhBGqh4c2rUa49jbL+P/e2w==",
+      "version": "124.0.7",
+      "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-124.0.7.tgz",
+      "integrity": "sha512-gnXPdbUS8IkKHq9WNaWptW/yy5s6nMyI6cNn90LXdobPVCgYSk6NA2uUGdT4c4J14BRgaFA95F+cR28tUPkMVA==",
       "requires": {
         "base64-js": "1.5.1",
         "debug": "4.3.4",

package.json

@@ -106,8 +106,7 @@
     "react-native-tab-view": "3.5.2",
     "react-native-url-polyfill": "2.0.0",
     "react-native-video": "6.13.0",
-    "react-native-watch-connectivity": "1.1.0",
-    "react-native-webrtc": "124.0.4",
+    "react-native-webrtc": "124.0.7",
     "react-native-webview": "13.13.5",
     "react-native-worklets-core": "https://github.com/jitsi/react-native-worklets-core.git#8c5dfab2a5907305da8971696a781b60f0f9cb18",
     "react-native-youtube-iframe": "2.3.0",

react-native-sdk/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jitsi/react-native-sdk",
-    "version": "0.0.0",
+    "version": "11.6.3",
     "description": "React Native SDK for Jitsi Meet.",
     "main": "index.tsx",
     "license": "Apache-2.0",
@@ -11,85 +11,83 @@
         "url": "git+https://github.com/jitsi/jitsi-meet.git"
     },
     "dependencies": {
-        "@braintree/sanitize-url": "0.0.0",
-        "@jitsi/js-utils": "0.0.0",
-        "@jitsi/logger": "0.0.0",
-        "@jitsi/rtcstats": "0.0.0",
-        "@react-navigation/bottom-tabs": "0.0.0",
-        "@react-navigation/elements": "0.0.0",
-        "@react-navigation/material-top-tabs": "0.0.0",
-        "@react-navigation/native": "0.0.0",
-        "@react-navigation/stack": "0.0.0",
-        "@stomp/stompjs": "0.0.0",
-        "@xmldom/xmldom": "0.0.0",
-        "abab": "0.0.0",
-        "base64-js": "0.0.0",
-        "dayjs": "0.0.0",
-        "grapheme-splitter": "0.0.0",
-        "i18n-iso-countries": "0.0.0",
-        "i18next": "0.0.0",
-        "js-md5": "0.0.0",
-        "i18next-http-backend": "0.0.0",
-        "js-sha512": "0.0.0",
-        "jwt-decode": "0.0.0",
-        "lib-jitsi-meet": "0.0.0",
-        "lodash-es": "0.0.0",
-        "optional-require": "0.0.0",
-        "promise.allsettled": "0.0.0",
-        "promise.withresolvers": "0.0.0",
-        "punycode": "0.0.0",
-        "react-emoji-render": "0.0.0",
-        "react-i18next": "0.0.0",
-        "react-linkify": "0.0.0",
-        "react-native-dialog": "0.0.0",
-        "react-native-paper": "0.0.0",
-        "react-native-svg-transformer": "0.0.0",
-        "react-native-tab-view": "0.0.0",
-        "react-native-url-polyfill": "0.0.0",
-        "react-native-youtube-iframe": "0.0.0",
-        "react-redux": "0.0.0",
-        "redux": "0.0.0",
-        "redux-thunk": "0.0.0",
-        "text-encoding": "0.0.0",
-        "unorm": "0.0.0",
-        "util": "0.0.0",
-        "uuid": "0.0.0",
-        "zxcvbn": "0.0.0"
+        "@braintree/sanitize-url": "7.0.0",
+        "@jitsi/js-utils": "2.2.1",
+        "@jitsi/logger": "2.1.1",
+        "@react-navigation/bottom-tabs": "6.6.0",
+        "@react-navigation/elements": "1.3.30",
+        "@react-navigation/material-top-tabs": "6.6.13",
+        "@react-navigation/native": "6.1.17",
+        "@react-navigation/stack": "6.4.0",
+        "@stomp/stompjs": "7.0.0",
+        "@xmldom/xmldom": "0.8.7",
+        "abab": "2.0.6",
+        "base64-js": "1.5.1",
+        "dayjs": "1.11.13",
+        "grapheme-splitter": "1.0.4",
+        "i18n-iso-countries": "6.8.0",
+        "i18next": "17.0.6",
+        "js-md5": "0.6.1",
+        "i18next-http-backend": "2.2.1",
+        "js-sha512": "0.8.0",
+        "jwt-decode": "2.2.0",
+        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v2101.0.0+8061f52a/lib-jitsi-meet.tgz",
+        "lodash-es": "4.17.21",
+        "optional-require": "1.0.3",
+        "promise.withresolvers": "1.0.3",
+        "punycode": "2.3.0",
+        "react-emoji-render": "2.0.1",
+        "react-i18next": "10.11.4",
+        "react-linkify": "1.0.0-alpha",
+        "react-native-dialog": "https://github.com/jitsi/react-native-dialog/releases/download/v9.2.2-jitsi.1/react-native-dialog-9.2.2.tgz",
+        "react-native-paper": "5.10.3",
+        "react-native-svg-transformer": "1.2.0",
+        "react-native-tab-view": "3.5.2",
+        "react-native-url-polyfill": "2.0.0",
+        "react-native-youtube-iframe": "2.3.0",
+        "react-redux": "7.2.9",
+        "redux": "4.0.4",
+        "redux-thunk": "2.4.1",
+        "text-encoding": "0.7.0",
+        "unorm": "1.6.0",
+        "util": "0.12.1",
+        "uuid": "8.3.2",
+        "zxcvbn": "4.4.2"
     },
     "peerDependencies": {
-        "@amplitude/analytics-react-native": "0.0.0",
-        "@giphy/react-native-sdk": "0.0.0",
-        "@react-native-async-storage/async-storage": "0.0.0",
-        "@react-native-clipboard/clipboard": "0.0.0",
-        "@react-native-community/netinfo": "0.0.0",
-        "@react-native-community/slider": "0.0.0",
-        "@react-native-google-signin/google-signin": "0.0.0",
-        "@sayem314/react-native-keep-awake": "0.0.0",
-        "react-native": "0.0.0",
+        "@amplitude/analytics-react-native": "1.4.13",
+        "@giphy/react-native-sdk": "4.1.0",
+        "@react-native-async-storage/async-storage": "1.23.1",
+        "@react-native-clipboard/clipboard": "1.14.3",
+        "@react-native-community/netinfo": "11.1.0",
+        "@react-native-community/slider": "4.5.6",
+        "@react-native-google-signin/google-signin": "10.1.0",
+        "@sayem314/react-native-keep-awake": "1.3.1",
+        "react-native": "~0.77.0",
         "react": "*",
-        "react-native-background-timer": "0.0.0",
-        "react-native-calendar-events": "0.0.0",
-        "react-native-default-preference": "0.0.0",
-        "react-native-device-info": "0.0.0",
-        "react-native-get-random-values": "0.0.0",
-        "react-native-gesture-handler": "0.0.0",
-        "react-native-pager-view": "0.0.0",
-        "react-native-performance": "0.0.0",
-        "react-native-orientation-locker": "0.0.0",
-        "react-native-safe-area-context": "0.0.0",
-        "react-native-screens": "0.0.0",
-        "react-native-sound": "0.0.0",
-        "react-native-splash-view": "0.0.0",
-        "react-native-svg": "0.0.0",
-        "react-native-video": "0.0.0",
-        "react-native-watch-connectivity": "0.0.0",
-        "react-native-webrtc": "0.0.0",
-        "react-native-webview": "0.0.0",
-        "react-native-worklets-core": "0.0.0"
+        "react-native-background-timer": "https://github.com/jitsi/react-native-background-timer.git#d180dfaa4486ae3ee17d01242db92cb3195f4718",
+        "react-native-calendar-events": "https://github.com/jitsi/react-native-calendar-events.git#47f068dedfed7c0f72042e093f688eb11624eb7b",
+        "react-native-default-preference": "https://github.com/jitsi/react-native-default-preference.git#c9bf63bdc058e3fa2aa0b87b1ee1af240f44ed02",
+        "react-native-device-info": "12.1.0",
+        "react-native-get-random-values": "1.11.0",
+        "react-native-gesture-handler": "2.24.0",
+        "react-native-pager-view": "6.8.1",
+        "react-native-performance": "5.1.2",
+        "react-native-orientation-locker": "https://github.com/jitsi/react-native-orientation-locker.git#fe095651d819cf134624f786b61fc8667862178a",
+        "react-native-safe-area-context": "5.5.2",
+        "react-native-screens": "4.11.1",
+        "react-native-sound": "https://github.com/jitsi/react-native-sound.git#ea13c97b5c2a4ff5e0d9bacbd9ff5e4457fe2c3c",
+        "react-native-splash-view": "0.0.18",
+        "react-native-svg": "15.11.2",
+        "react-native-video": "6.13.0",
+        "react-native-watch-connectivity": "1.1.0",
+        "react-native-webrtc": "124.0.7",
+        "react-native-webview": "13.13.5",
+        "react-native-worklets-core": "https://github.com/jitsi/react-native-worklets-core.git#8c5dfab2a5907305da8971696a781b60f0f9cb18"
     },
     "devDependencies": {
-        "@babel/plugin-proposal-nullish-coalescing-operator": "0.0.0",
-        "@babel/plugin-proposal-optional-chaining": "0.0.0"
+        "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
+        "@babel/plugin-proposal-optional-chaining": "7.21.0"
     },
     "scripts": {
         "postinstall": "node sdk_instructions.js",
@@ -101,4 +99,4 @@
     "keywords": [
         "react-native"
     ]
-}
+}

react-native.config.js

@@ -20,11 +20,6 @@ module.exports = {
             platforms: {
                 ios: null
             }
-        },
-        'react-native-watch-connectivity': {
-            platforms: {
-                ios: null
-            }
         }
     }
 };

react/features/analytics/handlers/amplitude/lib.native.ts

@@ -1,4 +1,4 @@
-import amplitude from '@amplitude/analytics-react-native';
+import * as amplitude from '@amplitude/analytics-react-native';
 
 export default amplitude;
 

react/features/app/middlewares.native.ts

@@ -9,7 +9,6 @@ import '../mobile/permissions/middleware';
 import '../mobile/proximity/middleware';
 import '../mobile/wake-lock/middleware';
 import '../mobile/react-native-sdk/middleware';
-import '../mobile/watchos/middleware';
 import '../share-room/middleware';
 import '../shared-video/middleware';
 import '../toolbox/middleware.native';

react/features/app/reducers.native.ts

@@ -2,7 +2,6 @@ import '../mobile/audio-mode/reducer';
 import '../mobile/background/reducer';
 import '../mobile/call-integration/reducer';
 import '../mobile/external-api/reducer';
-import '../mobile/watchos/reducer';
 import '../share-room/reducer';
 
 import './reducer.native';

react/features/app/types.ts

@@ -52,7 +52,6 @@ import { IMobileAudioModeState } from '../mobile/audio-mode/reducer';
 import { IMobileBackgroundState } from '../mobile/background/reducer';
 import { ICallIntegrationState } from '../mobile/call-integration/reducer';
 import { IMobileExternalApiState } from '../mobile/external-api/reducer';
-import { IMobileWatchOSState } from '../mobile/watchos/reducer';
 import { INoAudioSignalState } from '../no-audio-signal/reducer';
 import { INoiseDetectionState } from '../noise-detection/reducer';
 import { INoiseSuppressionState } from '../noise-suppression/reducer';
@@ -141,7 +140,6 @@ export interface IReduxState {
     'features/mobile/audio-mode': IMobileAudioModeState;
     'features/mobile/background': IMobileBackgroundState;
     'features/mobile/external-api': IMobileExternalApiState;
-    'features/mobile/watchos': IMobileWatchOSState;
     'features/no-audio-signal': INoAudioSignalState;
     'features/noise-detection': INoiseDetectionState;
     'features/noise-suppression': INoiseSuppressionState;

react/features/lobby/components/native/LobbyScreen.tsx

@@ -8,7 +8,7 @@ import { getConferenceName } from '../../../base/conference/functions';
 import { translate } from '../../../base/i18n/functions';
 import JitsiScreen from '../../../base/modal/components/JitsiScreen';
 import LoadingIndicator from '../../../base/react/components/native/LoadingIndicator';
-import { ASPECT_RATIO_NARROW } from '../../../base/responsive-ui/constants';
+import { ASPECT_RATIO_WIDE } from '../../../base/responsive-ui/constants';
 import BaseTheme from '../../../base/ui/components/BaseTheme.native';
 import Button from '../../../base/ui/components/native/Button';
 import Input from '../../../base/ui/components/native/Input';
@@ -35,6 +35,16 @@ interface IProps extends AbstractProps {
      */
     _aspectRatio: Symbol;
 
+    /**
+     * The current height of the screen.
+     */
+    _clientHeight: number;
+
+    /**
+     * The current width of the screen.
+     */
+    _clientWidth: number;
+
     /**
      * The room name.
      */
@@ -63,33 +73,33 @@ class LobbyScreen extends AbstractLobbyScreen<IProps> {
      * @inheritdoc
      */
     override render() {
-        const { _aspectRatio, _roomName } = this.props;
-        let contentWrapperStyles;
-        let contentContainerStyles;
-        let largeVideoContainerStyles;
+        const { _aspectRatio, _clientHeight, _clientWidth, _roomName } = this.props;
+        const isTablet = Math.min(_clientWidth, _clientHeight) >= 768;
 
-        if (_aspectRatio === ASPECT_RATIO_NARROW) {
-            contentWrapperStyles = preJoinStyles.contentWrapper;
-            largeVideoContainerStyles = preJoinStyles.largeVideoContainer;
-            contentContainerStyles = styles.contentContainer;
-        } else {
-            contentWrapperStyles = preJoinStyles.contentWrapperWide;
-            largeVideoContainerStyles = preJoinStyles.largeVideoContainerWide;
+        let contentContainerStyles = preJoinStyles.contentContainer;
+        let largeVideoContainerStyles = preJoinStyles.largeVideoContainer;
+
+        if (isTablet && _aspectRatio === ASPECT_RATIO_WIDE) {
+            // @ts-ignore
             contentContainerStyles = preJoinStyles.contentContainerWide;
+            largeVideoContainerStyles = preJoinStyles.largeVideoContainerWide;
         }
 
         return (
             <JitsiScreen
+                addBottomPadding = { false }
                 safeAreaInsets = { [ 'right' ] }
-                style = { contentWrapperStyles }>
+                style = { preJoinStyles.contentWrapper }>
                 <BrandingImageBackground />
                 <View style = { largeVideoContainerStyles as ViewStyle }>
-                    <View style = { preJoinStyles.displayRoomNameBackdrop as ViewStyle }>
-                        <Text
-                            numberOfLines = { 1 }
-                            style = { preJoinStyles.preJoinRoomName }>
-                            { _roomName }
-                        </Text>
+                    <View style = { preJoinStyles.conferenceInfo as ViewStyle }>
+                        <View style = { preJoinStyles.displayRoomNameBackdrop }>
+                            <Text
+                                numberOfLines = { 1 }
+                                style = { preJoinStyles.preJoinRoomName }>
+                                { _roomName }
+                            </Text>
+                        </View>
                     </View>
                     <LargeVideo />
                 </View>
@@ -304,6 +314,8 @@ function _mapStateToProps(state: IReduxState) {
     return {
         ...abstractMapStateToProps(state),
         _aspectRatio: state['features/base/responsive-ui'].aspectRatio,
+        _clientHeight: state['features/base/responsive-ui'].clientHeight,
+        _clientWidth: state['features/base/responsive-ui'].clientWidth,
         _roomName: getConferenceName(state)
     };
 }

react/features/lobby/components/native/styles.ts

@@ -8,13 +8,13 @@ export default {
     },
 
     passwordJoinButtons: {
-        top: 40
+        top: BaseTheme.spacing[7]
     },
 
     contentContainer: {
         alignItems: 'center',
         backgroundColor: BaseTheme.palette.uiBackground,
-        bottom: 0,
+        bottom: BaseTheme.spacing[0],
         display: 'flex',
         height: 388,
         justifyContent: 'center',
@@ -45,46 +45,6 @@ export default {
         marginBottom: BaseTheme.spacing[3]
     },
 
-    // KnockingParticipantList
-
-    knockingParticipantList: {
-        backgroundColor: BaseTheme.palette.ui01
-    },
-
-
-    knockingParticipantListDetails: {
-        flex: 1,
-        marginLeft: BaseTheme.spacing[2]
-    },
-
-    knockingParticipantListEntry: {
-        alignItems: 'center',
-        backgroundColor: BaseTheme.palette.ui01,
-        flexDirection: 'row'
-    },
-
-    knockingParticipantListText: {
-        color: 'white'
-    },
-
-    lobbyButtonAdmit: {
-        position: 'absolute',
-        right: 184,
-        top: 6
-    },
-
-    lobbyButtonChat: {
-        position: 'absolute',
-        right: 104,
-        top: 6
-    },
-
-    lobbyButtonReject: {
-        position: 'absolute',
-        right: 16,
-        top: 6
-    },
-
     lobbyTitle: {
         ...BaseTheme.typography.heading5,
         color: BaseTheme.palette.text01,

react/features/mobile/navigation/components/RootNavigationContainer.tsx

@@ -1,14 +1,13 @@
 import { NavigationContainer, Theme } from '@react-navigation/native';
 import { createStackNavigator } from '@react-navigation/stack';
 import React, { useCallback } from 'react';
-import { StatusBar } from 'react-native';
 import { connect } from 'react-redux';
 
 import { IReduxState, IStore } from '../../../app/types';
 import DialInSummary from '../../../invite/components/dial-in-summary/native/DialInSummary';
 import Prejoin from '../../../prejoin/components/native/Prejoin';
 import UnsafeRoomWarning from '../../../prejoin/components/native/UnsafeRoomWarning';
-import { isUnsafeRoomWarningEnabled } from '../../../prejoin/functions';
+import { isUnsafeRoomWarningEnabled } from '../../../prejoin/functions.native';
 import VisitorsQueue from '../../../visitors/components/native/VisitorsQueue';
 // eslint-disable-next-line
 // @ts-ignore
@@ -70,11 +69,6 @@ const RootNavigationContainer = ({ dispatch, isUnsafeRoomWarningAvailable, isWel
             onReady = { onReady }
             ref = { rootNavigationRef }
             theme = { navigationContainerTheme as Theme }>
-            <StatusBar
-                animated = { true }
-                backgroundColor = 'transparent'
-                barStyle = { 'light-content' }
-                translucent = { true } />
             <RootStack.Navigator
                 initialRouteName = { initialRouteName }>
                 {

react/features/mobile/watchos/actionTypes.ts

@@ -1,26 +0,0 @@
-/**
- * See {@link setConferenceTimestamp} for more details.
- * {
- *      type: SET_CONFERENCE_TIMESTAMP,
- *      conferenceTimestamp: number
- * }
- */
-export const SET_CONFERENCE_TIMESTAMP = Symbol('WATCH_OS_SET_CONFERENCE_TIMESTAMP');
-
-/**
- * See {@link setSessionId} action for more details.
- * {
- *     type: SET_SESSION_ID,
- *     sessionID: number
- * }
- */
-export const SET_SESSION_ID = Symbol('WATCH_OS_SET_SESSION_ID');
-
-/**
- * See {@link setWatchReachable} for more details.
- * {
- *     type: SET_WATCH_REACHABLE,
- *     watchReachable: boolean
- * }
- */
-export const SET_WATCH_REACHABLE = Symbol('WATCH_OS_SET_WATCH_REACHABLE');

react/features/mobile/watchos/actions.ts

@@ -1,53 +0,0 @@
-import { SET_CONFERENCE_TIMESTAMP, SET_SESSION_ID, SET_WATCH_REACHABLE } from './actionTypes';
-
-/**
- * Stores a timestamp when the conference is joined, so that the watch counterpart can start counting from when
- * the meeting has really started.
- *
- * @param {number} conferenceTimestamp - A timestamp retrieved with {@code newDate.getTime()}.
- * @returns {{
- *      type: SET_CONFERENCE_TIMESTAMP,
- *      conferenceTimestamp: number
- * }}
- */
-export function setConferenceTimestamp(conferenceTimestamp: number) {
-    return {
-        type: SET_CONFERENCE_TIMESTAMP,
-        conferenceTimestamp
-    };
-}
-
-/**
- * Updates the session ID which is sent to the Watch app and then used by the app to send commands. Commands from
- * the watch are accepted only if the 'sessionID' passed by the Watch matches the one currently stored in Redux. It is
- * supposed to prevent from processing outdated commands.
- *
- * @returns {{
- *     type: SET_SESSION_ID,
- *     sessionID: number
- * }}
- */
-export function setSessionId() {
-    return {
-        type: SET_SESSION_ID,
-        sessionID: new Date().getTime()
-    };
-}
-
-/**
- * Updates the reachable status of the watch. It's used to get in sync with the watch counterpart when it gets
- * reconnected, but also to prevent from sending updates if the app is not installed at all (which would fail with
- * an error).
- *
- * @param {boolean} isReachable - Indicates whether the watch is currently reachable or not.
- * @returns {{
- *      type: SET_WATCH_REACHABLE,
- *      watchReachable: boolean
- * }}
- */
-export function setWatchReachable(isReachable: boolean) {
-    return {
-        type: SET_WATCH_REACHABLE,
-        watchReachable: isReachable
-    };
-}

react/features/mobile/watchos/constants.ts

@@ -1,9 +0,0 @@
-// NOTE When changing any of the commands make sure to update JitsiMeetCommands enum in the WatchKit extension code.
-
-export const CMD_HANG_UP = 'hangup';
-
-export const CMD_JOIN_CONFERENCE = 'joinConference';
-
-export const CMD_SET_MUTED = 'setMuted';
-
-export const MAX_RECENT_URLS = 10;

react/features/mobile/watchos/logger.ts

@@ -1,3 +0,0 @@
-import { getLogger } from '../../base/logging/functions';
-
-export default getLogger('mobile-app:watchos');

react/features/mobile/watchos/middleware.ts

@@ -1,191 +0,0 @@
-import { NativeModules, Platform } from 'react-native';
-import { updateApplicationContext, watchEvents } from 'react-native-watch-connectivity';
-
-import { appNavigate } from '../../app/actions';
-import { IStore } from '../../app/types';
-import { APP_WILL_MOUNT } from '../../base/app/actionTypes';
-import { IStateful } from '../../base/app/types';
-import { CONFERENCE_JOINED } from '../../base/conference/actionTypes';
-import { getCurrentConferenceUrl } from '../../base/connection/functions';
-import { setAudioMuted } from '../../base/media/actions';
-import MiddlewareRegistry from '../../base/redux/MiddlewareRegistry';
-import StateListenerRegistry from '../../base/redux/StateListenerRegistry';
-import { toState } from '../../base/redux/functions';
-
-import { setConferenceTimestamp, setSessionId, setWatchReachable } from './actions';
-import { CMD_HANG_UP, CMD_JOIN_CONFERENCE, CMD_SET_MUTED, MAX_RECENT_URLS } from './constants';
-import logger from './logger';
-
-const { AppInfo } = NativeModules;
-const watchOSEnabled = Platform.OS === 'ios' && !AppInfo.isLiteSDK;
-
-// Handles the recent URLs state sent to the watch
-watchOSEnabled && StateListenerRegistry.register(
-    /* selector */ state => state['features/recent-list'],
-    /* listener */ (recentListState, { getState }) => {
-        _updateApplicationContext(getState);
-    });
-
-// Handles the mic muted state sent to the watch
-watchOSEnabled && StateListenerRegistry.register(
-    /* selector */ state => _isAudioMuted(state),
-    /* listener */ (isAudioMuted, { getState }) => {
-        _updateApplicationContext(getState);
-    });
-
-// Handles the conference URL state sent to the watch
-watchOSEnabled && StateListenerRegistry.register(
-    /* selector */ state => getCurrentConferenceUrl(state),
-    /* listener */ (currentUrl, { dispatch, getState }) => {
-        dispatch(setSessionId());
-        _updateApplicationContext(getState);
-    });
-
-/**
- * Middleware that captures conference actions.
- *
- * @param {Store} store - The redux store.
- * @returns {Function}
- */
-watchOSEnabled && MiddlewareRegistry.register(store => next => action => {
-    switch (action.type) {
-    case APP_WILL_MOUNT:
-        _appWillMount(store);
-        break;
-    case CONFERENCE_JOINED:
-        store.dispatch(setConferenceTimestamp(new Date().getTime()));
-        _updateApplicationContext(store.getState());
-        break;
-    }
-
-    return next(action);
-});
-
-/**
- * Registers listeners to the react-native-watch-connectivity lib.
- *
- * @param {Store} store - The redux store.
- * @private
- * @returns {void}
- */
-function _appWillMount({ dispatch, getState }: IStore) {
-    watchEvents.addListener('reachability', reachable => {
-        dispatch(setWatchReachable(reachable));
-        _updateApplicationContext(getState);
-    });
-
-    watchEvents.addListener('message', message => {
-        const {
-            command,
-            sessionID
-        } = message;
-        const currentSessionID = _getSessionId(getState());
-
-        if (!sessionID || sessionID !== currentSessionID) {
-            logger.warn(
-                `Ignoring outdated watch command: ${message.command}`
-                    + ` sessionID: ${sessionID} current session ID: ${currentSessionID}`);
-
-            return;
-        }
-
-        switch (command) {
-        case CMD_HANG_UP:
-            if (typeof getCurrentConferenceUrl(getState()) !== 'undefined') {
-                dispatch(appNavigate(undefined));
-            }
-            break;
-        case CMD_JOIN_CONFERENCE: {
-            const newConferenceURL: any = message.data;
-            const oldConferenceURL = getCurrentConferenceUrl(getState());
-
-            if (oldConferenceURL !== newConferenceURL) {
-                dispatch(appNavigate(newConferenceURL));
-            }
-            break;
-        }
-        case CMD_SET_MUTED:
-            dispatch(
-                setAudioMuted(
-                    message.muted === 'true',
-                    /* ensureTrack */ true));
-            break;
-        }
-    });
-}
-
-/**
- * Gets the current Apple Watch session's ID. A new session is started whenever the conference URL has changed. It is
- * used to filter out outdated commands which may arrive very later if the Apple Watch loses the connectivity.
- *
- * @param {Object|Function} stateful - Either the whole Redux state object or the Redux store's {@code getState} method.
- * @returns {number}
- * @private
- */
-function _getSessionId(stateful: IStateful) {
-    const state = toState(stateful);
-
-    return state['features/mobile/watchos'].sessionID;
-}
-
-/**
- * Gets the list of recent URLs to be passed over to the Watch app.
- *
- * @param {Object|Function} stateful - Either the whole Redux state object or the Redux store's {@code getState} method.
- * @returns {Array<Object>}
- * @private
- */
-function _getRecentUrls(stateful: IStateful) {
-    const state = toState(stateful);
-    const recentURLs = state['features/recent-list'];
-
-    // Trim to MAX_RECENT_URLS and reverse the list
-    const reversedList = recentURLs.slice(-MAX_RECENT_URLS);
-
-    reversedList.reverse();
-
-    return reversedList;
-}
-
-/**
- * Determines the audio muted state to be sent to the apple watch.
- *
- * @param {Object|Function} stateful - Either the whole Redux state object or the Redux store's {@code getState} method.
- * @returns {boolean}
- * @private
- */
-function _isAudioMuted(stateful: IStateful) {
-    const state = toState(stateful);
-    const { audio } = state['features/base/media'];
-
-    return audio.muted;
-}
-
-/**
- * Sends the context to the watch os app. At the time of this writing it's the entire state of
- * the 'features/mobile/watchos' reducer.
- *
- * @param {Object|Function} stateful - Either the whole Redux state object or the Redux store's {@code getState} method.
- * @private
- * @returns {void}
- */
-function _updateApplicationContext(stateful: IStateful) {
-    const state = toState(stateful);
-    const { conferenceTimestamp, sessionID, watchReachable } = state['features/mobile/watchos'];
-
-    if (!watchReachable) {
-        return;
-    }
-
-    try {
-        updateApplicationContext({
-            conferenceTimestamp,
-            conferenceURL: getCurrentConferenceUrl(state),
-            micMuted: _isAudioMuted(state),
-            recentURLs: _getRecentUrls(state),
-            sessionID
-        });
-    } catch (error) {
-        logger.error('Failed to stringify or send the context', error);
-    }
-}

react/features/mobile/watchos/reducer.ts

@@ -1,41 +0,0 @@
-import ReducerRegistry from '../../base/redux/ReducerRegistry';
-import { assign } from '../../base/redux/functions';
-
-import { SET_CONFERENCE_TIMESTAMP, SET_SESSION_ID, SET_WATCH_REACHABLE } from './actionTypes';
-
-export interface IMobileWatchOSState {
-    conferenceTimestamp?: number;
-    sessionID: number;
-    watchReachable?: boolean;
-}
-
-const INITIAL_STATE = {
-    sessionID: new Date().getTime()
-};
-
-/**
- * Reduces the Redux actions of the feature features/mobile/watchos.
- */
-ReducerRegistry.register<IMobileWatchOSState>('features/mobile/watchos',
-(state = INITIAL_STATE, action): IMobileWatchOSState => {
-    switch (action.type) {
-    case SET_CONFERENCE_TIMESTAMP: {
-        return assign(state, {
-            conferenceTimestamp: action.conferenceTimestamp
-        });
-    }
-    case SET_SESSION_ID: {
-        return assign(state, {
-            sessionID: action.sessionID,
-            conferenceTimestamp: 0
-        });
-    }
-    case SET_WATCH_REACHABLE: {
-        return assign(state, {
-            watchReachable: action.watchReachable
-        });
-    }
-    default:
-        return state;
-    }
-});

react/features/prejoin/components/native/Prejoin.tsx

@@ -25,7 +25,7 @@ import { IconCloseLarge } from '../../../base/icons/svg';
 import JitsiScreen from '../../../base/modal/components/JitsiScreen';
 import { getLocalParticipant } from '../../../base/participants/functions';
 import { getFieldValue } from '../../../base/react/functions';
-import { ASPECT_RATIO_NARROW } from '../../../base/responsive-ui/constants';
+import { ASPECT_RATIO_WIDE } from '../../../base/responsive-ui/constants';
 import { updateSettings } from '../../../base/settings/actions';
 import Button from '../../../base/ui/components/native/Button';
 import Input from '../../../base/ui/components/native/Input';
@@ -51,9 +51,10 @@ const Prejoin: React.FC<IPrejoinProps> = ({ navigation }: IPrejoinProps) => {
     const dispatch = useDispatch();
     const isFocused = useIsFocused();
     const { t } = useTranslation();
-    const aspectRatio = useSelector(
-        (state: IReduxState) => state['features/base/responsive-ui']?.aspectRatio
+    const { aspectRatio, clientHeight, clientWidth } = useSelector(
+        (state: IReduxState) => state['features/base/responsive-ui']
     );
+    const isTablet = Math.min(clientWidth, clientHeight) >= 768;
     const localParticipant = useSelector((state: IReduxState) => getLocalParticipant(state));
     const isDisplayNameMandatory = useSelector((state: IReduxState) => isDisplayNameRequired(state));
     const isDisplayNameVisible
@@ -146,16 +147,11 @@ const Prejoin: React.FC<IPrejoinProps> = ({ navigation }: IPrejoinProps) => {
         });
     }, [ navigation ]);
 
-    let contentWrapperStyles;
-    let contentContainerStyles;
-    let largeVideoContainerStyles;
+    let contentContainerStyles = styles.contentContainer;
+    let largeVideoContainerStyles = styles.largeVideoContainer;
 
-    if (aspectRatio === ASPECT_RATIO_NARROW) {
-        contentWrapperStyles = styles.contentWrapper;
-        contentContainerStyles = styles.contentContainer;
-        largeVideoContainerStyles = styles.largeVideoContainer;
-    } else {
-        contentWrapperStyles = styles.contentWrapperWide;
+    if (isTablet && aspectRatio === ASPECT_RATIO_WIDE) {
+        // @ts-ignore
         contentContainerStyles = styles.contentContainerWide;
         largeVideoContainerStyles = styles.largeVideoContainerWide;
     }
@@ -164,7 +160,7 @@ const Prejoin: React.FC<IPrejoinProps> = ({ navigation }: IPrejoinProps) => {
         <JitsiScreen
             addBottomPadding = { false }
             safeAreaInsets = { [ 'right' ] }
-            style = { contentWrapperStyles }>
+            style = { styles.contentWrapper }>
             <BrandingImageBackground />
             {
                 isFocused
@@ -206,7 +202,7 @@ const Prejoin: React.FC<IPrejoinProps> = ({ navigation }: IPrejoinProps) => {
                 }
                 {
                     showDisplayNameError && (
-                        <View style = { styles.errorContainer as StyleProp<TextStyle> }>
+                        <View style = { styles.errorContainer as StyleProp<ViewStyle> }>
                             <Text style = { styles.error as StyleProp<TextStyle> }>
                                 { t('prejoin.errorMissingName') }
                             </Text>

react/features/prejoin/components/native/UnsafeRoomWarning.tsx

@@ -86,12 +86,14 @@ const UnsafeRoomWarning: React.FC<IPrejoinProps> = ({ navigation }: IPrejoinProp
             addBottomPadding = { false }
             safeAreaInsets = { [ 'right' ] }
             style = { styles.unsafeRoomWarningContainer } >
-            <View style = { styles.displayRoomNameBackdrop as StyleProp<TextStyle> }>
-                <Text
-                    numberOfLines = { 1 }
-                    style = { styles.preJoinRoomName as StyleProp<TextStyle> }>
-                    { roomName }
-                </Text>
+            <View style = { styles.conferenceInfo as ViewStyle }>
+                <View style = { styles.displayRoomNameBackdrop as ViewStyle }>
+                    <Text
+                        numberOfLines = { 1 }
+                        style = { styles.preJoinRoomName as StyleProp<TextStyle> }>
+                        { roomName }
+                    </Text>
+                </View>
             </View>
             <View style = { unsafeRoomContentContainer as StyleProp<ViewStyle> }>
                 <View style = { styles.warningIconWrapper as StyleProp<ViewStyle> }>

react/features/prejoin/components/native/styles.ts

@@ -10,14 +10,14 @@ export const preJoinStyles = {
     buttonStylesBorderless: {
         iconStyle: {
             color: BaseTheme.palette.icon01,
-            fontSize: 24
+            fontSize: BaseTheme.spacing[4]
         },
         style: {
             flexDirection: 'row',
             justifyContent: 'center',
             margin: BaseTheme.spacing[3],
-            height: 24,
-            width: 24
+            height: BaseTheme.spacing[4],
+            width: BaseTheme.spacing[4]
         },
         underlayColor: 'transparent'
     },
@@ -27,13 +27,8 @@ export const preJoinStyles = {
         flexDirection: 'row'
     },
 
-    contentWrapperWide: {
-        flex: 1,
-        flexDirection: 'row'
-    },
-
     largeVideoContainer: {
-        height: '60%'
+        height: '50%'
     },
 
     largeVideoContainerWide: {
@@ -46,9 +41,9 @@ export const preJoinStyles = {
     contentContainer: {
         alignItems: 'center',
         backgroundColor: BaseTheme.palette.uiBackground,
-        bottom: 0,
+        bottom: BaseTheme.spacing[0],
         display: 'flex',
-        height: 280,
+        height: '50%',
         justifyContent: 'center',
         position: 'absolute',
         width: '100%',
@@ -115,6 +110,7 @@ export const preJoinStyles = {
         maxWidth: 273,
         zIndex: 1
     },
+
     displayRoomNameBackdrop: {
         backgroundColor: BaseTheme.palette.uiBackground,
         borderRadius: BaseTheme.shape.borderRadius,
@@ -122,6 +118,7 @@ export const preJoinStyles = {
         paddingHorizontal: BaseTheme.spacing[3],
         paddingVertical: BaseTheme.spacing[1]
     },
+
     recordingWarning: {
         display: 'flex',
         justifyContent: 'center',
@@ -130,9 +127,11 @@ export const preJoinStyles = {
         marginTop: BaseTheme.spacing[1],
         width: 'auto'
     },
+
     recordingWarningText: {
         color: BaseTheme.palette.text03
     },
+
     unsafeRoomWarningContainer: {
         height: '100%',
         width: '100%',
@@ -142,6 +141,7 @@ export const preJoinStyles = {
         justifyContent: 'center',
         color: 'white'
     },
+
     unsafeRoomContentContainer: {
         justifySelf: 'center',
         height: '100%',
@@ -167,6 +167,7 @@ export const preJoinStyles = {
         textAlign: 'center',
         marginBottom: BaseTheme.spacing[4]
     },
+
     warningIconWrapper: {
         backgroundColor: BaseTheme.palette.warning01,
         borderRadius: BaseTheme.shape.circleRadius,
@@ -175,8 +176,9 @@ export const preJoinStyles = {
         zIndex: 0
 
     },
+
     warningIcon: {
         color: BaseTheme.palette.ui01,
-        fontSize: 40
+        fontSize: BaseTheme.spacing[7]
     }
 };

resources/update-mobile-version.sh

@@ -13,8 +13,6 @@ VERSION=$1
 # iOS
 /usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${VERSION}" ${THIS_DIR}/../ios/app/src/Info.plist
 /usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${VERSION}" ${THIS_DIR}/../ios/app/broadcast-extension/Info.plist
-/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${VERSION}" ${THIS_DIR}/../ios/app/watchos/app/Info.plist
-/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${VERSION}" ${THIS_DIR}/../ios/app/watchos/extension/Info.plist
 
 # Android
 sed -i "" -e "s/appVersion=.*/appVersion=${VERSION}/" ${THIS_DIR}/../android/gradle.properties