From 4211842f6f9d77c574d6c1a9b4543687eea32585 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 19 Feb 2019 20:17:32 +0100 Subject: [PATCH] Fix crash if arguments is null --- .../org/linphone/chat/ChatRoomsFragment.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/linphone/chat/ChatRoomsFragment.java b/app/src/main/java/org/linphone/chat/ChatRoomsFragment.java index 4bfd47d39..b8c5a8bbd 100644 --- a/app/src/main/java/org/linphone/chat/ChatRoomsFragment.java +++ b/app/src/main/java/org/linphone/chat/ChatRoomsFragment.java @@ -116,8 +116,11 @@ public class ChatRoomsFragment extends Fragment new View.OnClickListener() { @Override public void onClick(View v) { - Bundle extras = (Bundle) getArguments().clone(); - getArguments().clear(); + Bundle extras = null; + if (getArguments() != null) { + extras = (Bundle) getArguments().clone(); + getArguments().clear(); + } LinphoneActivity.instance() .goToChatCreator(null, null, null, false, extras, false, false); } @@ -127,8 +130,11 @@ public class ChatRoomsFragment extends Fragment new View.OnClickListener() { @Override public void onClick(View v) { - Bundle extras = (Bundle) getArguments().clone(); - getArguments().clear(); + Bundle extras = null; + if (getArguments() != null) { + extras = (Bundle) getArguments().clone(); + getArguments().clear(); + } LinphoneActivity.instance() .goToChatCreator(null, null, null, false, extras, true, false); } @@ -200,8 +206,11 @@ public class ChatRoomsFragment extends Fragment mChatRoomsAdapter.toggleSelection(position); } else { ChatRoom room = (ChatRoom) mChatRoomsAdapter.getItem(position); - Bundle extras = (Bundle) getArguments().clone(); - getArguments().clear(); + Bundle extras = null; + if (getArguments() != null) { + extras = (Bundle) getArguments().clone(); + getArguments().clear(); + } LinphoneActivity.instance() .goToChat( room.getLocalAddress().asStringUriOnly(),