Remove Trace annotation.

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

@@ -53,7 +53,6 @@ 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;
@@ -82,7 +81,6 @@ 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();

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

@@ -10,13 +10,11 @@ import androidx.annotation.Nullable;
 
 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";

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

@@ -28,7 +28,6 @@ import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.groups.GroupMigrationMembershipChange;
 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.SetUtil;
 import org.thoughtcrime.securesms.util.SqlUtil;
@@ -53,7 +52,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
-@Trace
 public final class GroupDatabase extends Database {
 
   private static final String TAG = Log.tag(GroupDatabase.class);

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

@@ -9,14 +9,12 @@ import androidx.annotation.NonNull;
 
 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";

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

@@ -28,7 +28,6 @@ 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;
@@ -39,7 +38,6 @@ import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
 
-@Trace
 public class IdentityDatabase extends Database {
 
   @SuppressWarnings("unused")

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

@@ -13,12 +13,10 @@ 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";

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

@@ -8,12 +8,10 @@ import androidx.annotation.NonNull;
 
 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";

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

@@ -10,12 +10,10 @@ import androidx.annotation.Nullable;
 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;

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

@@ -10,7 +10,6 @@ import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.database.model.MegaphoneRecord;
 import org.thoughtcrime.securesms.megaphone.Megaphones.Event;
-import org.thoughtcrime.securesms.tracing.Trace;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -21,7 +20,6 @@ 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);

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

@@ -13,7 +13,6 @@ import com.annimon.stream.Stream;
 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;
 
@@ -23,7 +22,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-@Trace
 public class MentionDatabase extends Database {
 
   static final String TABLE_NAME = "mention";

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

@@ -72,7 +72,6 @@ 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;
@@ -96,7 +95,6 @@ import java.util.UUID;
 
 import static org.thoughtcrime.securesms.contactshare.Contact.Avatar;
 
-@Trace
 public class MmsDatabase extends MessageDatabase {
 
   private static final String TAG = MmsDatabase.class.getSimpleName();

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

@@ -32,7 +32,6 @@ import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 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.whispersystems.libsignal.util.Pair;
 
@@ -44,7 +43,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-@Trace
 public class MmsSmsDatabase extends Database {
 
   @SuppressWarnings("unused")

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

@@ -10,7 +10,6 @@ import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
-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;
@@ -19,7 +18,6 @@ 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();

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

@@ -39,7 +39,6 @@ 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;
@@ -79,7 +78,6 @@ 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();

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

@@ -9,7 +9,6 @@ import net.sqlcipher.Cursor;
 
 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,7 +19,6 @@ 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,

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

@@ -10,12 +10,10 @@ import com.annimon.stream.Stream;
 import net.sqlcipher.Cursor;
 
 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";

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

@@ -13,7 +13,6 @@ import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 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;
@@ -22,7 +21,6 @@ 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();

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

@@ -10,7 +10,6 @@ import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
-import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.Base64;
 import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.libsignal.ecc.Curve;
@@ -23,7 +22,6 @@ 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();

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

@@ -53,7 +53,6 @@ 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.CursorUtil;
 import org.thoughtcrime.securesms.util.JsonUtils;
@@ -80,7 +79,6 @@ import java.util.UUID;
  *
  * @author Moxie Marlinspike
  */
-@Trace
 public class SmsDatabase extends MessageDatabase {
 
   private static final String TAG = SmsDatabase.class.getSimpleName();

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

@@ -22,7 +22,6 @@ import org.thoughtcrime.securesms.database.model.StickerRecord;
 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;
 
@@ -35,7 +34,6 @@ 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);

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

@@ -8,7 +8,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 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;
@@ -22,7 +21,6 @@ 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";

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

@@ -50,7 +50,6 @@ 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.ConversationUtil;
 import org.thoughtcrime.securesms.util.CursorUtil;
 import org.thoughtcrime.securesms.util.JsonUtils;
@@ -76,7 +75,6 @@ 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();