From 637b67d9a538d67524cca9b62543b6febb0eb587 Mon Sep 17 00:00:00 2001
From: Jim Gustafson <jim@signal.org>
Date: Wed, 2 Mar 2022 09:28:29 -0800
Subject: [PATCH] Update to RingRTC v2.19.0

Co-authored-by: Evan Hahn <evanhahn@signal.org>
---
 package.json           |  2 +-
 ts/services/calling.ts | 18 ++++++++++++------
 yarn.lock              |  6 +++---
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 6272296fb5..290f32d86f 100644
--- a/package.json
+++ b/package.json
@@ -162,7 +162,7 @@
     "redux-ts-utils": "3.2.2",
     "reselect": "4.1.2",
     "rimraf": "2.6.2",
-    "ringrtc": "https://github.com/signalapp/signal-ringrtc-node.git#561484a82f75f64391da5ce9f48217db30e9ba4b",
+    "ringrtc": "https://github.com/signalapp/signal-ringrtc-node.git#a32abe1c72df187b57b466078b3d9f2873ee6243",
     "rotating-file-stream": "2.1.5",
     "sanitize.css": "11.0.0",
     "semver": "5.4.1",
diff --git a/ts/services/calling.ts b/ts/services/calling.ts
index e93f89216f..1a07969a10 100644
--- a/ts/services/calling.ts
+++ b/ts/services/calling.ts
@@ -853,15 +853,21 @@ export class CallingClass {
     peekInfo: PeekInfo
   ): GroupCallPeekInfoType {
     return {
-      uuids: peekInfo.joinedMembers.map(uuidBuffer => {
-        let uuid = bytesToUuid(uuidBuffer);
-        if (!uuid) {
+      uuids: peekInfo.devices.map(peekDeviceInfo => {
+        if (peekDeviceInfo.userId) {
+          const uuid = bytesToUuid(peekDeviceInfo.userId);
+          if (uuid) {
+            return uuid;
+          }
           log.error(
             'Calling.formatGroupCallPeekInfoForRedux: could not convert peek UUID Uint8Array to string; using fallback UUID'
           );
-          uuid = '00000000-0000-0000-0000-000000000000';
+        } else {
+          log.error(
+            'Calling.formatGroupCallPeekInfoForRedux: device had no user ID; using fallback UUID'
+          );
         }
-        return uuid;
+        return '00000000-0000-0000-0000-000000000000';
       }),
       creatorUuid: peekInfo.creator && bytesToUuid(peekInfo.creator),
       eraId: peekInfo.eraId,
@@ -2094,7 +2100,7 @@ export class CallingClass {
     const wasStartedByMe = Boolean(
       creatorConversation && isMe(creatorConversation.attributes)
     );
-    const isAnybodyElseInGroupCall = Boolean(peekInfo.joinedMembers.length);
+    const isAnybodyElseInGroupCall = Boolean(peekInfo.devices.length);
 
     if (
       isNewCall &&
diff --git a/yarn.lock b/yarn.lock
index a937154d1d..0d748ca9fc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13092,9 +13092,9 @@ rimraf@^3.0.0, rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
-"ringrtc@https://github.com/signalapp/signal-ringrtc-node.git#561484a82f75f64391da5ce9f48217db30e9ba4b":
-  version "2.18.0"
-  resolved "https://github.com/signalapp/signal-ringrtc-node.git#561484a82f75f64391da5ce9f48217db30e9ba4b"
+"ringrtc@https://github.com/signalapp/signal-ringrtc-node.git#a32abe1c72df187b57b466078b3d9f2873ee6243":
+  version "2.19.0"
+  resolved "https://github.com/signalapp/signal-ringrtc-node.git#a32abe1c72df187b57b466078b3d9f2873ee6243"
 
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.1"