Update to RingRTC v2.9.0

Co-authored-by: Alex Hart <alex@signal.org>
This commit is contained in:
Jim Gustafson
2021-01-27 04:44:10 -08:00
committed by Alan Evans
parent 95978f16e9
commit 9dbbe4675f
12 changed files with 49 additions and 32 deletions

View File

@@ -6,7 +6,6 @@ import android.os.Parcelable;
import androidx.annotation.NonNull;
import org.signal.ringrtc.CallId;
import org.signal.ringrtc.IceCandidate;
import org.whispersystems.signalservice.api.messages.calls.IceUpdateMessage;
/**
@@ -17,29 +16,28 @@ import org.whispersystems.signalservice.api.messages.calls.IceUpdateMessage;
*/
public class IceCandidateParcel implements Parcelable {
@NonNull private final IceCandidate iceCandidate;
@NonNull private final byte[] iceCandidate;
public IceCandidateParcel(@NonNull IceCandidate iceCandidate) {
public IceCandidateParcel(@NonNull byte[] iceCandidate) {
this.iceCandidate = iceCandidate;
}
public IceCandidateParcel(@NonNull IceUpdateMessage iceUpdateMessage) {
this.iceCandidate = new IceCandidate(iceUpdateMessage.getOpaque(), iceUpdateMessage.getSdp());
this.iceCandidate = iceUpdateMessage.getOpaque();
}
private IceCandidateParcel(@NonNull Parcel in) {
this.iceCandidate = new IceCandidate(in.createByteArray(),
in.readString());
this.iceCandidate = in.createByteArray();
}
public @NonNull IceCandidate getIceCandidate() {
public @NonNull byte[] getIceCandidate() {
return iceCandidate;
}
public @NonNull IceUpdateMessage getIceUpdateMessage(@NonNull CallId callId) {
return new IceUpdateMessage(callId.longValue(),
iceCandidate.getOpaque(),
iceCandidate.getSdp());
iceCandidate,
null);
}
@Override
@@ -49,8 +47,7 @@ public class IceCandidateParcel implements Parcelable {
@Override
public void writeToParcel(@NonNull Parcel dest, int flags) {
dest.writeByteArray(iceCandidate.getOpaque());
dest.writeString(iceCandidate.getSdp());
dest.writeByteArray(iceCandidate);
}
public static final Creator<IceCandidateParcel> CREATOR = new Creator<IceCandidateParcel>() {