Upgrade to RingRTC v2.4.0

This commit is contained in:
Jim Gustafson 2020-07-29 09:29:57 -07:00 committed by Scott Nonnenberg
parent 7ef5dc6401
commit 2f015863ca
6 changed files with 28 additions and 16 deletions

View file

@ -129,7 +129,7 @@
"redux-ts-utils": "3.2.2", "redux-ts-utils": "3.2.2",
"reselect": "4.0.0", "reselect": "4.0.0",
"rimraf": "2.6.2", "rimraf": "2.6.2",
"ringrtc": "https://github.com/signalapp/signal-ringrtc-node.git#29a00a1e63697026313fa819f20276c47d0afdc5", "ringrtc": "https://github.com/signalapp/signal-ringrtc-node.git#f418f32a6616ea999c026161793bf44aa91c66f1",
"sanitize-filename": "1.6.3", "sanitize-filename": "1.6.3",
"sanitize.css": "11.0.0", "sanitize.css": "11.0.0",
"semver": "5.4.1", "semver": "5.4.1",

View file

@ -45,20 +45,28 @@ message CallingMessage {
} }
optional uint64 callId = 1; optional uint64 callId = 1;
// Legacy/deprecated; replaced by 'opaque'
optional string sdp = 2; optional string sdp = 2;
optional Type type = 3; optional Type type = 3;
optional bytes opaque = 4;
} }
message Answer { message Answer {
optional uint64 callId = 1; optional uint64 callId = 1;
// Legacy/deprecated; replaced by 'opaque'
optional string sdp = 2; optional string sdp = 2;
optional bytes opaque = 3;
} }
message IceCandidate { message IceCandidate {
optional uint64 callId = 1; optional uint64 callId = 1;
// Legacy/deprecated; remove when old clients are gone.
optional string mid = 2; optional string mid = 2;
optional uint32 midIndex = 3; // Legacy/deprecated; remove when old clients are gone.
optional uint32 line = 3;
// Legacy/deprecated; replaced by 'opaque'
optional string sdp = 4; optional string sdp = 4;
optional bytes opaque = 5;
} }
message Busy { message Busy {

2
ts/model-types.d.ts vendored
View file

@ -87,7 +87,6 @@ declare class ConversationModelType extends Backbone.Model<
getAccepted(): boolean; getAccepted(): boolean;
getAvatarPath(): string | undefined; getAvatarPath(): string | undefined;
getColor(): ColorType | undefined; getColor(): ColorType | undefined;
getIsAddedByContact(): boolean;
getName(): string | undefined; getName(): string | undefined;
getNumber(): string; getNumber(): string;
getProfileName(): string | undefined; getProfileName(): string | undefined;
@ -96,6 +95,7 @@ declare class ConversationModelType extends Backbone.Model<
getSendOptions(options?: any): SendOptionsType | undefined; getSendOptions(options?: any): SendOptionsType | undefined;
getTitle(): string; getTitle(): string;
idForLogging(): string; idForLogging(): string;
isFromOrAddedByTrustedContact(): boolean;
isVerified(): boolean; isVerified(): boolean;
safeGetVerified(): Promise<number>; safeGetVerified(): Promise<number>;
setProfileKey(profileKey?: string | null): Promise<void>; setProfileKey(profileKey?: string | null): Promise<void>;

View file

@ -396,7 +396,7 @@ export class CallingClass {
const shouldRelayCalls = Boolean(await window.getAlwaysRelayCalls()); const shouldRelayCalls = Boolean(await window.getAlwaysRelayCalls());
// If the peer is 'unknown', i.e. not in the contact list, force IP hiding. // If the peer is 'unknown', i.e. not in the contact list, force IP hiding.
const isContactUnknown = !conversation.getIsAddedByContact(); const isContactUnknown = !conversation.isFromOrAddedByTrustedContact();
return { return {
iceServer: JSON.parse(iceServerJson), iceServer: JSON.parse(iceServerJson),

6
ts/textsecure.d.ts vendored
View file

@ -904,6 +904,9 @@ export declare class WebSocketResponseMessageClass {
// Everything from here down to HangupType (everything related to calling) // Everything from here down to HangupType (everything related to calling)
// must be kept in sync with RingRTC (ringrtc-node). // must be kept in sync with RingRTC (ringrtc-node).
// Whenever you change this, make sure you change RingRTC as well. // Whenever you change this, make sure you change RingRTC as well.
type ProtobufArrayBuffer = ArrayBuffer | { toArrayBuffer: () => ArrayBuffer };
export type DeviceId = number; export type DeviceId = number;
export type CallId = any; export type CallId = any;
@ -938,7 +941,8 @@ export class AnswerMessageClass {
export class IceCandidateMessageClass { export class IceCandidateMessageClass {
callId?: CallId; callId?: CallId;
mid?: string; mid?: string;
midIndex?: number; line?: number;
opaque?: ProtobufArrayBuffer;
sdp?: string; sdp?: string;
} }

View file

@ -14929,9 +14929,9 @@ rimraf@~2.4.0:
dependencies: dependencies:
glob "^6.0.1" glob "^6.0.1"
"ringrtc@https://github.com/signalapp/signal-ringrtc-node.git#29a00a1e63697026313fa819f20276c47d0afdc5": "ringrtc@https://github.com/signalapp/signal-ringrtc-node.git#f418f32a6616ea999c026161793bf44aa91c66f1":
version "2.3.1" version "2.4.0"
resolved "https://github.com/signalapp/signal-ringrtc-node.git#29a00a1e63697026313fa819f20276c47d0afdc5" resolved "https://github.com/signalapp/signal-ringrtc-node.git#f418f32a6616ea999c026161793bf44aa91c66f1"
ripemd160@^2.0.0, ripemd160@^2.0.1: ripemd160@^2.0.0, ripemd160@^2.0.1:
version "2.0.1" version "2.0.1"