~singpolyma/cheogram-android

bc3e133f6b087e047f2cc7a6a91cb6f81ad6b8e7 — Daniel Gultsch 4 months ago 8739301
keep order of rtp contents
1 files changed, 2 insertions(+), 1 deletions(-)

M src/main/java/eu/siacs/conversations/xmpp/jingle/RtpContentMap.java
M src/main/java/eu/siacs/conversations/xmpp/jingle/RtpContentMap.java => src/main/java/eu/siacs/conversations/xmpp/jingle/RtpContentMap.java +2 -1
@@ 24,6 24,7 @@ import eu.siacs.conversations.xmpp.jingle.stanzas.RtpDescription;

import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;


@@ 430,7 431,7 @@ public class RtpContentMap {

    private static Map<String, DescriptionTransport> merge(
            final Map<String, DescriptionTransport> a, final Map<String, DescriptionTransport> b) {
        final Map<String, DescriptionTransport> combined = new HashMap<>();
        final Map<String, DescriptionTransport> combined = new LinkedHashMap<>();
        combined.putAll(a);
        combined.putAll(b);
        return ImmutableMap.copyOf(combined);