From 807c279e8853a1b1c4c0533bd5a666d0da9a1500 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 5 Dec 2019 14:49:20 +0100 Subject: [PATCH] Fixed crash when creating a chat room without default proxy config --- app/build.gradle | 2 +- .../java/org/linphone/chat/ChatRoomCreationFragment.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index dfe04d587..9639e93ee 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -88,7 +88,7 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 29 - versionCode 4210 + versionCode 4211 versionName "${project.version}" applicationId getPackageName() multiDexEnabled true diff --git a/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java b/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java index dda1fcd84..bce06962a 100644 --- a/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java +++ b/app/src/main/java/org/linphone/chat/ChatRoomCreationFragment.java @@ -448,7 +448,10 @@ public class ChatRoomCreationFragment extends Fragment mChatRoom.getLocalAddress(), mChatRoom.getPeerAddress()); } } else { - ChatRoom chatRoom = core.getChatRoom(address, lpc.getIdentityAddress()); + ChatRoom chatRoom = null; + if (lpc != null) chatRoom = core.getChatRoom(address, lpc.getIdentityAddress()); + else chatRoom = core.getChatRoom(address); + if (chatRoom != null) { // Pop back stack so back button takes to the chat rooms list getFragmentManager().popBackStack();