From d73143a9c1e003c13c5fd2fea94795abb6e51d53 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Wed, 26 Apr 2017 20:13:33 +0200 Subject: make sure context is not null before setting content description on send button --- src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main') diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index c218a940e..3b5e4b212 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -937,10 +937,10 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa updateChatState(this.conversation, msg); } this.conversation.trim(); - this.mSendButton.setContentDescription(this.getActivity().getApplicationContext().getString(R.string.send_message_to_x, conversation.getName())); - } else { - this.mSendButton.setContentDescription(this.getActivity().getApplicationContext().getString(R.string.send_message)); + } + if (activity != null) { + this.mSendButton.setContentDescription(activity.getString(R.string.send_message_to_x, conversation.getName())); } this.conversation = conversation; -- cgit v1.2.3