From 6be8df9ff8f6316aeb2238b86876aae990893562 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 13 Mar 2018 10:14:15 +0100 Subject: [PATCH] Fix crash when clicking on notification on some devices --- src/android/org/linphone/chat/ChatCreationFragment.java | 4 +++- src/android/org/linphone/chat/GroupChatFragment.java | 4 +++- src/android/org/linphone/chat/GroupInfoFragment.java | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/android/org/linphone/chat/ChatCreationFragment.java b/src/android/org/linphone/chat/ChatCreationFragment.java index a419de846..4bff4a9c0 100644 --- a/src/android/org/linphone/chat/ChatCreationFragment.java +++ b/src/android/org/linphone/chat/ChatCreationFragment.java @@ -189,7 +189,9 @@ public class ChatCreationFragment extends Fragment implements View.OnClickListen super.onResume(); InputMethodManager inputMethodManager = (InputMethodManager) getActivity().getSystemService(INPUT_METHOD_SERVICE); - inputMethodManager.hideSoftInputFromWindow(getActivity().getCurrentFocus().getWindowToken(), 0); + if (getActivity().getCurrentFocus() != null) { + inputMethodManager.hideSoftInputFromWindow(getActivity().getCurrentFocus().getWindowToken(), 0); + } } @Override diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java index df90b468d..536d8944a 100644 --- a/src/android/org/linphone/chat/GroupChatFragment.java +++ b/src/android/org/linphone/chat/GroupChatFragment.java @@ -223,7 +223,9 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con // Force hide keyboard getActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN); InputMethodManager inputMethodManager = (InputMethodManager) getActivity().getSystemService(INPUT_METHOD_SERVICE); - inputMethodManager.hideSoftInputFromWindow(getActivity().getCurrentFocus().getWindowToken(), 0); + if (getActivity().getCurrentFocus() != null) { + inputMethodManager.hideSoftInputFromWindow(getActivity().getCurrentFocus().getWindowToken(), 0); + } initChatRoom(); displayChatRoomHeader(); diff --git a/src/android/org/linphone/chat/GroupInfoFragment.java b/src/android/org/linphone/chat/GroupInfoFragment.java index 1bbf01c63..ee0ee8ed8 100644 --- a/src/android/org/linphone/chat/GroupInfoFragment.java +++ b/src/android/org/linphone/chat/GroupInfoFragment.java @@ -312,7 +312,9 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener { super.onResume(); InputMethodManager inputMethodManager = (InputMethodManager) getActivity().getSystemService(INPUT_METHOD_SERVICE); - inputMethodManager.hideSoftInputFromWindow(getActivity().getCurrentFocus().getWindowToken(), 0); + if (getActivity().getCurrentFocus() != null) { + inputMethodManager.hideSoftInputFromWindow(getActivity().getCurrentFocus().getWindowToken(), 0); + } } @Override