From 1cbc8dfb82f0e9dc69fc62ca95f418e723a34f85 Mon Sep 17 00:00:00 2001
From: Amirhossein <amirhossein.naghshzan@savoirfairelinux.com>
Date: Fri, 14 Aug 2020 11:48:30 -0400
Subject: [PATCH] CallPresenter: fix NullPointerException
Change-Id: I7985c7adfd40760bc0c8f8f93dca3047720f6a1f
---
.../libringclient/src/main/java/cx/ring/call/CallPresenter.java | 2 +-
.../main/java/cx/ring/conversation/ConversationPresenter.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ring-android/libringclient/src/main/java/cx/ring/call/CallPresenter.java b/ring-android/libringclient/src/main/java/cx/ring/call/CallPresenter.java
index 5b7d78a9c..bbc52d5fb 100644
--- a/ring-android/libringclient/src/main/java/cx/ring/call/CallPresenter.java
+++ b/ring-android/libringclient/src/main/java/cx/ring/call/CallPresenter.java
@@ -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();
}
}
diff --git a/ring-android/libringclient/src/main/java/cx/ring/conversation/ConversationPresenter.java b/ring-android/libringclient/src/main/java/cx/ring/conversation/ConversationPresenter.java
index 512e8fa1b..8a6bd3b28 100644
--- a/ring-android/libringclient/src/main/java/cx/ring/conversation/ConversationPresenter.java
+++ b/ring-android/libringclient/src/main/java/cx/ring/conversation/ConversationPresenter.java
@@ -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 {
--
GitLab