Temporary fix until jake fixes this shit

// FREEBIE
This commit is contained in:
Moxie Marlinspike 2015-03-07 09:02:10 -08:00
parent 49ab1e7bd5
commit da75268545

View File

@ -957,7 +957,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
private void calculateCharactersRemaining() { private void calculateCharactersRemaining() {
int charactersSpent = composeText.getText().toString().length(); 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) { if (characterState.charactersRemaining <= 15 || characterState.messagesSpent > 1) {
charactersLeft.setText(characterState.charactersRemaining + "/" + characterState.maxMessageSize charactersLeft.setText(characterState.charactersRemaining + "/" + characterState.maxMessageSize
@ -967,6 +970,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
charactersLeft.setVisibility(View.GONE); charactersLeft.setVisibility(View.GONE);
} }
} }
}
private boolean isExistingConversation() { private boolean isExistingConversation() {
return this.recipients != null && this.threadId != -1; return this.recipients != null && this.threadId != -1;