mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Upgrade RingRTC to v2.13.1

Browse source
This commit is contained in:
Evan Hahn 2021-09-23 10:49:33 -05:00 • committed by GitHub
parent dbd427396c
commit 04a4e6e5ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -151,7 +151,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#432139dfeb2bcdf96118f3a6554c7c58da42d042", "ringrtc": "https://github.com/signalapp/signal-ringrtc-node.git#8b028d8f1ea0c5936cac1742bb425b7ed0b25d35",
"rotating-file-stream": "2.1.5", "rotating-file-stream": "2.1.5",
"sanitize-filename": "1.6.3", "sanitize-filename": "1.6.3",
"sanitize.css": "11.0.0", "sanitize.css": "11.0.0",

24
ts/services/calling.ts
View file

@ -63,6 +63,7 @@ import {
} from '../Crypto'; } from '../Crypto';
import { dropNull, shallowDropNull } from '../util/dropNull'; import { dropNull, shallowDropNull } from '../util/dropNull';
import { getOwn } from '../util/getOwn'; import { getOwn } from '../util/getOwn';
import { isNormalNumber } from '../util/isNormalNumber';
import * as durations from '../util/durations'; import * as durations from '../util/durations';
import { handleMessageSend } from '../util/handleMessageSend'; import { handleMessageSend } from '../util/handleMessageSend';
import { import {
@ -1742,13 +1743,27 @@ export class CallingClass {
private handleAutoEndedIncomingCallRequest( private handleAutoEndedIncomingCallRequest(
remoteUserId: UserId, remoteUserId: UserId,
reason: CallEndedReason reason: CallEndedReason,
ageInSeconds: number
) { ) {
const conversation = window.ConversationController.get(remoteUserId); const conversation = window.ConversationController.get(remoteUserId);
if (!conversation) { if (!conversation) {
return; return;
} }
this.addCallHistoryForAutoEndedIncomingCall(conversation, reason);
// This is extra defensive, just in case RingRTC passes us a bad value. (It probably
// won't.)
const ageInMilliseconds =
isNormalNumber(ageInSeconds) && ageInSeconds >= 0
? ageInSeconds * durations.SECOND
: 0;
const endedTime = Date.now() - ageInMilliseconds;
this.addCallHistoryForAutoEndedIncomingCall(
conversation,
reason,
endedTime
);
} }
private attachToCall(conversation: ConversationModel, call: Call): void { private attachToCall(conversation: ConversationModel, call: Call): void {
@ -1966,7 +1981,8 @@ export class CallingClass {
private addCallHistoryForAutoEndedIncomingCall( private addCallHistoryForAutoEndedIncomingCall(
conversation: ConversationModel, conversation: ConversationModel,
_reason: CallEndedReason _reason: CallEndedReason,
endedTime: number
) { ) {
conversation.addCallHistory({ conversation.addCallHistory({
callMode: CallMode.Direct, callMode: CallMode.Direct,
@ -1977,7 +1993,7 @@ export class CallingClass {
// Since the user didn't decline, make sure it shows up as a missed call instead // Since the user didn't decline, make sure it shows up as a missed call instead
wasDeclined: false, wasDeclined: false,
acceptedTime: undefined, acceptedTime: undefined,
endedTime: Date.now(), endedTime,
}); });
} }

6
yarn.lock
View file

@ -15827,9 +15827,9 @@ rimraf@^3.0.0, rimraf@^3.0.2, rimraf@~3.0.2:
dependencies: dependencies:
glob "^7.1.3" glob "^7.1.3"
"ringrtc@https://github.com/signalapp/signal-ringrtc-node.git#432139dfeb2bcdf96118f3a6554c7c58da42d042": "ringrtc@https://github.com/signalapp/signal-ringrtc-node.git#8b028d8f1ea0c5936cac1742bb425b7ed0b25d35":
version "2.13.0" version "2.13.1"
resolved "https://github.com/signalapp/signal-ringrtc-node.git#432139dfeb2bcdf96118f3a6554c7c58da42d042" resolved "https://github.com/signalapp/signal-ringrtc-node.git#8b028d8f1ea0c5936cac1742bb425b7ed0b25d35"
ripemd160@^2.0.0, ripemd160@^2.0.1: ripemd160@^2.0.0, ripemd160@^2.0.1:
version "2.0.1" version "2.0.1"