From b9c6c6b0f4573a54415f230aeb11345b2dda840f Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 5 Aug 2021 14:21:16 -0400
Subject: [PATCH] Include additional logging to assist in debugging.

---
 .../logsubmit/LogSectionSystemInfo.java        | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java
index d482d9782..7bf702287 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSystemInfo.java
@@ -16,6 +16,8 @@ import com.google.android.gms.common.GoogleApiAvailability;
 import org.thoughtcrime.securesms.BuildConfig;
 import org.thoughtcrime.securesms.emoji.EmojiFiles;
 import org.thoughtcrime.securesms.emoji.EmojiSource;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
+import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.AppSignatureUtil;
 import org.thoughtcrime.securesms.util.ByteUnit;
 import org.thoughtcrime.securesms.util.CensorshipUtil;
@@ -31,6 +33,7 @@ import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.Locale;
 import java.util.Map;
+import java.util.UUID;
 
 public class LogSectionSystemInfo implements LogSection {
 
@@ -60,6 +63,8 @@ public class LogSectionSystemInfo implements LogSection {
     builder.append("Memclass      : ").append(getMemoryClass(context)).append("\n");
     builder.append("MemInfo       : ").append(getMemoryInfo(context)).append("\n");
     builder.append("OS Host       : ").append(Build.HOST).append("\n");
+    builder.append("RecipientId   : ").append(SignalStore.registrationValues().isRegistrationComplete() ? Recipient.self().getId() : "N/A").append("\n");
+    builder.append("UUID          : ").append(getCensoredUuid(context)).append("\n");
     builder.append("Censored      : ").append(CensorshipUtil.isCensored(context)).append("\n");
     builder.append("Play Services : ").append(getPlayServicesString(context)).append("\n");
     builder.append("FCM           : ").append(!TextSecurePreferences.isFcmDisabled(context)).append("\n");
@@ -160,4 +165,17 @@ public class LogSectionSystemInfo implements LogSection {
       return version.getVersion() + " (" + version.getDensity() + ")";
     }
   }
+
+  private static String getCensoredUuid(@NonNull Context context) {
+    UUID uuid = TextSecurePreferences.getLocalUuid(context);
+
+    if (uuid != null) {
+      String uuidString = uuid.toString();
+      String lastTwo    = uuidString.substring(uuidString.length() - 2);
+
+      return "********-****-****-****-**********" + lastTwo;
+    } else {
+      return "N/A";
+    }
+  }
 }