From 48f4ad412f225daaedaa5e3620328152004c6c1d Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 2 May 2023 14:29:41 +0200 Subject: [PATCH 1/4] Jitsi 8.1.1 --- build.gradle | 4 ++-- docs/jitsi.md | 10 +++++----- tools/jitsi/build_jisti_libs.sh | 2 +- vector/build.gradle | 5 ++--- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 69c626afd3..04628a3cf0 100644 --- a/build.gradle +++ b/build.gradle @@ -96,9 +96,9 @@ allprojects { } // Jitsi repo maven { - url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-6.2.2" + url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-8.1.1" // Note: to test Jitsi release you can use a local file like this: - // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-6.2.2" + // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-8.1.1" content { groups.jitsi.regex.each { includeGroupByRegex it } groups.jitsi.group.each { includeGroup it } diff --git a/docs/jitsi.md b/docs/jitsi.md index d6c93c49aa..9116cbcb2c 100644 --- a/docs/jitsi.md +++ b/docs/jitsi.md @@ -32,7 +32,7 @@ Update the script `./tools/jitsi/build_jisti_libs.sh` with the tag of the projec Latest tag can be found from this page: https://github.com/jitsi/jitsi-meet-release-notes/blob/master/CHANGELOG-MOBILE-SDKS.md -Currently we are building the version with the tag `android-sdk-3.10.0`. +Currently we are building the version with the tag `android-sdk-8.1.1`. #### Run the build script @@ -49,7 +49,7 @@ It will build the Jitsi Meet Android library and put every generated files in th - Update the file `./build.gradle` to use the previously created local Maven repository. Currently we have this line: ```groovy -url "https://github.com/vector-im/jitsi_libre_maven/raw/master/android-sdk-3.10.0" +url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-8.1.1" ``` You can uncomment and update the line starting with `// url "file://...` and comment the line starting with `url`, to test the library using the locally generated Maven repository. @@ -57,13 +57,13 @@ You can uncomment and update the line starting with `// url "file://...` and com - Update the dependency of the Jitsi Meet library in the file `./vector/build.gradle`. Currently we have this line: ```groovy -implementation('org.jitsi.react:jitsi-meet-sdk:3.10.0') +api('org.jitsi.react:jitsi-meet-sdk:8.1.1') ``` - Update the dependency of the WebRTC library in the file `./vector/build.gradle`. Currently we have this line: ```groovy -implementation('com.facebook.react:react-native-webrtc:1.92.1-jitsi-9093212@aar') +implementation('com.facebook.react:react-native-webrtc:111.0.0-jitsi-13672566@aar') ``` - Perform a gradle sync and build the project @@ -88,7 +88,7 @@ If all the tests are passed, you can export the generated Jitsi library to our M - Update the file `./build.gradle` to use the previously created Maven repository. Currently we have this line: ```groovy -url "https://github.com/vector-im/jitsi_libre_maven/raw/master/android-sdk-3.10.0" +url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-8.1.1" ``` - Build the project and perform the sanity tests again. diff --git a/tools/jitsi/build_jisti_libs.sh b/tools/jitsi/build_jisti_libs.sh index 91c32fc597..28c777ac09 100755 --- a/tools/jitsi/build_jisti_libs.sh +++ b/tools/jitsi/build_jisti_libs.sh @@ -26,7 +26,7 @@ export LIBRE_BUILD=true cd jitsi-meet # Get the latest version from the changelog: https://github.com/jitsi/jitsi-meet-release-notes/blob/master/CHANGELOG-MOBILE-SDKS.md -git checkout android-sdk-6.2.2 +git checkout android-sdk-8.1.1 echo echo "##################################################" diff --git a/vector/build.gradle b/vector/build.gradle index eba81b29e9..6687bea051 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -249,10 +249,9 @@ dependencies { // WebRTC // org.webrtc:google-webrtc is for development purposes only // implementation 'org.webrtc:google-webrtc:1.0.+' - implementation('com.facebook.react:react-native-webrtc:1.106.1-jitsi-12039821@aar') + implementation('com.facebook.react:react-native-webrtc:111.0.0-jitsi-13672566@aar') // Jitsi - // Note: version is 6.2.0, but built from the tag `android-sdk-6.2.2`. - api('org.jitsi.react:jitsi-meet-sdk:6.2.0') { + api('org.jitsi.react:jitsi-meet-sdk:8.1.1') { exclude group: 'com.google.firebase' exclude group: 'com.google.android.gms' exclude group: 'com.android.installreferrer' From 3a88f04f0dc6ac744c840555c673acaf3b60a86b Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 2 May 2023 14:09:12 +0200 Subject: [PATCH 2/4] Allow dependency `org.jitsi:webrtc`, required by `com.facebook.react:react-native-webrtc:111.0.0-jitsi-13672566` --- dependencies_groups.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/dependencies_groups.gradle b/dependencies_groups.gradle index b09407474f..6292b5d231 100644 --- a/dependencies_groups.gradle +++ b/dependencies_groups.gradle @@ -203,6 +203,7 @@ ext.groups = [ 'org.jetbrains.kotlin', 'org.jetbrains.kotlinx', 'org.jetbrains.trove4j', + 'org.jitsi', 'org.json', 'org.jsoup', 'org.junit', From e34958b814fe89c7694e4f46f4b5a64437a6b455 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 2 May 2023 14:29:10 +0200 Subject: [PATCH 3/4] Jitsi 8.1.1 is now API 24+ --- .../im/vector/app/features/navigation/DefaultNavigator.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt index bfd22f8d82..3f1638a5e2 100644 --- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt +++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt @@ -475,8 +475,8 @@ class DefaultNavigator @Inject constructor( override fun openRoomWidget(context: Context, roomId: String, widget: Widget, options: Map?) { if (widget.type is WidgetType.Jitsi) { - // Jitsi SDK is now for API 23+ - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { + // Jitsi SDK is now for API 24+ + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) { MaterialAlertDialogBuilder(context) .setTitle(R.string.dialog_title_error) .setMessage(R.string.error_jitsi_not_supported_on_old_device) From c0905e5f11d7cc6a46dbd1ad41a9b5d715ba56e3 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 2 May 2023 14:43:13 +0200 Subject: [PATCH 4/4] Changelog --- changelog.d/7619.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/7619.bugfix diff --git a/changelog.d/7619.bugfix b/changelog.d/7619.bugfix new file mode 100644 index 0000000000..a41cf5321f --- /dev/null +++ b/changelog.d/7619.bugfix @@ -0,0 +1 @@ +Upgrade Jitsi SDK from 6.2.2 to 8.1.1. This fixes video call on some Android devices.