diff --git a/build.gradle b/build.gradle index e9045b99c7..4c3734892d 100644 --- a/build.gradle +++ b/build.gradle @@ -69,9 +69,9 @@ allprojects { maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } // Jitsi repo maven { - url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-3.1.0" + url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-3.10.0" // Note: to test Jitsi release you can use a local file like this: - // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-3.1.0" + // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-3.10.0" } google() mavenCentral() diff --git a/changelog.d/4504.misc b/changelog.d/4504.misc new file mode 100644 index 0000000000..1f7741618e --- /dev/null +++ b/changelog.d/4504.misc @@ -0,0 +1 @@ +Upgrade Jitsi lib (and so webrtc) from Jitsi android-sdk-3.1.0 to android-sdk-3.10.0 \ No newline at end of file diff --git a/docs/jitsi.md b/docs/jitsi.md index 389e7d71ec..55cedaedb1 100644 --- a/docs/jitsi.md +++ b/docs/jitsi.md @@ -18,7 +18,7 @@ The generated maven repository is then host in the project https://github.com/ve Update the script `./tools/jitsi/build_jisti_libs.sh` with the tag of the project `https://github.com/jitsi/jitsi-meet`. -Currently we are building the version with the tag `android-sdk-3.1.0`. +Currently we are building the version with the tag `android-sdk-3.10.0`. ### Run the build script @@ -35,7 +35,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.1.0" +url "https://github.com/vector-im/jitsi_libre_maven/raw/master/android-sdk-3.10.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. @@ -43,13 +43,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.1.0') +implementation('org.jitsi.react:jitsi-meet-sdk:3.10.0') ``` - 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.87.3-jitsi-6624067@aar') +implementation('com.facebook.react:react-native-webrtc:1.92.1-jitsi-9093212@aar') ``` - Perform a gradle sync and build the project @@ -74,7 +74,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.1.0" +url "https://github.com/vector-im/jitsi_libre_maven/raw/master/android-sdk-3.10.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 34051d463c..e352575775 100755 --- a/tools/jitsi/build_jisti_libs.sh +++ b/tools/jitsi/build_jisti_libs.sh @@ -25,8 +25,8 @@ cd jitsi-meet # This is commit after version 2.2.2, which does not compile # git checkout 5a934c071a5cbe64de275a25d0ed62d8193cdd03 -# Version android-sdk-3.1.0, commit 7a64bf006ea027b77564d8847570e1ac46ff0ec0 -git checkout android-sdk-3.1.0 +# Version android-sdk-3.10.0, commit 99e56e229dfa3c490096e37c3e5b76d2a3f23e32 +git checkout android-sdk-3.10.0 echo echo "##################################################" diff --git a/vector/build.gradle b/vector/build.gradle index fb1d2fc7e9..dc8c3f5047 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -470,10 +470,10 @@ 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.87.3-jitsi-6624067@aar') + implementation('com.facebook.react:react-native-webrtc:1.92.1-jitsi-9093212@aar') // Jitsi - implementation('org.jitsi.react:jitsi-meet-sdk:3.1.0') { + implementation('org.jitsi.react:jitsi-meet-sdk:3.10.0') { exclude group: 'com.google.firebase' exclude group: 'com.google.android.gms' exclude group: 'com.android.installreferrer' diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml index e5d4753235..5b56107ef7 100644 --- a/vector/src/main/AndroidManifest.xml +++ b/vector/src/main/AndroidManifest.xml @@ -43,7 +43,7 @@ tools:node="remove" /> - + @@ -424,14 +424,6 @@ - - Boolean) = { true } -) : DefaultVectorAlert(uid, "", "", 0, shouldBeDisplayedIn) { - - override val priority = PopupAlertManager.JITSI_CALL_PRIORITY - override val layoutRes = R.layout.alerter_jitsi_call_layout - override var colorAttribute: Int? = R.attr.colorSurface - override val dismissOnClick: Boolean = false - override val isLight: Boolean = true - - class ViewBinder(private val matrixItem: MatrixItem?, - private val avatarRenderer: AvatarRenderer, - private val onJoin: () -> Unit) : VectorAlert.ViewBinder { - - override fun bind(view: View) { - val views = AlerterJitsiCallLayoutBinding.bind(view) - views.jitsiCallNameView.text = matrixItem?.getBestName() - matrixItem?.let { avatarRenderer.render(it, views.jitsiCallAvatar, GlideApp.with(view.context.applicationContext)) } - views.jitsiCallJoinView.setOnClickListener { - onJoin() - } - } - } -} diff --git a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt index 9084c64a40..f849d39bf8 100644 --- a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt +++ b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt @@ -44,7 +44,6 @@ class PopupAlertManager @Inject constructor() { companion object { const val INCOMING_CALL_PRIORITY = Int.MAX_VALUE - const val JITSI_CALL_PRIORITY = INCOMING_CALL_PRIORITY - 1 } private var weakCurrentActivity: WeakReference? = null diff --git a/vector/src/main/res/layout/alerter_jitsi_call_layout.xml b/vector/src/main/res/layout/alerter_jitsi_call_layout.xml deleted file mode 100644 index 163f88d492..0000000000 --- a/vector/src/main/res/layout/alerter_jitsi_call_layout.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - -