Ensure that calls ring at more appropriate times

ts/services/calling.ts

@@ -2950,6 +2950,19 @@ export class CallingClass {
       localCallEvent,
       'CallingClass.handleAutoEndedIncomingCallRequest'
     );
+
+    if (!this.reduxInterface) {
+      log.error(
+        'handleAutoEndedIncomingCallRequest: Unable to update redux for call'
+      );
+    }
+    this.reduxInterface?.callStateChange({
+      acceptedTime: null,
+      callEndedReason,
+      callState: CallState.Ended,
+      conversationId: conversation.id,
+    });
+
     await updateCallHistoryFromLocalEvent(
       callEvent,
       receivedAtCounter ?? null,

ts/state/ducks/callingHelpers.ts

@@ -38,6 +38,13 @@ export const getRingingCall = (
       return false;
     }
 
+    if (
+      activeCallState?.state === 'Active' &&
+      activeCallState.conversationId !== call.conversationId
+    ) {
+      return false;
+    }
+
     return isRinging(call.callState) && call.callEndedReason == null;
   });
 
@@ -50,11 +57,18 @@ export const getRingingCall = (
       return false;
     }
 
+    if (
+      activeCallState?.state === 'Active' &&
+      activeCallState.conversationId !== call.conversationId
+    ) {
+      return false;
+    }
+
     // Outgoing - ringerAci is not set for outgoing group calls
     if (
       activeCallState?.state === 'Active' &&
-      activeCallState.outgoingRing &&
       activeCallState.conversationId === call.conversationId &&
+      activeCallState.outgoingRing &&
       isConnected(call.connectionState) &&
       isJoined(call.joinState) &&
       !hasRemoteParticipants(call.remoteParticipants)