From 0c6fe8bea370413691db602450a895a7eedb02b7 Mon Sep 17 00:00:00 2001
From: Lucio Maciel <lucio@signal.org>
Date: Thu, 12 Aug 2021 17:56:33 -0300
Subject: [PATCH] Fix crash when encountering SMS calculate length security
 exception.

---
 .../securesms/util/SmsCharacterCalculator.java         | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java b/app/src/main/java/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java
index 65db7dd74..d724fcf7a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java
@@ -41,6 +41,15 @@ public class SmsCharacterCalculator extends CharacterCalculator {
       messagesSpent       = 1;
       charactersSpent     = messageBody.length();
       charactersRemaining = 1000;
+    } catch (RuntimeException e) {
+      if (e.getCause() instanceof SecurityException) {
+        Log.e(TAG, "Security Exception", e);
+        messagesSpent       = 1;
+        charactersSpent     = messageBody.length();
+        charactersRemaining = 1000;
+      } else {
+        throw e;
+      }
     }
 
     int maxMessageSize;
@@ -54,4 +63,3 @@ public class SmsCharacterCalculator extends CharacterCalculator {
     return new CharacterState(messagesSpent, charactersRemaining, maxMessageSize, maxMessageSize);
   }
 }
-