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 messages = SmsManager.getDefault().divideMessage(message.getBody()); + SmsManager smsManager = getSmsManagerFor(message.getSubscriptionId()); + ArrayList messages = smsManager.divideMessage(message.getBody()); ArrayList sentIntents = constructSentIntents(message.getId(), message.getType(), messages); ArrayList 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