From d895d19418afe0a806de0e032d629cb103387087 Mon Sep 17 00:00:00 2001
From: Angelo Fuchs <af@steamnet.de>
Date: Wed, 12 Sep 2018 13:04:12 +0200
Subject: [PATCH] minor fixes, debugging.

---
 .../securesms/recipients/Recipient.java       | 31 +++++++++++++++++++
 src/org/thoughtcrime/securesms/util/Util.java |  5 ++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/recipients/Recipient.java b/src/org/thoughtcrime/securesms/recipients/Recipient.java
index 6e1c83a80..bd7da6597 100644
--- a/src/org/thoughtcrime/securesms/recipients/Recipient.java
+++ b/src/org/thoughtcrime/securesms/recipients/Recipient.java
@@ -49,6 +49,7 @@ import org.thoughtcrime.securesms.util.ListenableFutureTask;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.libsignal.util.guava.Optional;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -629,6 +630,36 @@ public class Recipient implements RecipientModifiedListener {
       listener.onModified(this);
   }
 
+  @Override
+  public String toString() {
+    return "Recipient{" +
+        "listeners=" + listeners +
+        ", address=" + address +
+        ", participants=" + participants +
+        ", name='" + name + '\'' +
+        ", customLabel='" + customLabel + '\'' +
+        ", resolving=" + resolving +
+        ", systemContactPhoto=" + systemContactPhoto +
+        ", groupAvatarId=" + groupAvatarId +
+        ", contactUri=" + contactUri +
+        ", messageRingtone=" + messageRingtone +
+        ", callRingtone=" + callRingtone +
+        ", mutedUntil=" + mutedUntil +
+        ", blocked=" + blocked +
+        ", messageVibrate=" + messageVibrate +
+        ", callVibrate=" + callVibrate +
+        ", expireMessages=" + expireMessages +
+        ", defaultSubscriptionId=" + defaultSubscriptionId +
+        ", registered=" + registered +
+        ", color=" + color +
+        ", seenInviteReminder=" + seenInviteReminder +
+        ", profileKey=" + Arrays.toString(profileKey) +
+        ", profileName='" + profileName + '\'' +
+        ", profileAvatar='" + profileAvatar + '\'' +
+        ", profileSharing=" + profileSharing +
+        '}';
+  }
+
   @Override
   public void onModified(Recipient recipient) {
     notifyListeners();
diff --git a/src/org/thoughtcrime/securesms/util/Util.java b/src/org/thoughtcrime/securesms/util/Util.java
index a4dcc24cd..79a62f44c 100644
--- a/src/org/thoughtcrime/securesms/util/Util.java
+++ b/src/org/thoughtcrime/securesms/util/Util.java
@@ -203,8 +203,11 @@ public class Util {
   public static boolean isOwnNumber(Context context, Address address) {
     if (address.isGroup()) return false;
     if (address.isEmail()) return false;
+    if (address.isDcChat()) return false;
+    String localNumber = TextSecurePreferences.getLocalNumber(context);
+    if (TextUtils.isEmpty(localNumber)) return false;
 
-    return TextSecurePreferences.getLocalNumber(context).equals(address.toPhoneString());
+    return localNumber.equals(address.toPhoneString());
   }
 
   public static void readFully(InputStream in, byte[] buffer) throws IOException {