aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-04-26 20:13:33 +0200
committerChristian Schneppe <christian@pix-art.de>2017-04-26 20:13:33 +0200
commitd73143a9c1e003c13c5fd2fea94795abb6e51d53 (patch)
tree87ba357930a24d2b31c045cbc808b5fdcd64ef71 /src/main/java/de/pixart/messenger
parent2f1f111262b011f64cf2ff8df1cc5d37eb0a75ce (diff)
make sure context is not null before setting content description on send button
Diffstat (limited to 'src/main/java/de/pixart/messenger')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationFragment.java6
1 files changed, 3 insertions, 3 deletions
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;