Skip to content
Snippets Groups Projects
Commit 1cbc8dfb authored by Amirhossein Naghshzan's avatar Amirhossein Naghshzan
Browse files

CallPresenter: fix NullPointerException

Change-Id: I7985c7adfd40760bc0c8f8f93dca3047720f6a1f
parent 05ab58e9
No related branches found
No related tags found
No related merge requests found
......@@ -560,7 +560,7 @@ public class CallPresenter extends RootPresenter<CallView> {
}
public void toggleButtonClicked() {
if (!(mConference.isRinging() && mConference.isIncoming())) {
if (mConference != null && !(mConference.isRinging() && mConference.isIncoming())) {
hangupCall();
}
}
......
......@@ -319,7 +319,7 @@ public class ConversationPresenter extends RootPresenter<ConversationView> {
}
public void clickOnGoingPane() {
Conference conf = mConversation.getCurrentCall();
Conference conf = mConversation == null ? null : mConversation.getCurrentCall();
if (conf != null) {
getView().goToCallActivity(conf.getId());
} else {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment