Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 09:20:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

RingRTC v2.4.0 Release Integration.

Browse Source 
Co-authored-by: Peter Thatcher <peter@signal.org>
This commit is contained in:
Jim Gustafson
2020-07-29 20:07:05 -07:00
committed by Greyson Parrelli
parent 550b121990
commit a942293a74
11 changed files with 154 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/org/thoughtcrime/securesms/ringrtc/IceCandidateParcel.java
View File

@@ -4,9 +4,11 @@ import android.os.Parcel;
import android.os.Parcelable;
import androidx.annotation.NonNull;
import org.signal.ringrtc.CallId;
import com.google.protobuf.ByteString;
import org.signal.ringrtc.CallId;
import org.signal.ringrtc.IceCandidate;
import org.webrtc.IceCandidate;
import org.whispersystems.signalservice.api.messages.calls.IceUpdateMessage;
/**
@@ -24,14 +26,11 @@ public class IceCandidateParcel implements Parcelable {
}
public IceCandidateParcel(@NonNull IceUpdateMessage iceUpdateMessage) {
this.iceCandidate = new IceCandidate(iceUpdateMessage.getSdpMid(),
iceUpdateMessage.getSdpMLineIndex(),
iceUpdateMessage.getSdp());
this.iceCandidate = new IceCandidate(iceUpdateMessage.getOpaque(), iceUpdateMessage.getSdp());
}
private IceCandidateParcel(@NonNull Parcel in) {
this.iceCandidate = new IceCandidate(in.readString(),
in.readInt(),
this.iceCandidate = new IceCandidate(in.createByteArray(),
in.readString());
}
@@ -41,9 +40,8 @@ public class IceCandidateParcel implements Parcelable {
public @NonNull IceUpdateMessage getIceUpdateMessage(@NonNull CallId callId) {
return new IceUpdateMessage(callId.longValue(),
iceCandidate.sdpMid,
iceCandidate.sdpMLineIndex,
iceCandidate.sdp);
iceCandidate.getOpaque(),
iceCandidate.getSdp());
}
@Override
@@ -53,9 +51,8 @@ public class IceCandidateParcel implements Parcelable {
@Override
public void writeToParcel(@NonNull Parcel dest, int flags) {
dest.writeString(iceCandidate.sdpMid);
dest.writeInt(iceCandidate.sdpMLineIndex);
dest.writeString(iceCandidate.sdp);
dest.writeByteArray(iceCandidate.getOpaque());
dest.writeString(iceCandidate.getSdp());
}
public static final Creator<IceCandidateParcel> CREATOR = new Creator<IceCandidateParcel>() {