TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-03 09:17:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE for SMS pdus that could potentially be null

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-07-21 16:11:55 -07:00
parent 72afb33c1b
commit 5be246ec8f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java
View File

@ -1,6 +1,8 @@
package org.thoughtcrime.securesms.jobs; package org.thoughtcrime.securesms.jobs;
import android.content.Context; import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.telephony.SmsMessage; import android.telephony.SmsMessage;
import android.util.Log; import android.util.Log;
@ -27,10 +29,10 @@ public class SmsReceiveJob extends ContextJob {
private static final String TAG = SmsReceiveJob.class.getSimpleName(); private static final String TAG = SmsReceiveJob.class.getSimpleName();
private final Object[] pdus; private final @Nullable Object[] pdus;
private final int subscriptionId; private final int subscriptionId;
public SmsReceiveJob(Context context, Object[] pdus, int subscriptionId) { public SmsReceiveJob(@NonNull Context context, @Nullable Object[] pdus, int subscriptionId) {
super(context, JobParameters.newBuilder() super(context, JobParameters.newBuilder()
.withPersistence() .withPersistence()
.withWakeLock(true) .withWakeLock(true)
@ -104,7 +106,11 @@ public class SmsReceiveJob extends ContextJob {
} }
} }
private Optional<IncomingTextMessage> assembleMessageFragments(Object[] pdus, int subscriptionId) { private Optional<IncomingTextMessage> assembleMessageFragments(@Nullable Object[] pdus, int subscriptionId) {
if (pdus == null) {
return Optional.absent();
}
List<IncomingTextMessage> messages = new LinkedList<>(); List<IncomingTextMessage> messages = new LinkedList<>();
for (Object pdu : pdus) { for (Object pdu : pdus) {