empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Use the same SmsManager to divide and send a message.

Browse source
This commit is contained in:
Victor Ding 2022-03-25 13:39:10 +00:00 • committed by Cody Henthorne
parent 38836198a1
commit d5a466851a
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java
View file

@ -143,7 +143,8 @@ public class SmsSendJob extends SendJob {
throw new UndeliverableMessageException("Not a valid SMS destination! " + recipient); 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> sentIntents = constructSentIntents(message.getId(), message.getType(), messages);
ArrayList<PendingIntent> deliveredIntents = constructDeliveredIntents(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 // catching it and marking the message as a failure. That way at least it doesn't
// repeatedly crash every time you start the app. // repeatedly crash every time you start the app.
try { try {
getSmsManagerFor(message.getSubscriptionId()).sendMultipartTextMessage(recipient, null, messages, sentIntents, deliveredIntents); smsManager.sendMultipartTextMessage(recipient, null, messages, sentIntents, deliveredIntents);
} catch (NullPointerException | IllegalArgumentException npe) { } catch (NullPointerException | IllegalArgumentException npe) {
warn(TAG, npe); warn(TAG, npe);
log(TAG, String.valueOf(message.getDateSent()), "Recipient: " + recipient); log(TAG, String.valueOf(message.getDateSent()), "Recipient: " + recipient);
@ -160,9 +161,8 @@ public class SmsSendJob extends SendJob {
try { try {
for (int i=0;i<messages.size();i++) { for (int i=0;i<messages.size();i++) {
getSmsManagerFor(message.getSubscriptionId()).sendTextMessage(recipient, null, messages.get(i), smsManager.sendTextMessage(recipient, null, messages.get(i), sentIntents.get(i),
sentIntents.get(i), deliveredIntents == null ? null : deliveredIntents.get(i));
deliveredIntents == null ? null : deliveredIntents.get(i));
} }
} catch (NullPointerException | IllegalArgumentException npe2) { } catch (NullPointerException | IllegalArgumentException npe2) {
warn(TAG, npe); warn(TAG, npe);