From da75268545c164fb19f36f445020028d005b3830 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Sat, 7 Mar 2015 09:02:10 -0800 Subject: [PATCH] Temporary fix until jake fixes this shit // FREEBIE --- .../securesms/ConversationActivity.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java index 6d5c74de4f..1f7388c086 100644 --- a/src/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationActivity.java @@ -957,14 +957,18 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity private void calculateCharactersRemaining() { int charactersSpent = composeText.getText().toString().length(); - CharacterState characterState = sendButton.getSelectedTransport().calculateCharacters(charactersSpent); + TransportOption transportOption = sendButton.getSelectedTransport(); + + if (transportOption != null) { + CharacterState characterState = transportOption.calculateCharacters(charactersSpent); - if (characterState.charactersRemaining <= 15 || characterState.messagesSpent > 1) { - charactersLeft.setText(characterState.charactersRemaining + "/" + characterState.maxMessageSize - + " (" + characterState.messagesSpent + ")"); - charactersLeft.setVisibility(View.VISIBLE); - } else { - charactersLeft.setVisibility(View.GONE); + if (characterState.charactersRemaining <= 15 || characterState.messagesSpent > 1) { + charactersLeft.setText(characterState.charactersRemaining + "/" + characterState.maxMessageSize + + " (" + characterState.messagesSpent + ")"); + charactersLeft.setVisibility(View.VISIBLE); + } else { + charactersLeft.setVisibility(View.GONE); + } } }