Add the ability to trace methods in internal builds.

Currently only for internal builds. Use the @Trace annotation to trace methods for viewing in Perfetto.
2026-04-22 18:00:02 +01:00 · 2020-11-10 12:40:50 -05:00
parent c3b5323010
commit 0b77b33902
52 changed files with 720 additions and 4 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -71,6 +71,7 @@ import org.thoughtcrime.securesms.service.RotateSignedPreKeyListener;
 import org.thoughtcrime.securesms.service.UpdateApkRefreshListener;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
 import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
@@ -93,6 +94,7 @@ import java.util.concurrent.TimeUnit;
 *
 * @author Moxie Marlinspike
 */
+@Trace
 public class ApplicationContext extends MultiDexApplication implements DefaultLifecycleObserver {

  private static final String TAG = ApplicationContext.class.getSimpleName();
--- a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.java
@@ -6,10 +6,12 @@ import android.os.Bundle;

 import androidx.annotation.NonNull;

+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.CommunicationActions;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;

+@Trace
 public class MainActivity extends PassphraseRequiredActivity {

  private final DynamicTheme  dynamicTheme = new DynamicNoActionBarTheme();
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java
@@ -43,6 +43,7 @@ import org.thoughtcrime.securesms.storage.StorageSyncHelper;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.sms.IncomingJoinedMessage;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.ProfileUtil;
 import org.thoughtcrime.securesms.util.SetUtil;
 import org.thoughtcrime.securesms.util.Stopwatch;
@@ -72,6 +73,7 @@ import java.util.concurrent.TimeoutException;
 /**
 * Manages all the stuff around determining if a user is registered or not.
 */
+@Trace
 public class DirectoryHelper {

  private static final String TAG = Log.tag(DirectoryHelper.class);
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -234,6 +234,7 @@ import org.thoughtcrime.securesms.stickers.StickerLocator;
 import org.thoughtcrime.securesms.stickers.StickerManagementActivity;
 import org.thoughtcrime.securesms.stickers.StickerPackInstallEvent;
 import org.thoughtcrime.securesms.stickers.StickerSearchRepository;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.AsynchronousCallback;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.BitmapUtil;
@@ -290,6 +291,7 @@ import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK;
 * @author Moxie Marlinspike
 *
 */
+@Trace
@SuppressLint("StaticFieldLeak")
 public class ConversationActivity extends PassphraseRequiredActivity
    implements ConversationFragment.ConversationFragmentListener,
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationDataSource.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationDataSource.java
@@ -17,6 +17,7 @@ import org.thoughtcrime.securesms.database.MmsSmsDatabase;
 import org.thoughtcrime.securesms.database.model.Mention;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.util.paging.Invalidator;
 import org.thoughtcrime.securesms.util.paging.SizeFixResult;
@@ -32,6 +33,7 @@ import java.util.concurrent.Executor;
 /**
 * Core data source for loading an individual conversation.
 */
+@Trace
 class ConversationDataSource extends PositionalDataSource<ConversationMessage> {

  private static final String TAG = Log.tag(ConversationDataSource.class);
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -119,6 +119,7 @@ import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
 import org.thoughtcrime.securesms.stickers.StickerPackPreviewActivity;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.CachedInflater;
 import org.thoughtcrime.securesms.util.CommunicationActions;
 import org.thoughtcrime.securesms.util.HtmlUtil;
@@ -144,6 +145,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Set;

+@Trace
@SuppressLint("StaticFieldLeak")
 public class ConversationFragment extends LoggingFragment {
  private static final String TAG = ConversationFragment.class.getSimpleName();
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java
@@ -37,11 +37,13 @@ import com.google.android.material.snackbar.Snackbar;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.registration.PulsingFloatingActionButton;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.task.SnackbarAsyncTask;

 import java.util.Set;


+@Trace
 public class ConversationListArchiveFragment extends ConversationListFragment implements ActionMode.Callback
 {
  private RecyclerView                list;
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListDataSource.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListDataSource.java
@@ -20,6 +20,7 @@ import org.thoughtcrime.securesms.database.model.ThreadRecord;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.ThrottledDebouncer;
 import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.util.paging.Invalidator;
@@ -30,6 +31,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.Executor;

+@Trace
 abstract class ConversationListDataSource extends PositionalDataSource<Conversation> {

  public static final Executor EXECUTOR = SignalExecutors.newFixedLifoThreadExecutor("signal-conversation-list", 1, 1);
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -116,6 +116,7 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.AvatarUtil;
 import org.thoughtcrime.securesms.util.PlayStoreUtil;
 import org.thoughtcrime.securesms.util.ServiceUtil;
@@ -140,6 +141,7 @@ import java.util.Set;
 import static android.app.Activity.RESULT_OK;


+@Trace
 public class ConversationListFragment extends MainFragment implements ActionMode.Callback,
                                                                      ConversationListAdapter.OnConversationClickListener,
                                                                      ConversationListSearchAdapter.EventListener,
--- a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java
@@ -54,6 +54,7 @@ import org.thoughtcrime.securesms.mms.MediaStream;
 import org.thoughtcrime.securesms.mms.MmsException;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.CursorUtil;
 import org.thoughtcrime.securesms.util.FileUtils;
@@ -83,6 +84,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;

+@Trace
 public class AttachmentDatabase extends Database {
  
  private static final String TAG = AttachmentDatabase.class.getSimpleName();
--- a/app/src/main/java/org/thoughtcrime/securesms/database/DraftDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/DraftDatabase.java
@@ -12,11 +12,13 @@ import net.sqlcipher.database.SQLiteDatabase;

 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
+import org.thoughtcrime.securesms.tracing.Trace;

 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;

+@Trace
 public class DraftDatabase extends Database {

          static final String TABLE_NAME  = "drafts";
--- a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java
@@ -27,6 +27,7 @@ import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.CursorUtil;
 import org.thoughtcrime.securesms.util.SqlUtil;
 import org.whispersystems.libsignal.util.guava.Optional;
@@ -46,6 +47,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.UUID;

+@Trace
 public final class GroupDatabase extends Database {

  private static final String TAG = Log.tag(GroupDatabase.class);
--- a/app/src/main/java/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java
@@ -11,12 +11,14 @@ import net.sqlcipher.database.SQLiteDatabase;

 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.whispersystems.libsignal.util.Pair;

 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;

+@Trace
 public class GroupReceiptDatabase extends Database {

  public  static final String TABLE_NAME = "group_receipts";
--- a/app/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java
@@ -30,6 +30,7 @@ import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.database.identity.IdentityRecordList;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.IdentityUtil;
 import org.whispersystems.libsignal.IdentityKey;
@@ -40,6 +41,7 @@ import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;

+@Trace
 public class IdentityDatabase extends Database {

  @SuppressWarnings("unused")
--- a/app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/JobDatabase.java
@@ -14,10 +14,12 @@ import org.thoughtcrime.securesms.jobmanager.persistence.ConstraintSpec;
 import org.thoughtcrime.securesms.jobmanager.persistence.DependencySpec;
 import org.thoughtcrime.securesms.jobmanager.persistence.FullSpec;
 import org.thoughtcrime.securesms.jobmanager.persistence.JobSpec;
+import org.thoughtcrime.securesms.tracing.Trace;

 import java.util.LinkedList;
 import java.util.List;

+@Trace
 public class JobDatabase extends Database {

  public static String JOBS_TABLE_NAME         = "job_spec";
--- a/app/src/main/java/org/thoughtcrime/securesms/database/KeyValueDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/KeyValueDatabase.java
@@ -10,10 +10,12 @@ import net.sqlcipher.database.SQLiteDatabase;

 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.keyvalue.KeyValueDataSet;
+import org.thoughtcrime.securesms.tracing.Trace;

 import java.util.Collection;
 import java.util.Map;

+@Trace
 public class KeyValueDatabase extends Database {

  public static final String TABLE_NAME = "key_value";
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MediaDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MediaDatabase.java
@@ -12,10 +12,12 @@ import net.sqlcipher.database.SQLiteDatabase;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.MediaUtil;

 import java.util.List;

+@Trace
 public class MediaDatabase extends Database {

    public  static final int    ALL_THREADS         = -1;
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MegaphoneDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MegaphoneDatabase.java
@@ -12,6 +12,7 @@ import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.database.model.MegaphoneRecord;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.megaphone.Megaphones.Event;
+import org.thoughtcrime.securesms.tracing.Trace;

 import java.util.ArrayList;
 import java.util.Collection;
@@ -22,6 +23,7 @@ import java.util.Set;
 /**
 * IMPORTANT: Writes should only be made through {@link org.thoughtcrime.securesms.megaphone.MegaphoneRepository}.
 */
+@Trace
 public class MegaphoneDatabase extends Database {

  private static final String TAG = Log.tag(MegaphoneDatabase.class);
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MentionDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MentionDatabase.java
@@ -15,6 +15,7 @@ import net.sqlcipher.database.SQLiteDatabase;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.database.model.Mention;
 import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.CursorUtil;
 import org.thoughtcrime.securesms.util.SqlUtil;

@@ -24,6 +25,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;

+@Trace
 public class MentionDatabase extends Database {

  static final String TABLE_NAME = "mention";
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
@@ -72,6 +72,7 @@ import org.thoughtcrime.securesms.revealable.ViewOnceExpirationInfo;
 import org.thoughtcrime.securesms.revealable.ViewOnceUtil;
 import org.thoughtcrime.securesms.sms.IncomingTextMessage;
 import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.CursorUtil;
 import org.thoughtcrime.securesms.util.JsonUtils;
 import org.thoughtcrime.securesms.util.SqlUtil;
@@ -94,6 +95,7 @@ import java.util.Set;

 import static org.thoughtcrime.securesms.contactshare.Contact.Avatar;

+@Trace
 public class MmsDatabase extends MessageDatabase {

  private static final String TAG = MmsDatabase.class.getSimpleName();
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
@@ -33,6 +33,7 @@ import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.whispersystems.libsignal.util.Pair;

 import java.io.Closeable;
@@ -41,6 +42,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

+@Trace
 public class MmsSmsDatabase extends Database {

  @SuppressWarnings("unused")
--- a/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java
@@ -10,6 +10,7 @@ import net.sqlcipher.database.SQLiteDatabase;

 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.Base64;
 import org.whispersystems.libsignal.util.guava.Optional;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
@@ -18,6 +19,7 @@ import org.whispersystems.signalservice.internal.util.Util;

 import java.io.IOException;

+@Trace
 public class PushDatabase extends Database {

  private static final String TAG = PushDatabase.class.getSimpleName();
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
@@ -41,6 +41,7 @@ import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper.RecordUpdate;
 import org.thoughtcrime.securesms.storage.StorageSyncModels;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.Bitmask;
 import org.thoughtcrime.securesms.util.CursorUtil;
@@ -80,6 +81,7 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;

+@Trace
 public class RecipientDatabase extends Database {

  private static final String TAG = RecipientDatabase.class.getSimpleName();
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RemappedRecordsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RemappedRecordsDatabase.java
@@ -10,6 +10,7 @@ import net.sqlcipher.database.SQLiteDatabase;

 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.CursorUtil;

 import java.util.HashMap;
@@ -20,6 +21,7 @@ import java.util.Map;
 /**
 * The backing datastore for {@link RemappedRecords}. See that class for more details.
 */
+@Trace
 public class RemappedRecordsDatabase extends Database {

  public static final String[] CREATE_TABLE = { Recipients.CREATE_TABLE,
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SearchDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SearchDatabase.java
@@ -11,10 +11,12 @@ import net.sqlcipher.Cursor;
 import net.sqlcipher.database.SQLiteDatabase;

 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
+import org.thoughtcrime.securesms.tracing.Trace;

 /**
 * Contains all databases necessary for full-text search (FTS).
 */
+@Trace
 public class SearchDatabase extends Database {

  public static final String SMS_FTS_TABLE_NAME = "sms_fts";
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SessionDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SessionDatabase.java
@@ -12,6 +12,7 @@ import net.sqlcipher.database.SQLiteDatabase;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.SqlUtil;
 import org.whispersystems.libsignal.state.SessionRecord;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
@@ -20,6 +21,7 @@ import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;

+@Trace
 public class SessionDatabase extends Database {

  private static final String TAG = SessionDatabase.class.getSimpleName();
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java
@@ -11,6 +11,7 @@ import net.sqlcipher.database.SQLiteDatabase;

 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.Base64;
 import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.libsignal.ecc.Curve;
@@ -23,6 +24,7 @@ import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;

+@Trace
 public class SignedPreKeyDatabase extends Database {

  private static final String TAG = SignedPreKeyDatabase.class.getSimpleName();
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
@@ -51,6 +51,7 @@ import org.thoughtcrime.securesms.revealable.ViewOnceExpirationInfo;
 import org.thoughtcrime.securesms.sms.IncomingGroupUpdateMessage;
 import org.thoughtcrime.securesms.sms.IncomingTextMessage;
 import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.JsonUtils;
 import org.thoughtcrime.securesms.util.SqlUtil;
@@ -74,6 +75,7 @@ import java.util.Set;
 *
 * @author Moxie Marlinspike
 */
+@Trace
 public class SmsDatabase extends MessageDatabase {

  private static final String TAG = SmsDatabase.class.getSimpleName();
--- a/app/src/main/java/org/thoughtcrime/securesms/database/StickerDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/StickerDatabase.java
@@ -23,6 +23,7 @@ import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
 import org.thoughtcrime.securesms.stickers.BlessedPacks;
 import org.thoughtcrime.securesms.stickers.StickerPackInstallEvent;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.CursorUtil;
 import org.thoughtcrime.securesms.util.SqlUtil;
 import org.thoughtcrime.securesms.util.Util;
@@ -36,6 +37,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

+@Trace
 public class StickerDatabase extends Database {

  private static final String TAG = Log.tag(StickerDatabase.class);
--- a/app/src/main/java/org/thoughtcrime/securesms/database/StorageKeyDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/StorageKeyDatabase.java
@@ -10,6 +10,7 @@ import androidx.annotation.Nullable;
 import net.sqlcipher.database.SQLiteDatabase;

 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.Base64;
 import org.whispersystems.signalservice.api.storage.SignalStorageRecord;
 import org.whispersystems.signalservice.api.storage.StorageId;
@@ -23,6 +24,7 @@ import java.util.List;
 * A list of storage keys whose types we do not currently have syncing logic for. We need to
 * remember that these keys exist so that we don't blast any data away.
 */
+@Trace
 public class StorageKeyDatabase extends Database {

  private static final String TABLE_NAME = "storage_key";
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -52,6 +52,7 @@ import org.thoughtcrime.securesms.recipients.RecipientDetails;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.recipients.RecipientUtil;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.CursorUtil;
 import org.thoughtcrime.securesms.util.JsonUtils;
 import org.thoughtcrime.securesms.util.SqlUtil;
@@ -76,6 +77,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Set;

+@Trace
 public class ThreadDatabase extends Database {

  private static final String TAG = ThreadDatabase.class.getSimpleName();
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java
@@ -36,6 +36,7 @@ import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.transport.RetryLaterException;
 import org.thoughtcrime.securesms.util.GroupUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -51,6 +52,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

+@Trace
 public final class PushDecryptMessageJob extends BaseJob {

  public static final String KEY   = "PushDecryptJob";
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
@@ -38,6 +38,7 @@ import org.thoughtcrime.securesms.mms.OutgoingMediaMessage;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.recipients.RecipientUtil;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.transport.RetryLaterException;
 import org.thoughtcrime.securesms.transport.UndeliverableMessageException;
 import org.thoughtcrime.securesms.util.FeatureFlags;
@@ -69,6 +70,7 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;

+@Trace
 public final class PushGroupSendJob extends PushSendJob {

  public static final String KEY = "PushGroupSendJob";
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
@@ -26,6 +26,7 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.recipients.RecipientUtil;
 import org.thoughtcrime.securesms.service.ExpiringMessageManager;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.transport.InsecureFallbackApprovalException;
 import org.thoughtcrime.securesms.transport.RetryLaterException;
 import org.thoughtcrime.securesms.transport.UndeliverableMessageException;
@@ -48,6 +49,7 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Set;

+@Trace
 public class PushMediaSendJob extends PushSendJob {

  public static final String KEY = "PushMediaSendJob";
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java
@@ -81,6 +81,7 @@ import org.thoughtcrime.securesms.sms.OutgoingEndSessionMessage;
 import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.GroupUtil;
 import org.thoughtcrime.securesms.util.Hex;
@@ -133,6 +134,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;

+@Trace
 public final class PushProcessMessageJob extends BaseJob {

  public static final String KEY          = "PushProcessJob";
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
@@ -18,6 +18,7 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.recipients.RecipientUtil;
 import org.thoughtcrime.securesms.service.ExpiringMessageManager;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.transport.InsecureFallbackApprovalException;
 import org.thoughtcrime.securesms.transport.RetryLaterException;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -33,6 +34,7 @@ import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserExce

 import java.io.IOException;

+@Trace
 public class PushTextSendJob extends PushSendJob {

  public static final String KEY = "PushTextSendJob";
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
@@ -29,6 +29,7 @@ import org.thoughtcrime.securesms.profiles.ProfileName;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.recipients.RecipientUtil;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.transport.RetryLaterException;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.IdentityUtil;
@@ -66,6 +67,7 @@ import java.util.concurrent.TimeoutException;
 /**
 * Retrieves a users profile and sets the appropriate local fields.
 */
+@Trace
 public class RetrieveProfileJob extends BaseJob {

  public static final String KEY = "RetrieveProfileJob";
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java
@@ -25,6 +25,7 @@ import org.thoughtcrime.securesms.storage.StorageSyncHelper.MergeResult;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper.WriteOperationResult;
 import org.thoughtcrime.securesms.storage.StorageSyncModels;
 import org.thoughtcrime.securesms.storage.StorageSyncValidations;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.transport.RetryLaterException;
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -56,6 +57,7 @@ import java.util.concurrent.TimeUnit;
 * This should be performed whenever a change is made locally, or whenever we want to retrieve
 * changes that have been made remotely.
 */
+@Trace
 public class StorageSyncJob extends BaseJob {

  public static final String KEY       = "StorageSyncJob";
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionTrace.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionTrace.java
@@ -0,0 +1,38 @@
+package org.thoughtcrime.securesms.logsubmit;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import org.thoughtcrime.securesms.tracing.Tracer;
+import org.thoughtcrime.securesms.util.Base64;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.zip.GZIPOutputStream;
+
+public class LogSectionTrace implements LogSection {
+
+  @Override
+  public @NonNull String getTitle() {
+    return "TRACE";
+  }
+
+  @Override
+  public @NonNull CharSequence getContent(@NonNull Context context) {
+    try (ByteArrayOutputStream outputStream     = new ByteArrayOutputStream();
+         GZIPOutputStream      compressedStream = new GZIPOutputStream(outputStream))
+    {
+      compressedStream.write(Tracer.getInstance().serialize());
+      compressedStream.flush();
+      compressedStream.close();
+
+      outputStream.flush();
+      outputStream.close();
+
+      return Base64.encodeBytes(outputStream.toByteArray());
+    } catch (IOException e) {
+      return "";
+    }
+  }
+}
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogAdapter.java
@@ -23,6 +23,8 @@ import java.util.concurrent.CopyOnWriteArrayList;

 public class SubmitDebugLogAdapter extends RecyclerView.Adapter<SubmitDebugLogAdapter.LineViewHolder> {

+  private static final int MAX_LINE_LENGTH = 1000;
+
  private final List<LogLine> lines;
  private final ScrollManager scrollManager;
  private final Listener      listener;
@@ -68,6 +70,7 @@ public class SubmitDebugLogAdapter extends RecyclerView.Adapter<SubmitDebugLogAd
    this.lines.addAll(lines);

    this.longestLine = Stream.of(lines).reduce(0, (currentMax, line) -> Math.max(currentMax, line.getText().length()));
+    this.longestLine = Math.min(longestLine, MAX_LINE_LENGTH);

    notifyDataSetChanged();
  }
@@ -122,7 +125,9 @@ public class SubmitDebugLogAdapter extends RecyclerView.Adapter<SubmitDebugLogAd
    void bind(@NonNull LogLine line, int longestLine, boolean editing, @NonNull ScrollManager scrollManager, @NonNull Listener listener) {
      Context context = itemView.getContext();

-      if (line.getText().length() < longestLine) {
+      if (line.getText().length() > longestLine) {
+        text.setText(line.getText().substring(0, longestLine));
+      } else if (line.getText().length() < longestLine) {
        text.setText(padRight(line.getText(), longestLine));
      } else {
        text.setText(line.getText());
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogRepository.java
@@ -15,6 +15,7 @@ import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.logsubmit.util.Scrubber;
 import org.thoughtcrime.securesms.net.StandardUserAgentInterceptor;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
+import org.thoughtcrime.securesms.tracing.Tracer;
 import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
 import org.whispersystems.libsignal.util.guava.Optional;

@@ -60,6 +61,9 @@ public class SubmitDebugLogRepository {
    add(new LogSectionCapabilities());
    add(new LogSectionFeatureFlags());
    add(new LogSectionPermissions());
+    if (Tracer.getInstance().isEnabled()) {
+      add(new LogSectionTrace());
+    }
    add(new LogSectionThreads());
    add(new LogSectionLogcat());
    add(new LogSectionLogger());
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
@@ -389,6 +389,7 @@ public class CameraXFragment extends LoggingFragment implements CameraFragment {
    }
  }

+  @SuppressLint({"MissingPermission"})
  private void initializeFlipButton(@NonNull View flipButton, @NonNull CameraXFlashToggleView flashButton) {
    if (camera.hasCameraWithLensFacing(CameraSelector.LENS_FACING_FRONT) && camera.hasCameraWithLensFacing(CameraSelector.LENS_FACING_BACK)) {
      flipButton.setVisibility(View.VISIBLE);
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
@@ -21,6 +21,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.SetUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -52,6 +53,7 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;

+@Trace
 public final class StorageSyncHelper {

  private static final String TAG = Log.tag(StorageSyncHelper.class);
--- a/app/src/main/java/org/thoughtcrime/securesms/tracing/Trace.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/tracing/Trace.java
@@ -0,0 +1,14 @@
+package org.thoughtcrime.securesms.tracing;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.CLASS;
+
+@Target({TYPE, METHOD, CONSTRUCTOR}) @Retention(CLASS)
+public @interface Trace {
+}
+
--- a/app/src/main/java/org/thoughtcrime/securesms/tracing/Tracer.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/tracing/Tracer.java
@@ -0,0 +1,45 @@
+package org.thoughtcrime.securesms.tracing;
+
+import androidx.annotation.NonNull;
+
+/**
+ * A class to create Perfetto-compatible traces.
+ */
+public interface Tracer {
+
+  TracerImpl INSTANCE = new TracerImpl();
+
+  static @NonNull Tracer getInstance() {
+    return INSTANCE;
+  }
+
+  /**
+   * True if enabled, otherwise false.
+   */
+  boolean isEnabled();
+
+  /**
+   * Marks the start of a method call. Always follow this with a call to {@link #end(String)}.
+   */
+  void start(@NonNull String methodName);
+
+  /**
+   * Marks the start of a method call. Always follow this with a call to {@link #end(String)}.
+   *
+   * Includes the ability to pass a key-value pair that will be shown in the trace when you click
+   * on the slice.
+   */
+  void start(@NonNull String methodName, @NonNull String key, @NonNull String value);
+
+  /**
+   * Marks the end of a method call.
+   */
+  void end(@NonNull String methodName);
+
+  /**
+   * Serializes the current state of the trace to a Perfetto-compatible byte array. Note that
+   * there's no locking here, and therefore tracing will continue. We're just grabbing a best-effort
+   * snapshot.
+   */
+  @NonNull byte[] serialize();
+}