blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Temporary fix until jake fixes this shit 

// FREEBIE
master
Moxie Marlinspike 2015-03-07 09:02:10 -08:00
parent 49ab1e7bd5
commit da75268545
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@ -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);
}
}
}