From 6fe7d87ac4787cca74a6d47a461dedf046fbec19 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 4 Apr 2019 14:23:54 +0200 Subject: [PATCH] Fix a crash that can happen sometimes --- .../org/linphone/chat/ChatMessagesFragment.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java index 328d939ee..bfb552e73 100644 --- a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java +++ b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java @@ -952,12 +952,16 @@ public class ChatMessagesFragment extends Fragment /** File transfer related */ @Override public void onSaveInstanceState(Bundle outState) { - String files[] = new String[mFilesUploadLayout.getChildCount()]; - for (int i = 0; i < mFilesUploadLayout.getChildCount(); i++) { - View child = mFilesUploadLayout.getChildAt(i); - String path = (String) child.getTag(); - files[i] = path; + if (mFilesUploadLayout != null) { + String files[] = new String[mFilesUploadLayout.getChildCount()]; + for (int i = 0; i < mFilesUploadLayout.getChildCount(); i++) { + View child = mFilesUploadLayout.getChildAt(i); + String path = (String) child.getTag(); + files[i] = path; + } + outState.putStringArray("Files", files); } + if (mCurrentInputContentInfo != null) { outState.putParcelable( INPUT_CONTENT_INFO_KEY, (Parcelable) mCurrentInputContentInfo.unwrap()); @@ -965,7 +969,6 @@ public class ChatMessagesFragment extends Fragment } mCurrentInputContentInfo = null; mCurrentFlags = 0; - outState.putStringArray("Files", files); super.onSaveInstanceState(outState); }