From b00abf16677e2940750ec38e86a5edef29b2384a Mon Sep 17 00:00:00 2001 From: clauz9 Date: Sat, 19 Feb 2022 20:36:18 +0200 Subject: [PATCH] Fix internal-only crash when submitting a debuglog during registration. --- .../securesms/logsubmit/LogSectionSenderKey.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSenderKey.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSenderKey.java index 982b1a524..65bf4b2c7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSenderKey.java +++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSenderKey.java @@ -7,6 +7,7 @@ import androidx.annotation.NonNull; import org.signal.core.util.AsciiArt; import org.thoughtcrime.securesms.database.SignalDatabase; +import org.thoughtcrime.securesms.keyvalue.SignalStore; /** * Renders data pertaining to sender key. While all private info is obfuscated, this is still only intended to be printed for internal users. @@ -23,8 +24,12 @@ public class LogSectionSenderKey implements LogSection { StringBuilder builder = new StringBuilder(); builder.append("--- Sender Keys Created By This Device").append("\n\n"); - try (Cursor cursor = SignalDatabase.senderKeys().getAllCreatedBySelf()) { - builder.append(AsciiArt.tableFor(cursor)).append("\n\n"); + if (SignalStore.account().getAci() != null){ + try (Cursor cursor = SignalDatabase.senderKeys().getAllCreatedBySelf()) { + builder.append(AsciiArt.tableFor(cursor)).append("\n\n"); + } + } else { + builder.append("").append("\n\n"); } builder.append("--- Sender Key Shared State").append("\n\n");