diff --git a/src/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java b/src/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java index 8b61f99e98..a822641d10 100644 --- a/src/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java +++ b/src/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java @@ -17,16 +17,30 @@ package org.thoughtcrime.securesms.util; import android.telephony.SmsMessage; +import android.util.Log; public class SmsCharacterCalculator extends CharacterCalculator { + private static final String TAG = SmsCharacterCalculator.class.getSimpleName(); + @Override public CharacterState calculateCharacters(String messageBody) { + int[] length; + int messagesSpent; + int charactersSpent; + int charactersRemaining; - int[] length = SmsMessage.calculateLength(messageBody, false); - int messagesSpent = length[0]; - int charactersSpent = length[1]; - int charactersRemaining = length[2]; + try { + length = SmsMessage.calculateLength(messageBody, false); + messagesSpent = length[0]; + charactersSpent = length[1]; + charactersRemaining = length[2]; + } catch (NullPointerException e) { + Log.w(TAG, e); + messagesSpent = 1; + charactersSpent = messageBody.length(); + charactersRemaining = 1000; + } int maxMessageSize;