Log out sender key state for internal users.

app/src/main/java/org/thoughtcrime/securesms/database/SenderKeyDatabase.java

@@ -10,11 +10,13 @@ import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
+import org.thoughtcrime.securesms.recipients.Recipient;
 import org.whispersystems.libsignal.SignalProtocolAddress;
 import org.whispersystems.signalservice.api.push.DistributionId;
 import org.thoughtcrime.securesms.util.CursorUtil;
 import org.thoughtcrime.securesms.util.SqlUtil;
 import org.whispersystems.libsignal.groups.state.SenderKeyRecord;
+import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 import java.io.IOException;
 
@@ -110,6 +112,17 @@ public class SenderKeyDatabase extends Database {
     db.delete(TABLE_NAME, query, args);
   }
 
+  /**
+   * Get metadata for all sender keys created by the local user. Used for debugging.
+   */
+  public Cursor getAllCreatedBySelf() {
+    SQLiteDatabase db    = databaseHelper.getSignalReadableDatabase();
+    String         query = ADDRESS + " = ?";
+    String[]       args  = SqlUtil.buildArgs(Recipient.self().requireAci());
+
+    return db.query(TABLE_NAME, new String[]{ ID, DISTRIBUTION_ID, CREATED_AT }, query, args, null, null, CREATED_AT + " DESC");
+  }
+
   /**
    * Deletes all database state.
    */

app/src/main/java/org/thoughtcrime/securesms/database/SenderKeySharedDatabase.java

@@ -157,4 +157,12 @@ public class SenderKeySharedDatabase extends Database {
     SQLiteDatabase db = databaseHelper.getSignalWritableDatabase();
     db.delete(TABLE_NAME, null, null);
   }
+
+  /**
+   * Gets the shared state of all of our sender keys. Used for debugging.
+   */
+  public Cursor getAllSharedWithCursor() {
+    SQLiteDatabase db = databaseHelper.getSignalReadableDatabase();
+    return db.query(TABLE_NAME, null, null, null, null, null, DISTRIBUTION_ID + ", " + ADDRESS + ", " + DEVICE);
+  }
 }

app/src/main/java/org/thoughtcrime/securesms/jobs/SenderKeyDistributionSendJob.java

@@ -102,7 +102,7 @@ public final class SenderKeyDistributionSendJob extends BaseJob {
     SenderKeyDistributionMessage           message        = messageSender.getOrCreateNewGroupSession(distributionId);
     List<Optional<UnidentifiedAccessPair>> access         = UnidentifiedAccessUtil.getAccessFor(context, Collections.singletonList(recipient));
 
-    SendMessageResult result = messageSender.sendSenderKeyDistributionMessage(address, access, message, groupId.getDecodedId()).get(0);
+    SendMessageResult result = messageSender.sendSenderKeyDistributionMessage(distributionId, address, access, message, groupId.getDecodedId()).get(0);
 
     if (result.isSuccess()) {
       List<SignalProtocolAddress> addresses = result.getSuccess()

app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionSenderKey.java

@@ -0,0 +1,43 @@
+package org.thoughtcrime.securesms.logsubmit;
+
+import android.content.Context;
+import android.database.Cursor;
+
+import androidx.annotation.NonNull;
+
+import org.signal.core.util.AsciiArt;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.whispersystems.libsignal.SignalProtocolAddress;
+import org.whispersystems.signalservice.api.push.DistributionId;
+
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Renders data pertaining to sender key. While all private info is obfuscated, this is still only intended to be printed for internal users.
+ */
+public class LogSectionSenderKey implements LogSection {
+
+  @Override
+  public @NonNull String getTitle() {
+    return "SENDER KEY";
+  }
+
+  @Override
+  public @NonNull CharSequence getContent(@NonNull Context context) {
+    StringBuilder builder = new StringBuilder();
+
+    builder.append("--- Sender Keys").append("\n\n");
+    try (Cursor cursor = DatabaseFactory.getSenderKeyDatabase(context).getAllCreatedBySelf()) {
+      builder.append(AsciiArt.tableFor(cursor)).append("\n\n");
+    }
+
+    builder.append("--- Sender Key Shared State").append("\n\n");
+    try (Cursor cursor = DatabaseFactory.getSenderKeySharedDatabase(context).getAllSharedWithCursor()) {
+      builder.append(AsciiArt.tableFor(cursor)).append("\n");
+    }
+
+    return builder;
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogRepository.java

@@ -26,6 +26,7 @@ import org.thoughtcrime.securesms.net.StandardUserAgentInterceptor;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
 import org.thoughtcrime.securesms.util.ByteUnit;
+import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.Stopwatch;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.libsignal.util.guava.Optional;
@@ -86,6 +87,9 @@ public class SubmitDebugLogRepository {
     add(new LogSectionTrace());
     add(new LogSectionThreads());
     add(new LogSectionBlockedThreads());
+    if (FeatureFlags.internalUser()) {
+      add(new LogSectionSenderKey());
+    }
     add(new LogSectionLogcat());
     add(new LogSectionLoggerHeader());
   }};