From b271968c55e30d555c691bc43ff2f78bdfb71c31 Mon Sep 17 00:00:00 2001 From: Ergyun Syuleyman Date: Thu, 7 May 2020 14:32:06 +0300 Subject: [PATCH] NY-10161: [AN]: App crash on pressing meeting link or trying to join in conference that I was not invited --- .../communicator/data/sdk/calls/ConferenceSDKModule.java | 3 ++- .../ui/fragments/conference/ConferenceCallFragment.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nynja/mobile/communicator/data/sdk/calls/ConferenceSDKModule.java b/app/src/main/java/com/nynja/mobile/communicator/data/sdk/calls/ConferenceSDKModule.java index 6032479baa..3af7bfeabc 100644 --- a/app/src/main/java/com/nynja/mobile/communicator/data/sdk/calls/ConferenceSDKModule.java +++ b/app/src/main/java/com/nynja/mobile/communicator/data/sdk/calls/ConferenceSDKModule.java @@ -758,7 +758,7 @@ public class ConferenceSDKModule extends BaseSDKModule { && StringUtils.isNotEmpty(chatRoomId)) { mActiveConference.mEndPointId = chatRoomId; } - runOnUIThread( () -> { + mHandler.post(() -> { onConferenceParticipantsUpdated(callId); }); } @@ -1071,6 +1071,7 @@ public class ConferenceSDKModule extends BaseSDKModule { String conferenceId, boolean result) { if (!hasCreatedActiveCall()) return; + if (mActiveConference.mConference == null) return; Timber.d("Request conference member with \'ConferenceId\'=\'" + conferenceId + "\' " + (result ? "succeed" : "failed!!!")); mActiveConference.mData.mParticipantArray = mActiveConference.mConference.getParticipants(); diff --git a/app/src/main/java/com/nynja/mobile/communicator/ui/fragments/conference/ConferenceCallFragment.java b/app/src/main/java/com/nynja/mobile/communicator/ui/fragments/conference/ConferenceCallFragment.java index 4fcb9914be..216afa43a9 100644 --- a/app/src/main/java/com/nynja/mobile/communicator/ui/fragments/conference/ConferenceCallFragment.java +++ b/app/src/main/java/com/nynja/mobile/communicator/ui/fragments/conference/ConferenceCallFragment.java @@ -630,8 +630,9 @@ public class ConferenceCallFragment extends BaseFragment implements CallView, } @Override - public void setConferenceInfo(String conferenceName) { - name.setText(conferenceName); + public void setConferenceInfo(final String conferenceName) { + if (getActivity() == null || !isAdded()) return; + getActivity().runOnUiThread(() -> name.setText(conferenceName)); } protected void waitingConference(ActiveConferenceCall activeConferenceCall) { -- GitLab