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

Fix crash during JobMigration.

Browse source
This commit is contained in:
Greyson Parrelli 2019-09-25 08:49:32 -04:00
parent 6d339cd023
commit a21c537428
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/jobmanager/migrations/RecipientIdJobMigration.java
View file

@ -48,7 +48,7 @@ public class RecipientIdJobMigration extends JobMigration {
private @NonNull JobData migrateMultiDeviceContactUpdateJob(@NonNull JobData jobData) {
String address = jobData.getData().getString("address");
Data updatedData = new Data.Builder().putString("recipient", Recipient.external(application, address).getId().serialize())
Data updatedData = new Data.Builder().putString("recipient", address != null ? Recipient.external(application, address).getId().serialize() : null)
.putBoolean("force_sync", jobData.getData().getBoolean("force_sync"))
.build();

3
src/org/thoughtcrime/securesms/recipients/Recipient.java
View file

@ -34,6 +34,7 @@ import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter;
import org.thoughtcrime.securesms.util.GroupUtil;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.libsignal.util.guava.Optional;
import org.whispersystems.libsignal.util.guava.Preconditions;
import java.util.ArrayList;
import java.util.Collections;
@ -100,6 +101,8 @@ public class Recipient {
*/
@WorkerThread
public static @NonNull Recipient external(@NonNull Context context, @NonNull String address) {
Preconditions.checkNotNull(address, "Address cannot be null.");
RecipientDatabase db = DatabaseFactory.getRecipientDatabase(context);
RecipientId id = null;