Merge pull request #22296 from brave/bugfix/36353

brave · Feb 27, 2024 · 13b66a7 · 13b66a7
2 parents ad92b36 + eeda1f0
commit 13b66a7
Show file tree

Hide file tree

Showing 25 changed files with 4,820 additions and 4,229 deletions.
diff --git a/ios/brave-ios/App/Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/brave-ios/App/Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -74,7 +74,7 @@
     {
       "identity" : "static",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/venmo/static",
+      "location" : "https://github.com/venmo/Static",
       "state" : {
         "revision" : "622a6804d39515600ead16e6259cb5d5e50f40df"
       }
@@ -156,7 +156,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/jitsi/webrtc",
       "state" : {
-        "revision" : "83690c8ecfd2d745eb0a41c77de6c4e740c18b80"
+        "revision" : "f20affccefa9c096a64ca15066f4b786a2ada1f6"
       }
     },
     {

diff --git a/ios/brave-ios/Sources/BraveTalk/BraveTalkConferencingOptions.swift b/ios/brave-ios/Sources/BraveTalk/BraveTalkConferencingOptions.swift
@@ -15,6 +15,8 @@ extension JitsiMeetConferenceOptions {
       builder.serverURL = URL(string: "https://8x8.vc")
       builder.setFeatureFlag("calendar.enabled", withBoolean: false)
       builder.setFeatureFlag("resolution", withValue: 360)
+      builder.setFeatureFlag("add-people.enabled", withBoolean: false)
+      builder.setFeatureFlag("invite-dial-in.enabled", withBoolean: false)
       builder.setSubject("Brave Talk")
       builder.setConfigOverride("localSubject", withValue: "Brave Talk")
       builder.setConfigOverride("analytics", with: ["disabled": true, "rtcstatsEnabled": false])
@@ -47,6 +49,7 @@ extension JitsiMeetConferenceOptions {
       builder.setConfigOverride("transcribingEnabled", withBoolean: false)
       builder.setConfigOverride("useHostPageLocalStorage", withBoolean: true)
       builder.setConfigOverride("videoQuality", with: ["persist": true])
+      builder.setConfigOverride("testing.mobileXmppWsThreshold", withValue: 100)
     }
   }
 }
diff --git a/third_party/ios_deps/JitsiMeet/JitsiMeetSDK.xcframework/Info.plist b/third_party/ios_deps/JitsiMeet/JitsiMeetSDK.xcframework/Info.plist
@@ -6,30 +6,30 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>JitsiMeetSDK.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>JitsiMeetSDK.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

diff --git a/...SDK.xcframework/ios-arm64/JitsiMeetSDK.framework/AccessibilityResources.bundle/Info.plist b/...SDK.xcframework/ios-arm64/JitsiMeetSDK.framework/AccessibilityResources.bundle/Info.plist
diff --git a/...y/ios_deps/JitsiMeet/JitsiMeetSDK.xcframework/ios-arm64/JitsiMeetSDK.framework/Info.plist b/...y/ios_deps/JitsiMeet/JitsiMeetSDK.xcframework/ios-arm64/JitsiMeetSDK.framework/Info.plist
diff --git a/...ios_deps/JitsiMeet/JitsiMeetSDK.xcframework/ios-arm64/JitsiMeetSDK.framework/JitsiMeetSDK b/...ios_deps/JitsiMeet/JitsiMeetSDK.xcframework/ios-arm64/JitsiMeetSDK.framework/JitsiMeetSDK
diff --git a/...os-arm64/JitsiMeetSDK.framework/Modules/JitsiMeetSDK.swiftmodule/arm64-apple-ios.abi.json b/...os-arm64/JitsiMeetSDK.framework/Modules/JitsiMeetSDK.swiftmodule/arm64-apple-ios.abi.json
@@ -1047,6 +1047,202 @@
       "offset": 1992,
       "length": 5,
       "value": "false"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/PiPViewCoordinator.swift",
+      "kind": "BooleanLiteral",
+      "offset": 2762,
+      "length": 4,
+      "value": "true"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/PiPViewCoordinator.swift",
+      "kind": "IntegerLiteral",
+      "offset": 3503,
+      "length": 1,
+      "value": "1"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/PiPViewCoordinator.swift",
+      "kind": "BooleanLiteral",
+      "offset": 3535,
+      "length": 5,
+      "value": "false"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/PiPViewCoordinator.swift",
+      "kind": "IntegerLiteral",
+      "offset": 3566,
+      "length": 1,
+      "value": "0"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/PiPViewCoordinator.swift",
+      "kind": "IntegerLiteral",
+      "offset": 3663,
+      "length": 1,
+      "value": "1"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/PiPViewCoordinator.swift",
+      "kind": "IntegerLiteral",
+      "offset": 3867,
+      "length": 1,
+      "value": "0"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/PiPViewCoordinator.swift",
+      "kind": "IntegerLiteral",
+      "offset": 3965,
+      "length": 1,
+      "value": "0"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/PiPViewCoordinator.swift",
+      "kind": "BooleanLiteral",
+      "offset": 4005,
+      "length": 4,
+      "value": "true"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/PiPViewCoordinator.swift",
+      "kind": "BooleanLiteral",
+      "offset": 4357,
+      "length": 4,
+      "value": "true"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/PiPViewCoordinator.swift",
+      "kind": "Array",
+      "offset": 4443,
+      "length": 2,
+      "value": "[]"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/PiPViewCoordinator.swift",
+      "kind": "BooleanLiteral",
+      "offset": 5163,
+      "length": 5,
+      "value": "false"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/PiPViewCoordinator.swift",
+      "kind": "StringLiteral",
+      "offset": 6466,
+      "length": 14,
+      "value": "\"image-resize\""
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/PiPViewCoordinator.swift",
+      "kind": "IntegerLiteral",
+      "offset": 6700,
+      "length": 2,
+      "value": "44"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/PiPViewCoordinator.swift",
+      "kind": "IntegerLiteral",
+      "offset": 6712,
+      "length": 2,
+      "value": "44"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/PiPViewCoordinator.swift",
+      "kind": "IntegerLiteral",
+      "offset": 6855,
+      "length": 1,
+      "value": "2"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/PiPViewCoordinator.swift",
+      "kind": "FloatLiteral",
+      "offset": 7699,
+      "length": 4,
+      "value": "0.25"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/PiPViewCoordinator.swift",
+      "kind": "IntegerLiteral",
+      "offset": 8083,
+      "length": 3,
+      "value": "150"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/PiPViewCoordinator.swift",
+      "kind": "IntegerLiteral",
+      "offset": 8096,
+      "length": 3,
+      "value": "150"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/PiPViewCoordinator.swift",
+      "kind": "FloatLiteral",
+      "offset": 8539,
+      "length": 3,
+      "value": "0.1"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/PiPViewCoordinator.swift",
+      "kind": "IntegerLiteral",
+      "offset": 8574,
+      "length": 1,
+      "value": "0"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/DragGestureController.swift",
+      "kind": "BooleanLiteral",
+      "offset": 1202,
+      "length": 4,
+      "value": "true"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/DragGestureController.swift",
+      "kind": "BooleanLiteral",
+      "offset": 1275,
+      "length": 5,
+      "value": "false"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/DragGestureController.swift",
+      "kind": "FloatLiteral",
+      "offset": 2341,
+      "length": 3,
+      "value": "0.5"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/DragGestureController.swift",
+      "kind": "IntegerLiteral",
+      "offset": 2633,
+      "length": 1,
+      "value": "0"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/DragGestureController.swift",
+      "kind": "FloatLiteral",
+      "offset": 2687,
+      "length": 3,
+      "value": "0.9"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/DragGestureController.swift",
+      "kind": "FloatLiteral",
+      "offset": 3279,
+      "length": 4,
+      "value": "20.0"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/DragGestureController.swift",
+      "kind": "IntegerLiteral",
+      "offset": 4319,
+      "length": 1,
+      "value": "2"
+    },
+    {
+      "filePath": "\/usr\/local\/var\/jenkins\/workspace\/jitsi-meet-ios-sdk\/jitsi-meet\/ios\/sdk\/src\/picture-in-picture\/DragGestureController.swift",
+      "kind": "IntegerLiteral",
+      "offset": 4338,
+      "length": 1,
+      "value": "2"
     }
   ]
 }
diff --git a/...MeetSDK.framework/Modules/JitsiMeetSDK.swiftmodule/arm64-apple-ios.private.swiftinterface b/...MeetSDK.framework/Modules/JitsiMeetSDK.swiftmodule/arm64-apple-ios.private.swiftinterface
@@ -1,5 +1,5 @@
 // swift-interface-format-version: 1.0
-// swift-compiler-version: Apple Swift version 5.7.2 (swiftlang-5.7.2.135.5 clang-1400.0.29.51)
+// swift-compiler-version: Apple Swift version 5.8.1 (swiftlang-5.8.0.124.5 clang-1403.0.22.11.100)
 // swift-module-flags: -target arm64-apple-ios12.4 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name JitsiMeetSDK
 // swift-module-flags-ignorable: -enable-bare-slash-regex
 @_exported import JitsiMeetSDK
@@ -30,7 +30,7 @@ public class PiPViewCoordinator {
   public var initialPositionInSuperView: JitsiMeetSDK.PiPViewCoordinator.Position
   @available(*, deprecated, message: "The PiP window size is now fixed to 150px.")
   public var c: CoreFoundation.CGFloat
-  weak public var delegate: JitsiMeetSDK.PiPViewCoordinatorDelegate?
+  weak public var delegate: (any JitsiMeetSDK.PiPViewCoordinatorDelegate)?
   public init(withView view: UIKit.UIView)
   public func configureAsStickyView(withParentView parentView: UIKit.UIView? = nil)
   public func show(completion: JitsiMeetSDK.AnimationCompletion? = nil)

diff --git a/...os-arm64/JitsiMeetSDK.framework/Modules/JitsiMeetSDK.swiftmodule/arm64-apple-ios.swiftdoc b/...os-arm64/JitsiMeetSDK.framework/Modules/JitsiMeetSDK.swiftmodule/arm64-apple-ios.swiftdoc
diff --git a/...64/JitsiMeetSDK.framework/Modules/JitsiMeetSDK.swiftmodule/arm64-apple-ios.swiftinterface b/...64/JitsiMeetSDK.framework/Modules/JitsiMeetSDK.swiftmodule/arm64-apple-ios.swiftinterface
@@ -1,5 +1,5 @@
 // swift-interface-format-version: 1.0
-// swift-compiler-version: Apple Swift version 5.7.2 (swiftlang-5.7.2.135.5 clang-1400.0.29.51)
+// swift-compiler-version: Apple Swift version 5.8.1 (swiftlang-5.8.0.124.5 clang-1403.0.22.11.100)
 // swift-module-flags: -target arm64-apple-ios12.4 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name JitsiMeetSDK
 // swift-module-flags-ignorable: -enable-bare-slash-regex
 @_exported import JitsiMeetSDK
@@ -30,7 +30,7 @@ public class PiPViewCoordinator {
   public var initialPositionInSuperView: JitsiMeetSDK.PiPViewCoordinator.Position
   @available(*, deprecated, message: "The PiP window size is now fixed to 150px.")
   public var c: CoreFoundation.CGFloat
-  weak public var delegate: JitsiMeetSDK.PiPViewCoordinatorDelegate?
+  weak public var delegate: (any JitsiMeetSDK.PiPViewCoordinatorDelegate)?
   public init(withView view: UIKit.UIView)
   public func configureAsStickyView(withParentView parentView: UIKit.UIView? = nil)
   public func show(completion: JitsiMeetSDK.AnimationCompletion? = nil)