From f7eaa1cb51ae087a57cb595f5bee6072422e530f Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Wed, 10 Jun 2026 15:58:53 -0400
Subject: [PATCH] Fix outgoing group calls showing as incoming when someone
 joins.

---
 .../service/webrtc/GroupConnectedActionProcessor.java     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupConnectedActionProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupConnectedActionProcessor.java
index e9a72f4dc8..16e760e71c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupConnectedActionProcessor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupConnectedActionProcessor.java
@@ -307,8 +307,14 @@ public class GroupConnectedActionProcessor extends GroupActionProcessor {
       return currentState;
     }
 
+    String eraId = WebRtcUtil.getGroupCallEraId(groupCall);
+
+    if (eraId == null) {
+      Log.i(tag, "handleGroupJoinedMembershipChanged(): eraId is null, waiting for peek update");
+      return currentState;
+    }
+
     boolean remoteUserRangTheCall = currentState.getCallSetupState(RemotePeer.GROUP_CALL_ID).getRingerRecipient() != Recipient.self();
-    String  eraId                 = WebRtcUtil.getGroupCallEraId(groupCall);
     webRtcInteractor.sendGroupCallMessage(currentState.getCallInfoState().getCallRecipient(), eraId, null, remoteUserRangTheCall, true);
 
     List<UUID> members = new ArrayList<>(peekInfo.getJoinedMembers());