From 4229c21bdcc2a49d2b88219d06d5a75983e83ee9 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Tue, 1 Aug 2017 08:57:26 -0700
Subject: [PATCH] Fix NPE on contact update request

Fixes #6840

// FREEBIE
---
 .../securesms/jobs/MultiDeviceContactUpdateJob.java        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
index 252b0e6c2e..6d4dff089e 100644
--- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
@@ -57,11 +57,11 @@ public class MultiDeviceContactUpdateJob extends MasterSecretJob implements Inje
 
   private final @Nullable String address;
 
-  public MultiDeviceContactUpdateJob(Context context) {
+  public MultiDeviceContactUpdateJob(@NonNull Context context) {
     this(context, null);
   }
 
-  public MultiDeviceContactUpdateJob(Context context, Address address) {
+  public MultiDeviceContactUpdateJob(@NonNull Context context, @Nullable Address address) {
     super(context, JobParameters.newBuilder()
                                 .withRequirement(new NetworkRequirement(context))
                                 .withRequirement(new MasterSecretRequirement(context))
@@ -69,7 +69,8 @@ public class MultiDeviceContactUpdateJob extends MasterSecretJob implements Inje
                                 .withPersistence()
                                 .create());
 
-    this.address = address.serialize();
+    if (address != null) this.address = address.serialize();
+    else                 this.address = null;
   }
 
   @Override