Set webrtc proxy

.github/workflows/build.yml

@@ -31,6 +31,11 @@ jobs:
         with:
           # https://github.com/actions/checkout/issues/881
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+      - name: Use JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '17'
       - name: Configure gradle
         uses: gradle/gradle-build-action@v2
         with:
@@ -64,6 +69,11 @@ jobs:
         # with:
           # https://github.com/actions/checkout/issues/881
           # ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+      - name: Use JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '17'
       - name: Configure gradle
         uses: gradle/gradle-build-action@v2
         with:

.github/workflows/quality.yml

@@ -7,7 +7,7 @@ on:
 
 # Enrich gradle.properties for CI/CD
 env:
-  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -XX:MaxPermSize=512m -Dkotlin.daemon.jvm.options="-Xmx2g" -Dkotlin.incremental=false
+  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -XX:MaxMetaspaceSize=512m -Dkotlin.daemon.jvm.options="-Xmx2g" -Dkotlin.incremental=false
   CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
 
 jobs:
@@ -45,6 +45,11 @@ jobs:
           app_id: ${{ secrets.APP_ID_DANGERBOT }}
           private_key: ${{ secrets.APP_PEM_DANGERBOT }}
       - uses: actions/checkout@v3
+      - name: Use JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '17'
       - name: Run ktlint
         run: |
           ./gradlew ktlintCheck $CI_GRADLE_ARG_PROPERTIES --continue

dependencies.gradle

@@ -2,8 +2,8 @@ ext.versions = [
         'minSdk'            : 21,
         'compileSdk'        : 33,
         'targetSdk'         : 33,
-        'sourceCompat'      : JavaVersion.VERSION_11,
-        'targetCompat'      : JavaVersion.VERSION_11,
+        'sourceCompat'      : JavaVersion.VERSION_17,
+        'targetCompat'      : JavaVersion.VERSION_17,
 ]
 
 def gradle = "7.4.2"

dependencies_groups.gradle

@@ -11,6 +11,7 @@ ext.groups = [
                         'com.github.MatrixFrog',
                         'com.github.matrix-org',
                         'com.github.tapadoo',
+                        'com.github.tchapgouv',
                         'com.github.UnifiedPush',
                         'com.github.yalantis',
                         'com.github.Zhuinden',

library/attachment-viewer/build.gradle

@@ -49,7 +49,7 @@ android {
         targetCompatibility versions.targetCompat
     }
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
 
     buildFeatures {

library/core-utils/build.gradle

@@ -44,7 +44,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
         freeCompilerArgs += [
                 "-opt-in=kotlin.RequiresOptIn"
         ]

library/external/autocomplete/build.gradle

@@ -17,7 +17,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
 }
 

library/external/dialpad/build.gradle

@@ -17,7 +17,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
 }
 

library/external/jsonviewer/build.gradle

@@ -42,7 +42,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
 }
 

library/multipicker/build.gradle

@@ -43,7 +43,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
 }
 

library/ui-strings/build.gradle

@@ -19,7 +19,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
 }
 

library/ui-styles/build.gradle

@@ -55,7 +55,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
 
     buildFeatures {

matrix-sdk-android-flow/build.gradle

@@ -28,7 +28,7 @@ android {
         targetCompatibility versions.targetCompat
     }
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
 
 //    publishNonDefault true

matrix-sdk-android/build.gradle

@@ -106,7 +106,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
         freeCompilerArgs += [
                 // Disabled for now, there are too many errors. Could be handled in another dedicated PR
                 // '-Xexplicit-api=strict', // or warning

vector-app/build.gradle

@@ -406,7 +406,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
         freeCompilerArgs += [
                 "-opt-in=kotlin.RequiresOptIn",
                 // Fixes false positive "This is an internal Mavericks API. It is not intended for external use."

vector-config/build.gradle

@@ -32,6 +32,6 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
 }

vector/build.gradle

@@ -108,7 +108,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
         freeCompilerArgs += [
                 "-opt-in=kotlin.RequiresOptIn",
                 // Fixes false positive "This is an internal Mavericks API. It is not intended for external use."
@@ -272,7 +272,7 @@ dependencies {
 
     // TCHAP Manage jitsi lib
     // WebRTC
-    withdmvoipImplementation('org.jitsi:webrtc:111.0.1')
+    withdmvoipImplementation('com.github.tchapgouv:webrtc:124.1.0')
     // Jitsi
     withvoipApi('org.jitsi.react:jitsi-meet-sdk:8.1.1') {
         exclude group: 'com.google.firebase'

vector/src/withdmvoip/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt

@@ -231,12 +231,17 @@ class WebRtcCallManager @Inject constructor(
                 true
         )
         val defaultVideoDecoderFactory = DefaultVideoDecoderFactory(eglBaseContext)
+        val proxyHost = System.getProperty("http.proxyHost")
+        val proxyPort = System.getProperty("http.proxyPort")?.toInt()
         Timber.tag(loggerTag.value).v("PeerConnectionFactory.createPeerConnectionFactory ...")
-        peerConnectionFactory = PeerConnectionFactory.builder()
+        val builder = PeerConnectionFactory.builder()
                 .setOptions(options)
                 .setVideoEncoderFactory(defaultVideoEncoderFactory)
                 .setVideoDecoderFactory(defaultVideoDecoderFactory)
-                .createPeerConnectionFactory()
+        if (!proxyHost.isNullOrBlank() && proxyPort != null) {
+            builder.setHttpsProxy(proxyHost, proxyPort)
+        }
+        peerConnectionFactory = builder.createPeerConnectionFactory()
     }
 
     private fun onCallActive(call: WebRtcCall) {