narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

keep order of rtp contents

Browse source
This commit is contained in:
Daniel Gultsch 2023-10-06 12:34:41 +02:00
parent 541c8ba80d
commit 1c5a1b8c71
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/eu/siacs/conversations/xmpp/jingle/RtpContentMap.java
View file

@ -24,6 +24,7 @@ import eu.siacs.conversations.xmpp.jingle.stanzas.RtpDescription;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -430,7 +431,7 @@ public class RtpContentMap {
private static Map<String, DescriptionTransport> merge( private static Map<String, DescriptionTransport> merge(
final Map<String, DescriptionTransport> a, final Map<String, DescriptionTransport> b) { 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(a);
combined.putAll(b); combined.putAll(b);
return ImmutableMap.copyOf(combined); return ImmutableMap.copyOf(combined);