diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java index 2840da99d..7affcb412 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java @@ -147,15 +147,20 @@ public class CallNotificationController extends BaseController { @Override public void onNext(ParticipantsOverall participantsOverall) { boolean hasParticipantsInCall = false; + boolean inCallOnDifferentDevice = false; List participantList = participantsOverall.getOcs().getData(); for (Participant participant : participantList) { if (participant.isInCall()) { hasParticipantsInCall = true; + + if (participant.getUserId().equals(userBeingCalled.getUserId())) { + inCallOnDifferentDevice = true; + } break; } } - if (!hasParticipantsInCall) { + if (!hasParticipantsInCall || inCallOnDifferentDevice) { if (getActivity() != null) { getActivity().runOnUiThread(() -> hangup()); }