diff --git a/build.gradle b/build.gradle index af6aa5e91be..8324b569dae 100644 --- a/build.gradle +++ b/build.gradle @@ -72,6 +72,7 @@ allprojects { repositories { // Do not use `mavenCentral()`, it prevents Dependabot from working properly + // mavenCentral() // TODO Where to get com.facebook.react:react-android besides from mavenCentral? maven { url 'https://repo1.maven.org/maven2' content { @@ -96,9 +97,11 @@ allprojects { } // Jitsi repo maven { - url "https://github.com/element-hq/jitsi_libre_maven/raw/main/android-sdk-8.1.1" + url "https://github.com/element-hq/jitsi_libre_maven/raw/main/mobile-sdk-10.1.0" // Note: to test Jitsi release you can use a local file like this: - // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-8.1.1" + // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/mobile-sdk-10.1.0" + // or + // url "file:/tmp/jitsi content { groups.jitsi.regex.each { includeGroupByRegex it } groups.jitsi.group.each { includeGroup it } diff --git a/changelog.d/8885.bugfix b/changelog.d/8885.bugfix new file mode 100644 index 00000000000..e9db5b48607 --- /dev/null +++ b/changelog.d/8885.bugfix @@ -0,0 +1 @@ +Fix crash when joining a conference call on Android 14. ([#8885](https://github.com/element-hq/element-android/issues/8885)) diff --git a/docs/jitsi.md b/docs/jitsi.md index b413d93dfc8..2340c141e42 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-8.1.1`. +Currently we are building the version with the tag `mobile-sdk-10.1.0`. #### 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/element-hq/jitsi_libre_maven/raw/main/android-sdk-8.1.1" +url "https://github.com/element-hq/jitsi_libre_maven/raw/main/mobile-sdk-10.1.0" ``` 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,7 @@ 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 -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:111.0.0-jitsi-13672566@aar') +api('org.jitsi.react:jitsi-meet-sdk:10.1.0') ``` - Perform a gradle sync and build the project @@ -88,7 +82,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/element-hq/jitsi_libre_maven/raw/main/android-sdk-8.1.1" +url "https://github.com/element-hq/jitsi_libre_maven/raw/main/mobile-sdk-10.1.0" ``` - 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 fcdf728428b..a34a877a52c 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-8.1.1 +git checkout mobile-sdk-10.1.0 echo echo "##################################################" diff --git a/vector/build.gradle b/vector/build.gradle index 1374b236f93..0b92779b467 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -250,7 +250,7 @@ dependencies { implementation "androidx.emoji2:emoji2:1.3.0" // Jitsi - api('org.jitsi.react:jitsi-meet-sdk:8.1.1') { + api('org.jitsi.react:jitsi-meet-sdk:10.1.0') { exclude group: 'com.google.firebase' exclude group: 'com.google.android.gms' exclude group: 'com.android.installreferrer' @@ -259,6 +259,9 @@ dependencies { // The library exports a jetified artifact but doesn't remove the support library dependency // https://github.com/MatrixFrog/Android-ScalableVideoView/blob/master/gradle.properties#L1 exclude group: 'com.android.support', module: 'appcompat-v7' + + // transitive needed to pull in the react-native dependency + transitive = true } // QR-code diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml index d843f03216b..d13037b4a92 100644 --- a/vector/src/main/AndroidManifest.xml +++ b/vector/src/main/AndroidManifest.xml @@ -54,7 +54,7 @@ - +