TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-24 21:21:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE on contact update request

Browse Source 
Fixes #6840

// FREEBIE
This commit is contained in:
Moxie Marlinspike
2017-08-01 08:57:26 -07:00
parent 45ecca69d3
commit 4229c21bdc
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
View File

@@ -57,11 +57,11 @@ public class MultiDeviceContactUpdateJob extends MasterSecretJob implements Inje
private final @Nullable String address; private final @Nullable String address;
public MultiDeviceContactUpdateJob(Context context) { public MultiDeviceContactUpdateJob(@NonNull Context context) {
this(context, null); this(context, null);
} }
public MultiDeviceContactUpdateJob(Context context, Address address) { public MultiDeviceContactUpdateJob(@NonNull Context context, @Nullable Address address) {
super(context, JobParameters.newBuilder() super(context, JobParameters.newBuilder()
.withRequirement(new NetworkRequirement(context)) .withRequirement(new NetworkRequirement(context))
.withRequirement(new MasterSecretRequirement(context)) .withRequirement(new MasterSecretRequirement(context))
@@ -69,7 +69,8 @@ public class MultiDeviceContactUpdateJob extends MasterSecretJob implements Inje
.withPersistence() .withPersistence()
.create()); .create());
this.address = address.serialize(); if (address != null) this.address = address.serialize();
else this.address = null;
} }
@Override @Override