From 0717f9ba1865063277daf8fb04f2b96b1590a4e4 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 3 May 2021 09:48:46 +0200 Subject: [PATCH] upgrade libwebrtc to m90 and enable extmap-allow-mixed --- .travis.yml | 2 +- build.gradle | 2 +- src/main/java/eu/siacs/conversations/Config.java | 1 - .../eu/siacs/conversations/xmpp/jingle/SessionDescription.java | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3d647d9e8..664d3cf55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ android: - '.+' before_script: - mkdir libs - - wget -O libs/libwebrtc-m89.aar https://gultsch.de/files/libwebrtc-m89.aar + - wget -O libs/libwebrtc-m90.aar https://gultsch.de/files/libwebrtc-m90.aar script: - ./gradlew assembleQuicksyFreeCompatDebug - ./gradlew assembleQuicksyFreeSystemDebug diff --git a/build.gradle b/build.gradle index c89f99a8c..c06f5e34c 100644 --- a/build.gradle +++ b/build.gradle @@ -78,7 +78,7 @@ dependencies { implementation 'com.google.guava:guava:30.1-android' quicksyImplementation 'io.michaelrocks:libphonenumber-android:8.12.18' - implementation fileTree(include: ['libwebrtc-m89.aar'], dir: 'libs') + implementation fileTree(include: ['libwebrtc-m90.aar'], dir: 'libs') } ext { diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java index 0d9b4270f..7f7662bd1 100644 --- a/src/main/java/eu/siacs/conversations/Config.java +++ b/src/main/java/eu/siacs/conversations/Config.java @@ -109,7 +109,6 @@ public final class Config { public static final boolean USE_BOOKMARKS2 = false; - public static final boolean PROCESS_EXTMAP_ALLOW_MIXED = false; public static final boolean DISABLE_PROXY_LOOKUP = false; //useful to debug ibb public static final boolean USE_DIRECT_JINGLE_CANDIDATES = true; public static final boolean DISABLE_HTTP_UPLOAD = false; diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/SessionDescription.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/SessionDescription.java index 9a506513b..39031c4a9 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/SessionDescription.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/SessionDescription.java @@ -215,7 +215,7 @@ public class SessionDescription { mediaAttributes.put("extmap", id + " " + uri); } - if (Config.PROCESS_EXTMAP_ALLOW_MIXED && description.hasChild("extmap-allow-mixed", Namespace.JINGLE_RTP_HEADER_EXTENSIONS)) { + if (description.hasChild("extmap-allow-mixed", Namespace.JINGLE_RTP_HEADER_EXTENSIONS)) { mediaAttributes.put("extmap-allow-mixed", ""); }