~singpolyma/cheogram-android

0717f9ba1865063277daf8fb04f2b96b1590a4e4 — Daniel Gultsch 2 years ago ac7855a
upgrade libwebrtc to m90 and enable extmap-allow-mixed
M .travis.yml => .travis.yml +1 -1
@@ 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

M build.gradle => build.gradle +1 -1
@@ 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 {

M src/main/java/eu/siacs/conversations/Config.java => src/main/java/eu/siacs/conversations/Config.java +0 -1
@@ 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;

M src/main/java/eu/siacs/conversations/xmpp/jingle/SessionDescription.java => src/main/java/eu/siacs/conversations/xmpp/jingle/SessionDescription.java +1 -1
@@ 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", "");
            }