Fixed crash when creating a chat room without default proxy config

This commit is contained in:
Sylvain Berfini 2019-12-05 14:49:20 +01:00
parent 813504bb85
commit 807c279e88
2 changed files with 5 additions and 2 deletions

View file

@ -88,7 +88,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 29
versionCode 4210 versionCode 4211
versionName "${project.version}" versionName "${project.version}"
applicationId getPackageName() applicationId getPackageName()
multiDexEnabled true multiDexEnabled true

View file

@ -448,7 +448,10 @@ public class ChatRoomCreationFragment extends Fragment
mChatRoom.getLocalAddress(), mChatRoom.getPeerAddress()); mChatRoom.getLocalAddress(), mChatRoom.getPeerAddress());
} }
} else { } 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) { if (chatRoom != null) {
// Pop back stack so back button takes to the chat rooms list // Pop back stack so back button takes to the chat rooms list
getFragmentManager().popBackStack(); getFragmentManager().popBackStack();