From d90e3dc210e143761335d89e59859931af7ed7b0 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 16 Mar 2020 10:41:43 -0400
Subject: [PATCH] Fix crash when syncing empty usernames.

---
 .../org/thoughtcrime/securesms/database/RecipientDatabase.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
index 37d12d2243..eae2a07616 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
@@ -598,13 +598,14 @@ public class RecipientDatabase extends Database {
     }
 
     ProfileName profileName = ProfileName.fromParts(contact.getGivenName().orNull(), contact.getFamilyName().orNull());
+    String      username    = contact.getUsername().orNull();
 
     values.put(PHONE, contact.getAddress().getNumber().orNull());
     values.put(PROFILE_GIVEN_NAME, profileName.getGivenName());
     values.put(PROFILE_FAMILY_NAME, profileName.getFamilyName());
     values.put(PROFILE_JOINED_NAME, profileName.toString());
     values.put(PROFILE_KEY, contact.getProfileKey().transform(Base64::encodeBytes).orNull());
-    values.put(USERNAME, contact.getUsername().orNull());
+    values.put(USERNAME, TextUtils.isEmpty(username) ? null : username);
     values.put(PROFILE_SHARING, contact.isProfileSharingEnabled() ? "1" : "0");
     values.put(BLOCKED, contact.isBlocked() ? "1" : "0");
     values.put(STORAGE_SERVICE_KEY, Base64.encodeBytes(contact.getKey()));