From cbb7f9827cc2958bb7054be7f8804926a2476603 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Thu, 12 Sep 2019 11:52:03 +1000
Subject: [PATCH] Include public key with display names

---
 .../thoughtcrime/securesms/jobs/PushDecryptJob.java  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
index 3554c88309..17527e37ad 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
@@ -292,12 +292,16 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
         }
       }
 
-      // Loki - Get the sender display name if needed
-      Optional<String> senderDisplayName = content.senderDisplayName;
-      if (senderDisplayName.isPresent()) {
-        DatabaseFactory.getLokiUserDatabase(context).setDisplayName(envelope.getSource(), senderDisplayName.get());
+      // Loki - Store the sender display name if needed
+      Optional<String> rawSenderDisplayName = content.senderDisplayName;
+      if (rawSenderDisplayName.isPresent() && rawSenderDisplayName.get().length() > 0) {
+        String senderHexEncodedPublicKey = envelope.getSource();
+        String senderDisplayName = rawSenderDisplayName + " (..." + senderHexEncodedPublicKey.substring(senderHexEncodedPublicKey.length() - 8) + ")";
+        DatabaseFactory.getLokiUserDatabase(context).setDisplayName(senderHexEncodedPublicKey, senderDisplayName);
       }
 
+      // TODO: Deleting the display name
+
       if (content.getDataMessage().isPresent()) {
         SignalServiceDataMessage message        = content.getDataMessage().get();
         boolean                  isMediaMessage = message.getAttachments().isPresent() || message.getQuote().isPresent() || message.getSharedContacts().isPresent() || message.getPreviews().isPresent() || message.getSticker().isPresent();