From d5a466851afc3fdc3d1e701502cdd65b3afc40ea Mon Sep 17 00:00:00 2001
From: Victor Ding <14084856+0dvictor@users.noreply.github.com>
Date: Fri, 25 Mar 2022 13:39:10 +0000
Subject: [PATCH] Use the same SmsManager to divide and send a message.

---
 .../org/thoughtcrime/securesms/jobs/SmsSendJob.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java
index 58b76f9c11..d30c3da27a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java
@@ -143,7 +143,8 @@ public class SmsSendJob extends SendJob {
       throw new UndeliverableMessageException("Not a valid SMS destination! " + recipient);
     }
 
-    ArrayList<String> messages                = SmsManager.getDefault().divideMessage(message.getBody());
+    SmsManager               smsManager       = getSmsManagerFor(message.getSubscriptionId());
+    ArrayList<String>        messages         = smsManager.divideMessage(message.getBody());
     ArrayList<PendingIntent> sentIntents      = constructSentIntents(message.getId(), message.getType(), messages);
     ArrayList<PendingIntent> deliveredIntents = constructDeliveredIntents(message.getId(), message.getType(), messages);
 
@@ -152,7 +153,7 @@ public class SmsSendJob extends SendJob {
     // catching it and marking the message as a failure.  That way at least it doesn't
     // repeatedly crash every time you start the app.
     try {
-      getSmsManagerFor(message.getSubscriptionId()).sendMultipartTextMessage(recipient, null, messages, sentIntents, deliveredIntents);
+      smsManager.sendMultipartTextMessage(recipient, null, messages, sentIntents, deliveredIntents);
     } catch (NullPointerException | IllegalArgumentException npe) {
       warn(TAG, npe);
       log(TAG, String.valueOf(message.getDateSent()), "Recipient: " + recipient);
@@ -160,9 +161,8 @@ public class SmsSendJob extends SendJob {
 
       try {
         for (int i=0;i<messages.size();i++) {
-          getSmsManagerFor(message.getSubscriptionId()).sendTextMessage(recipient, null, messages.get(i),
-                                                                        sentIntents.get(i),
-                                                                        deliveredIntents == null ? null : deliveredIntents.get(i));
+          smsManager.sendTextMessage(recipient, null, messages.get(i), sentIntents.get(i),
+                                     deliveredIntents == null ? null : deliveredIntents.get(i));
         }
       } catch (NullPointerException | IllegalArgumentException npe2) {
         warn(TAG, npe);