Catch IllegalArgumentException thrown internally on some devices

// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-08-10 12:17:05 -07:00
parent c0ec531daa
commit 422b4c345b

View File

@ -104,7 +104,7 @@ public class SmsSendJob extends SendJob {
// 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); getSmsManagerFor(message.getSubscriptionId()).sendMultipartTextMessage(recipient, null, messages, sentIntents, deliveredIntents);
} catch (NullPointerException npe) { } catch (NullPointerException | IllegalArgumentException npe) {
Log.w(TAG, npe); Log.w(TAG, npe);
Log.w(TAG, "Recipient: " + recipient); Log.w(TAG, "Recipient: " + recipient);
Log.w(TAG, "Message Parts: " + messages.size()); Log.w(TAG, "Message Parts: " + messages.size());
@ -115,7 +115,7 @@ public class SmsSendJob extends SendJob {
sentIntents.get(i), sentIntents.get(i),
deliveredIntents == null ? null : deliveredIntents.get(i)); deliveredIntents == null ? null : deliveredIntents.get(i));
} }
} catch (NullPointerException npe2) { } catch (NullPointerException | IllegalArgumentException npe2) {
Log.w(TAG, npe); Log.w(TAG, npe);
throw new UndeliverableMessageException(npe2); throw new UndeliverableMessageException(npe2);
} }