Use Log.tag where appropriate.

app/src/main/java/androidx/camera/view/SignalCameraView.java

@@ -65,6 +65,8 @@ import androidx.lifecycle.LiveData;
 
 import com.google.common.util.concurrent.ListenableFuture;
 
+import org.signal.core.util.logging.Log;
+
 import java.io.File;
 import java.util.concurrent.Executor;
 
@@ -82,7 +84,7 @@ import java.util.concurrent.Executor;
 @RequiresApi(21)
 @SuppressLint("RestrictedApi")
 public final class SignalCameraView extends FrameLayout {
-  static final String TAG = SignalCameraView.class.getSimpleName();
+  static final String TAG = Log.tag(SignalCameraView.class);
 
   static final int INDEFINITE_VIDEO_DURATION = -1;
   static final int INDEFINITE_VIDEO_SIZE = -1;

app/src/main/java/org/signal/glide/apng/decode/APNGDecoder.java

@@ -32,7 +32,7 @@ import java.util.List;
  */
 public class APNGDecoder extends FrameSeqDecoder<APNGReader, APNGWriter> {
 
-    private static final String TAG = APNGDecoder.class.getSimpleName();
+    private static final String TAG = Log.tag(APNGDecoder.class);
 
     private APNGWriter apngWriter;
     private int mLoopCount;

app/src/main/java/org/signal/glide/common/FrameAnimationDrawable.java

@@ -35,7 +35,7 @@ import java.util.Set;
  * @CreateDate: 2019/3/27
  */
 public abstract class FrameAnimationDrawable<Decoder extends FrameSeqDecoder> extends Drawable implements Animatable2Compat, FrameSeqDecoder.RenderListener {
-    private static final String TAG = FrameAnimationDrawable.class.getSimpleName();
+    private static final String TAG = Log.tag(FrameAnimationDrawable.class);
     private final Paint paint = new Paint();
     private final Decoder frameSeqDecoder;
     private DrawFilter drawFilter = new PaintFlagsDrawFilter(0, Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);

app/src/main/java/org/signal/glide/common/decode/FrameSeqDecoder.java

@@ -39,7 +39,7 @@ import java.util.concurrent.locks.LockSupport;
  * @CreateDate: 2019/3/27
  */
 public abstract class FrameSeqDecoder<R extends Reader, W extends Writer> {
-    private static final String TAG = FrameSeqDecoder.class.getSimpleName();
+    private static final String TAG = Log.tag(FrameSeqDecoder.class);
     private final int taskId;
 
     private final Loader mLoader;

app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java

@@ -95,7 +95,7 @@ import java.util.concurrent.TimeUnit;
  */
 public class ApplicationContext extends MultiDexApplication implements AppForegroundObserver.Listener {
 
-  private static final String TAG = ApplicationContext.class.getSimpleName();
+  private static final String TAG = Log.tag(ApplicationContext.class);
 
   private ExpiringMessageManager expiringMessageManager;
   private ViewOnceMessageManager viewOnceMessageManager;

app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java

@@ -31,6 +31,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.preference.Preference;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.help.HelpFragment;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.preferences.AdvancedPreferenceFragment;
@@ -72,7 +73,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActivity
   public static final String LAUNCH_TO_NOTIFICATIONS_FRAGMENT = "launch.to.notifications.fragment";
 
   @SuppressWarnings("unused")
-  private static final String TAG = ApplicationPreferencesActivity.class.getSimpleName();
+  private static final String TAG = Log.tag(ApplicationPreferencesActivity.class);
 
   private static final String PREFERENCE_CATEGORY_PROFILE        = "preference_category_profile";
   private static final String PREFERENCE_CATEGORY_USERNAME       = "preference_category_username";

app/src/main/java/org/thoughtcrime/securesms/ConfirmIdentityDialog.java

@@ -11,6 +11,7 @@ import android.widget.TextView;
 
 import androidx.appcompat.app.AlertDialog;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.crypto.DatabaseSessionLock;
 import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
@@ -37,7 +38,7 @@ import java.io.IOException;
 public class ConfirmIdentityDialog extends AlertDialog {
 
   @SuppressWarnings("unused")
-  private static final String TAG = ConfirmIdentityDialog.class.getSimpleName();
+  private static final String TAG = Log.tag(ConfirmIdentityDialog.class);
 
   private OnClickListener callback;
 

app/src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java

@@ -47,7 +47,7 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActivit
                                                           ContactSelectionListFragment.OnContactSelectedListener,
                                                           ContactSelectionListFragment.ScrollCallback
 {
-  private static final String TAG = ContactSelectionActivity.class.getSimpleName();
+  private static final String TAG = Log.tag(ContactSelectionActivity.class);
 
   public static final String EXTRA_LAYOUT_RES_ID = "layout_res_id";
 

app/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java

@@ -45,7 +45,7 @@ public class DeviceActivity extends PassphraseRequiredActivity
     implements Button.OnClickListener, ScanListener, DeviceLinkFragment.LinkClickedListener
 {
 
-  private static final String TAG = DeviceActivity.class.getSimpleName();
+  private static final String TAG = Log.tag(DeviceActivity.class);
 
   private final DynamicTheme    dynamicTheme    = new DynamicTheme();
   private final DynamicLanguage dynamicLanguage = new DynamicLanguage();

app/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java

@@ -40,7 +40,7 @@ public class DeviceListFragment extends ListFragment
                ListView.OnItemClickListener, Button.OnClickListener
 {
 
-  private static final String TAG = DeviceListFragment.class.getSimpleName();
+  private static final String TAG = Log.tag(DeviceListFragment.class);
 
   private SignalServiceAccountManager accountManager;
   private Locale                      locale;

app/src/main/java/org/thoughtcrime/securesms/DeviceProvisioningActivity.java

@@ -6,10 +6,12 @@ import android.view.Window;
 
 import androidx.appcompat.app.AlertDialog;
 
+import org.signal.core.util.logging.Log;
+
 public class DeviceProvisioningActivity extends PassphraseRequiredActivity {
 
   @SuppressWarnings("unused")
-  private static final String TAG = DeviceProvisioningActivity.class.getSimpleName();
+  private static final String TAG = Log.tag(DeviceProvisioningActivity.class);
 
   @Override
   protected void onPreCreate() {

app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java

@@ -91,7 +91,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
              MediaPreviewFragment.Events
 {
 
-  private final static String TAG = MediaPreviewActivity.class.getSimpleName();
+  private final static String TAG = Log.tag(MediaPreviewActivity.class);
 
   private static final int NOT_IN_A_THREAD = -2;
 

app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java

@@ -49,7 +49,7 @@ public class NewConversationActivity extends ContactSelectionActivity
 {
 
   @SuppressWarnings("unused")
-  private static final String TAG = NewConversationActivity.class.getSimpleName();
+  private static final String TAG = Log.tag(NewConversationActivity.class);
 
   @Override
   public void onCreate(Bundle bundle, boolean ready) {

app/src/main/java/org/thoughtcrime/securesms/PassphraseActivity.java

@@ -34,7 +34,7 @@ import org.thoughtcrime.securesms.service.KeyCachingService;
  */
 public abstract class PassphraseActivity extends BaseActivity {
 
-  private static final String TAG = PassphraseActivity.class.getSimpleName();
+  private static final String TAG = Log.tag(PassphraseActivity.class);
 
   private KeyCachingService keyCachingService;
   private MasterSecret masterSecret;

app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java

@@ -35,7 +35,7 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import java.util.Locale;
 
 public abstract class PassphraseRequiredActivity extends BaseActivity implements MasterSecretListener {
-  private static final String TAG = PassphraseRequiredActivity.class.getSimpleName();
+  private static final String TAG = Log.tag(PassphraseRequiredActivity.class);
 
   public static final String LOCALE_EXTRA      = "locale_extra";
   public static final String NEXT_INTENT_EXTRA = "next_intent";

app/src/main/java/org/thoughtcrime/securesms/PushContactSelectionActivity.java

@@ -21,6 +21,7 @@ import android.os.Bundle;
 
 import com.annimon.stream.Stream;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.contacts.SelectedContact;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 
@@ -38,7 +39,7 @@ public class PushContactSelectionActivity extends ContactSelectionActivity {
   public static final String KEY_SELECTED_RECIPIENTS = "recipients";
 
   @SuppressWarnings("unused")
-  private final static String TAG = PushContactSelectionActivity.class.getSimpleName();
+  private final static String TAG = Log.tag(PushContactSelectionActivity.class);
 
   @Override
   protected void onCreate(Bundle icicle, boolean ready) {

app/src/main/java/org/thoughtcrime/securesms/SmsSendtoActivity.java

@@ -20,7 +20,7 @@ import java.net.URISyntaxException;
 
 public class SmsSendtoActivity extends Activity {
 
-  private static final String TAG = SmsSendtoActivity.class.getSimpleName();
+  private static final String TAG = Log.tag(SmsSendtoActivity.class);
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/org/thoughtcrime/securesms/TransportOptions.java

@@ -6,6 +6,7 @@ import android.content.Context;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.util.CharacterCalculator;
 import org.thoughtcrime.securesms.util.MmsCharacterCalculator;
@@ -25,7 +26,7 @@ import static org.thoughtcrime.securesms.TransportOption.Type;
 
 public class TransportOptions {
 
-  private static final String TAG = TransportOptions.class.getSimpleName();
+  private static final String TAG = Log.tag(TransportOptions.class);
 
   private final List<OnTransportChangedListener> listeners = new LinkedList<>();
   private final Context                          context;

app/src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java

@@ -20,7 +20,7 @@ import java.nio.ByteBuffer;
 @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
 public class AudioCodec {
 
-  private static final String TAG = AudioCodec.class.getSimpleName();
+  private static final String TAG = Log.tag(AudioCodec.class);
 
   private static final int    SAMPLE_RATE       = 44100;
   private static final int    SAMPLE_RATE_INDEX = 4;

app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java

@@ -23,7 +23,7 @@ import java.util.concurrent.ExecutorService;
 @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
 public class AudioRecorder {
 
-  private static final String TAG = AudioRecorder.class.getSimpleName();
+  private static final String TAG = Log.tag(AudioRecorder.class);
 
   private static final ExecutorService executor = SignalExecutors.newCachedSingleThreadExecutor("signal-AudioRecorder");
 

app/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java

@@ -18,7 +18,7 @@ public final class BackupPassphrase {
   private BackupPassphrase() {
   }
 
-  private static final String TAG = BackupPassphrase.class.getSimpleName();
+  private static final String TAG = Log.tag(BackupPassphrase.class);
 
   public static @Nullable String get(@NonNull Context context) {
     String passphrase          = TextSecurePreferences.getBackupPassphrase(context);

app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupBase.java

@@ -5,6 +5,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.greenrobot.eventbus.EventBus;
+import org.signal.core.util.logging.Log;
 import org.whispersystems.libsignal.util.ByteUtil;
 
 import java.security.MessageDigest;
@@ -13,7 +14,7 @@ import java.security.NoSuchAlgorithmException;
 public abstract class FullBackupBase {
 
   @SuppressWarnings("unused")
-  private static final String TAG = FullBackupBase.class.getSimpleName();
+  private static final String TAG = Log.tag(FullBackupBase.class);
 
   static class BackupStream {
     static @NonNull byte[] getBackupKey(@NonNull String passphrase, @Nullable byte[] salt) {

app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java

@@ -68,7 +68,7 @@ import javax.crypto.spec.SecretKeySpec;
 
 public class FullBackupExporter extends FullBackupBase {
 
-  private static final String TAG = FullBackupExporter.class.getSimpleName();
+  private static final String TAG = Log.tag(FullBackupExporter.class);
 
   private static final Set<String> BLACKLISTED_TABLES = SetUtil.newHashSet(
     SignedPreKeyDatabase.TABLE_NAME,

app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java

@@ -65,7 +65,7 @@ import javax.crypto.spec.SecretKeySpec;
 public class FullBackupImporter extends FullBackupBase {
 
   @SuppressWarnings("unused")
-  private static final String TAG = FullBackupImporter.class.getSimpleName();
+  private static final String TAG = Log.tag(FullBackupImporter.class);
 
   public static void importFile(@NonNull Context context, @NonNull AttachmentSecret attachmentSecret,
                                 @NonNull SQLiteDatabase db, @NonNull Uri uri, @NonNull String passphrase)

app/src/main/java/org/thoughtcrime/securesms/components/AlertView.java

@@ -9,11 +9,12 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 
 public class AlertView extends LinearLayout {
 
-  private static final String TAG = AlertView.class.getSimpleName();
+  private static final String TAG = Log.tag(AlertView.class);
 
   private ImageView approvalIndicator;
   private ImageView failedIndicator;

app/src/main/java/org/thoughtcrime/securesms/components/AudioView.java

@@ -29,6 +29,7 @@ import com.pnikosis.materialishprogress.ProgressWheel;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.audio.AudioWaveForm;
 import org.thoughtcrime.securesms.components.voice.VoiceNotePlaybackState;
@@ -42,7 +43,7 @@ import java.util.concurrent.TimeUnit;
 
 public final class AudioView extends FrameLayout {
 
-  private static final String TAG = AudioView.class.getSimpleName();
+  private static final String TAG = Log.tag(AudioView.class);
 
   private static final int FORWARDS =  1;
   private static final int REVERSE  = -1;

app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java

@@ -15,6 +15,7 @@ import androidx.fragment.app.FragmentActivity;
 
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.color.MaterialColor;
 import org.thoughtcrime.securesms.contacts.avatars.ContactColors;
@@ -39,7 +40,7 @@ public final class AvatarImageView extends AppCompatImageView {
   private static final int SIZE_SMALL = 2;
 
   @SuppressWarnings("unused")
-  private static final String TAG = AvatarImageView.class.getSimpleName();
+  private static final String TAG = Log.tag(AvatarImageView.class);
 
   private static final Paint LIGHT_THEME_OUTLINE_PAINT = new Paint();
   private static final Paint DARK_THEME_OUTLINE_PAINT  = new Paint();

app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java

@@ -365,7 +365,7 @@ public class ComposeText extends EmojiEditText {
 
   private static class CommitContentListener implements InputConnectionCompat.OnCommitContentListener {
 
-    private static final String TAG = CommitContentListener.class.getSimpleName();
+    private static final String TAG = Log.tag(CommitContentListener.class);
 
     private final InputPanel.MediaListener mediaListener;
 

app/src/main/java/org/thoughtcrime/securesms/components/CustomDefaultPreference.java

@@ -31,7 +31,7 @@ import java.net.URISyntaxException;
 
 public class CustomDefaultPreference extends DialogPreference {
 
-  private static final String TAG = CustomDefaultPreference.class.getSimpleName();
+  private static final String TAG = Log.tag(CustomDefaultPreference.class);
 
   private final int    inputType;
   private final String customPreference;

app/src/main/java/org/thoughtcrime/securesms/components/DeliveryStatusView.java

@@ -10,11 +10,12 @@ import android.view.animation.RotateAnimation;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 
 public class DeliveryStatusView extends FrameLayout {
 
-  private static final String TAG = DeliveryStatusView.class.getSimpleName();
+  private static final String TAG = Log.tag(DeliveryStatusView.class);
 
   private static final RotateAnimation ROTATION_ANIMATION = new RotateAnimation(0, 360f,
                                                                                 Animation.RELATIVE_TO_SELF, 0.5f,

app/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java

@@ -20,6 +20,7 @@ import com.pnikosis.materialishprogress.ProgressWheel;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.events.PartProgressEvent;
@@ -29,7 +30,7 @@ import org.thoughtcrime.securesms.util.Util;
 
 public class DocumentView extends FrameLayout {
 
-  private static final String TAG = DocumentView.class.getSimpleName();
+  private static final String TAG = Log.tag(DocumentView.class);
 
   private final @NonNull AnimatingToggle controlToggle;
   private final @NonNull ImageView       downloadButton;

app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java

@@ -10,13 +10,14 @@ import android.util.AttributeSet;
 
 import androidx.annotation.Nullable;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
 import org.thoughtcrime.securesms.recipients.Recipient;
 
 public class FromTextView extends EmojiTextView {
 
-  private static final String TAG = FromTextView.class.getSimpleName();
+  private static final String TAG = Log.tag(FromTextView.class);
 
   public FromTextView(Context context) {
     super(context);

app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java

@@ -58,7 +58,7 @@ public class InputPanel extends LinearLayout
                ConversationStickerSuggestionAdapter.EventListener
 {
 
-  private static final String TAG = InputPanel.class.getSimpleName();
+  private static final String TAG = Log.tag(InputPanel.class);
 
   private static final long QUOTE_REVEAL_DURATION_MILLIS = 150;
   private static final int  FADE_TIME                    = 150;

app/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java

@@ -43,7 +43,7 @@ import java.util.Set;
  * has been opened and what its height would be.
  */
 public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
-  private static final String TAG = KeyboardAwareLinearLayout.class.getSimpleName();
+  private static final String TAG = Log.tag(KeyboardAwareLinearLayout.class);
 
   private final Rect                          rect                       = new Rect();
   private final Set<OnKeyboardHiddenListener> hiddenListeners            = new HashSet<>();

app/src/main/java/org/thoughtcrime/securesms/components/PushRecipientsPanel.java

@@ -28,6 +28,7 @@ import androidx.annotation.NonNull;
 
 import com.annimon.stream.Stream;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.contacts.RecipientsAdapter;
 import org.thoughtcrime.securesms.contacts.RecipientsEditor;
@@ -45,7 +46,7 @@ import java.util.StringTokenizer;
  * @author Moxie Marlinspike
  */
 public class PushRecipientsPanel extends RelativeLayout implements RecipientForeverObserver {
-  private final String                         TAG = PushRecipientsPanel.class.getSimpleName();
+  private final String                         TAG = Log.tag(PushRecipientsPanel.class);
   private       RecipientsPanelChangedListener panelChangeListener;
 
   private RecipientsEditor recipientsText;

app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java

@@ -21,6 +21,7 @@ import androidx.annotation.RequiresApi;
 import com.annimon.stream.Stream;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.components.mention.MentionAnnotation;
@@ -38,7 +39,7 @@ import java.util.List;
 
 public class QuoteView extends FrameLayout implements RecipientForeverObserver {
 
-  private static final String TAG = QuoteView.class.getSimpleName();
+  private static final String TAG = Log.tag(QuoteView.class);
 
   private static final int MESSAGE_TYPE_PREVIEW  = 0;
   private static final int MESSAGE_TYPE_OUTGOING = 1;

app/src/main/java/org/thoughtcrime/securesms/components/RatingManager.java

@@ -23,7 +23,7 @@ public class RatingManager {
   private static final int DAYS_SINCE_INSTALL_THRESHOLD  = 7;
   private static final int DAYS_UNTIL_REPROMPT_THRESHOLD = 4;
 
-  private static final String TAG = RatingManager.class.getSimpleName();
+  private static final String TAG = Log.tag(RatingManager.class);
 
   public static void showRatingDialogIfNecessary(Context context) {
     if (!TextSecurePreferences.isRatingEnabled(context) || BuildConfig.PLAY_STORE_DISABLED) return;

app/src/main/java/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java

@@ -28,6 +28,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
 import com.bumptech.glide.signature.MediaStoreSignature;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter;
 import org.thoughtcrime.securesms.database.loaders.RecentPhotosLoader;
@@ -82,7 +83,7 @@ public class RecentPhotoViewRail extends FrameLayout implements LoaderManager.Lo
   private static class RecentPhotoAdapter extends CursorRecyclerViewAdapter<RecentPhotoAdapter.RecentPhotoViewHolder> {
 
     @SuppressWarnings("unused")
-    private static final String TAG = RecentPhotoAdapter.class.getSimpleName();
+    private static final String TAG = Log.tag(RecentPhotoAdapter.class);
 
     @NonNull  private final Uri baseUri;
     @Nullable private OnItemClickedListener clickedListener;

app/src/main/java/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java

@@ -15,6 +15,7 @@ import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter;
 import org.thoughtcrime.securesms.database.MediaDatabase;
@@ -61,7 +62,7 @@ public class ThreadPhotoRailView extends FrameLayout {
   private static class ThreadPhotoRailAdapter extends CursorRecyclerViewAdapter<ThreadPhotoRailAdapter.ThreadPhotoViewHolder> {
 
     @SuppressWarnings("unused")
-    private static final String TAG = ThreadPhotoRailAdapter.class.getSimpleName();
+    private static final String TAG = Log.tag(ThreadPhotoRailAdapter.class);
 
     @NonNull  private final GlideRequests glideRequests;
 

app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java

@@ -47,7 +47,7 @@ import static com.bumptech.glide.load.resource.drawable.DrawableTransitionOption
 
 public class ThumbnailView extends FrameLayout {
 
-  private static final String TAG        = ThumbnailView.class.getSimpleName();
+  private static final String TAG        = Log.tag(ThumbnailView.class);
   private static final int    WIDTH      = 0;
   private static final int    HEIGHT     = 1;
   private static final int    MIN_WIDTH  = 0;

app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusRepository.java

@@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit;
 @SuppressLint("UseSparseArrays")
 public class TypingStatusRepository {
 
-  private static final String TAG = TypingStatusRepository.class.getSimpleName();
+  private static final String TAG = Log.tag(TypingStatusRepository.class);
 
   private static final long RECIPIENT_TYPING_TIMEOUT = TimeUnit.SECONDS.toMillis(15);
 

app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java

@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.components;
 import android.annotation.SuppressLint;
 
 import org.signal.core.util.ThreadUtil;
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.jobs.TypingSendJob;
 import org.thoughtcrime.securesms.util.Util;
@@ -14,7 +15,7 @@ import java.util.concurrent.TimeUnit;
 @SuppressLint("UseSparseArrays")
 public class TypingStatusSender {
 
-  private static final String TAG = TypingStatusSender.class.getSimpleName();
+  private static final String TAG = Log.tag(TypingStatusSender.class);
 
   private static final long REFRESH_TYPING_TIMEOUT = TimeUnit.SECONDS.toMillis(10);
   private static final long PAUSE_TYPING_TIMEOUT   = TimeUnit.SECONDS.toMillis(3);

app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java

@@ -35,7 +35,7 @@ import java.io.InputStream;
 
 public class ZoomingImageView extends FrameLayout {
 
-  private static final String TAG = ZoomingImageView.class.getSimpleName();
+  private static final String TAG = Log.tag(ZoomingImageView.class);
 
   private static final int ZOOM_TRANSITION_DURATION = 300;
 

app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraUtils.java

@@ -21,7 +21,7 @@ import java.util.Locale;
 
 @SuppressWarnings("deprecation")
 public class CameraUtils {
-  private static final String TAG = CameraUtils.class.getSimpleName();
+  private static final String TAG = Log.tag(CameraUtils.class);
   /*
    * modified from: https://github.com/commonsguy/cwac-camera/blob/master/camera/src/com/commonsware/cwac/camera/CameraUtils.java
    */

app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java

@@ -51,7 +51,7 @@ import java.util.List;
 
 @SuppressWarnings("deprecation")
 public class CameraView extends ViewGroup {
-  private static final String TAG = CameraView.class.getSimpleName();
+  private static final String TAG = Log.tag(CameraView.class);
 
   private final CameraSurfaceView   surface;
   private final OnOrientationChange onOrientationChange;

app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java

@@ -10,13 +10,14 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatEditText;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiProvider.EmojiDrawable;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 
 public class EmojiEditText extends AppCompatEditText {
-  private static final String TAG = EmojiEditText.class.getSimpleName();
+  private static final String TAG = Log.tag(EmojiEditText.class);
 
   public EmojiEditText(Context context) {
     this(context, null);

app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java

@@ -10,12 +10,13 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider.EmojiEventListener;
 import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter.VariationSelectorListener;
 
 public class EmojiPageView extends FrameLayout implements VariationSelectorListener {
-  private static final String TAG = EmojiPageView.class.getSimpleName();
+  private static final String TAG = Log.tag(EmojiPageView.class);
 
   private EmojiPageModel                   model;
   private EmojiPageViewGridAdapter         adapter;

app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java

@@ -33,7 +33,7 @@ import java.util.concurrent.ExecutionException;
 
 class EmojiProvider {
 
-  private static final    String        TAG      = EmojiProvider.class.getSimpleName();
+  private static final    String        TAG      = Log.tag(EmojiProvider.class);
   private static volatile EmojiProvider instance = null;
   private static final    Paint         paint    = new Paint(Paint.FILTER_BITMAP_FLAG | Paint.ANTI_ALIAS_FLAG);
 

app/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java

@@ -24,7 +24,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 
 public class RecentEmojiPageModel implements EmojiPageModel {
-  private static final String TAG            = RecentEmojiPageModel.class.getSimpleName();
+  private static final String TAG            = Log.tag(RecentEmojiPageModel.class);
   private static final int    EMOJI_LRU_SIZE = 50;
 
   private final SharedPreferences     prefs;

app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java

@@ -23,7 +23,7 @@ import java.util.concurrent.Callable;
 
 public class EmojiPageBitmap {
 
-  private static final String TAG = EmojiPageBitmap.class.getSimpleName();
+  private static final String TAG = Log.tag(EmojiPageBitmap.class);
 
   private final Context        context;
   private final EmojiPageModel model;

app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java

@@ -22,7 +22,7 @@ import java.util.List;
 
 public class UnverifiedBannerView extends LinearLayout {
 
-  private static final String TAG = UnverifiedBannerView.class.getSimpleName();
+  private static final String TAG = Log.tag(UnverifiedBannerView.class);
 
   private View      container;
   private TextView  text;

app/src/main/java/org/thoughtcrime/securesms/components/location/SignalPlace.java

@@ -20,7 +20,7 @@ import java.io.IOException;
 public class SignalPlace {
 
   private static final String URL = "https://maps.google.com/maps";
-  private static final String TAG = SignalPlace.class.getSimpleName();
+  private static final String TAG = Log.tag(SignalPlace.class);
 
   @JsonProperty
   private CharSequence name;

app/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java

@@ -19,7 +19,7 @@ import java.io.InputStream;
 
 public class AttachmentRegionDecoder implements ImageRegionDecoder {
 
-  private static final String TAG = AttachmentRegionDecoder.class.getSimpleName();
+  private static final String TAG = Log.tag(AttachmentRegionDecoder.class);
 
   private SkiaImageRegionDecoder passthrough;
 

app/src/main/java/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java

@@ -23,7 +23,7 @@ import org.signal.core.util.logging.Log;
  */
 public class HackyViewPager extends ViewPager {
 
-  private static final String TAG = HackyViewPager.class.getSimpleName();
+  private static final String TAG = Log.tag(HackyViewPager.class);
 
   public HackyViewPager(Context context) {
     super(context);

app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java

@@ -11,6 +11,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.AvatarImageView;
 import org.thoughtcrime.securesms.components.FromTextView;
@@ -26,7 +27,7 @@ import org.whispersystems.libsignal.util.guava.Optional;
 public class ContactSelectionListItem extends LinearLayout implements RecipientForeverObserver {
 
   @SuppressWarnings("unused")
-  private static final String TAG = ContactSelectionListItem.class.getSimpleName();
+  private static final String TAG = Log.tag(ContactSelectionListItem.class);
 
   private AvatarImageView contactPhotoImage;
   private TextView        numberView;

app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java

@@ -47,7 +47,7 @@ import java.util.List;
  */
 public class ContactsCursorLoader extends AbstractContactsCursorLoader {
 
-  private static final String TAG = ContactsCursorLoader.class.getSimpleName();
+  private static final String TAG = Log.tag(ContactsCursorLoader.class);
 
   public static final class DisplayMode {
     public static final int FLAG_PUSH            = 1;

app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsDatabase.java

@@ -51,7 +51,7 @@ import java.util.Set;
  */
 public class ContactsDatabase {
 
-  private static final String TAG              = ContactsDatabase.class.getSimpleName();
+  private static final String TAG              = Log.tag(ContactsDatabase.class);
   private static final String CONTACT_MIMETYPE = "vnd.android.cursor.item/vnd.org.thoughtcrime.securesms.contact";
   private static final String CALL_MIMETYPE    = "vnd.android.cursor.item/vnd.org.thoughtcrime.securesms.call";
   private static final String SYNC             = "__TS";

app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java

@@ -15,7 +15,7 @@ import java.io.IOException;
 
 public class ContactsSyncAdapter extends AbstractThreadedSyncAdapter {
 
-  private static final String TAG = ContactsSyncAdapter.class.getSimpleName();
+  private static final String TAG = Log.tag(ContactsSyncAdapter.class);
 
   public ContactsSyncAdapter(Context context, boolean autoInitialize) {
     super(context, autoInitialize);

app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactUtil.java

@@ -38,7 +38,7 @@ import java.util.Locale;
 
 public final class ContactUtil {
 
-  private static final String TAG = ContactUtil.class.getSimpleName();
+  private static final String TAG = Log.tag(ContactUtil.class);
 
   public static long getContactIdFromUri(@NonNull Uri uri) {
     try {

app/src/main/java/org/thoughtcrime/securesms/contactshare/SharedContactRepository.java

@@ -38,7 +38,7 @@ import static org.thoughtcrime.securesms.contactshare.Contact.Avatar;
 
 public class SharedContactRepository {
 
-  private static final String TAG = SharedContactRepository.class.getSimpleName();
+  private static final String TAG = Log.tag(SharedContactRepository.class);
 
   private final Context          context;
   private final Executor         executor;

app/src/main/java/org/thoughtcrime/securesms/contactshare/VCardUtil.java

@@ -19,7 +19,7 @@ public final class VCardUtil {
 
     private VCardUtil(){}
 
-    private static final String TAG = VCardUtil.class.getSimpleName();
+    private static final String TAG = Log.tag(VCardUtil.class);
 
     public static List<Contact> parseContacts(@NonNull String vCardData) {
         List<VCard> vContacts = Ezvcard.parse(vCardData).all();

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java

@@ -324,7 +324,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
 
   private static final int SHORTCUT_ICON_SIZE = Build.VERSION.SDK_INT >= 26 ? ViewUtil.dpToPx(72) : ViewUtil.dpToPx(48 + 16 * 2);
 
-  private static final String TAG = ConversationActivity.class.getSimpleName();
+  private static final String TAG = Log.tag(ConversationActivity.class);
 
   private static final String STATE_REACT_WITH_ANY_PAGE = "STATE_REACT_WITH_ANY_PAGE";
 

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java

@@ -161,7 +161,7 @@ import java.util.Set;
 
 @SuppressLint("StaticFieldLeak")
 public class ConversationFragment extends LoggingFragment {
-  private static final String TAG = ConversationFragment.class.getSimpleName();
+  private static final String TAG = Log.tag(ConversationFragment.class);
 
   private static final int SCROLL_ANIMATION_THRESHOLD = 50;
   private static final int CODE_ADD_EDIT_CONTACT      = 77;

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java

@@ -143,7 +143,7 @@ import static org.thoughtcrime.securesms.util.ThemeUtil.isDarkTheme;
 public final class ConversationItem extends RelativeLayout implements BindableConversationItem,
     RecipientForeverObserver
 {
-  private static final String TAG = ConversationItem.class.getSimpleName();
+  private static final String TAG = Log.tag(ConversationItem.class);
 
   private static final int MAX_MEASURE_CALLS       = 3;
   private static final int MAX_BODY_DISPLAY_LENGTH = 1000;

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java

@@ -20,7 +20,7 @@ import java.util.concurrent.ExecutionException;
 
 public class ConversationPopupActivity extends ConversationActivity {
 
-  private static final String TAG = ConversationPopupActivity.class.getSimpleName();
+  private static final String TAG = Log.tag(ConversationPopupActivity.class);
 
   @Override
   protected void onPreCreate() {

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java

@@ -51,7 +51,7 @@ import java.util.concurrent.ExecutionException;
 public final class ConversationUpdateItem extends FrameLayout
                                           implements BindableConversationItem
 {
-  private static final String TAG = ConversationUpdateItem.class.getSimpleName();
+  private static final String TAG = Log.tag(ConversationUpdateItem.class);
 
   private Set<ConversationMessage> batchSelected;
 

app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeRepository.java

@@ -33,7 +33,7 @@ import java.util.List;
 
 final class SafetyNumberChangeRepository {
 
-  private static final String TAG = SafetyNumberChangeRepository.class.getSimpleName();
+  private static final String TAG = Log.tag(SafetyNumberChangeRepository.class);
 
   private final Context context;
 

app/src/main/java/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java

@@ -40,7 +40,7 @@ import javax.crypto.spec.SecretKeySpec;
 
 public class ClassicDecryptingPartInputStream {
 
-  private static final String TAG = ClassicDecryptingPartInputStream.class.getSimpleName();
+  private static final String TAG = Log.tag(ClassicDecryptingPartInputStream.class);
 
   private static final int IV_LENGTH  = 16;
   private static final int MAC_LENGTH = 20;

app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java

@@ -23,6 +23,7 @@ import android.content.SharedPreferences.Editor;
 
 import androidx.annotation.NonNull;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.backup.BackupProtos;
 import org.thoughtcrime.securesms.util.Base64;
 import org.whispersystems.libsignal.IdentityKey;
@@ -45,7 +46,7 @@ import java.util.List;
 public class IdentityKeyUtil {
 
   @SuppressWarnings("unused")
-  private static final String TAG = IdentityKeyUtil.class.getSimpleName();
+  private static final String TAG = Log.tag(IdentityKeyUtil.class);
 
   private static final String IDENTITY_PUBLIC_KEY_CIPHERTEXT_LEGACY_PREF  = "pref_identity_public_curve25519";
   private static final String IDENTITY_PRIVATE_KEY_CIPHERTEXT_LEGACY_PREF = "pref_identity_private_curve25519";

app/src/main/java/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java

@@ -19,6 +19,7 @@ import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.util.JsonUtils;
 
 import java.io.IOException;
@@ -152,7 +153,7 @@ public final class KeyStoreHelper {
   public static class SealedData {
 
     @SuppressWarnings("unused")
-    private static final String TAG = SealedData.class.getSimpleName();
+    private static final String TAG = Log.tag(SealedData.class);
 
     @JsonProperty
     @JsonSerialize(using = ByteArraySerializer.class)

app/src/main/java/org/thoughtcrime/securesms/crypto/MasterCipher.java

@@ -55,7 +55,7 @@ import javax.crypto.spec.SecretKeySpec;
 
 public class MasterCipher {
 
-  private static final String TAG = MasterCipher.class.getSimpleName();
+  private static final String TAG = Log.tag(MasterCipher.class);
 
   private final MasterSecret masterSecret;
   private final Cipher encryptingCipher;

app/src/main/java/org/thoughtcrime/securesms/crypto/PreKeyUtil.java

@@ -19,6 +19,7 @@ package org.thoughtcrime.securesms.crypto;
 
 import android.content.Context;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.crypto.storage.TextSecurePreKeyStore;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.libsignal.IdentityKeyPair;
@@ -37,7 +38,7 @@ import java.util.List;
 public class PreKeyUtil {
 
   @SuppressWarnings("unused")
-  private static final String TAG = PreKeyUtil.class.getSimpleName();
+  private static final String TAG = Log.tag(PreKeyUtil.class);
 
   private static final int BATCH_SIZE = 100;
 

app/src/main/java/org/thoughtcrime/securesms/crypto/PublicKey.java

@@ -30,7 +30,7 @@ import java.security.NoSuchAlgorithmException;
 
 public class PublicKey {
 
-  private static final String TAG = PublicKey.class.getSimpleName();
+  private static final String TAG = Log.tag(PublicKey.class);
 
   public static final int KEY_SIZE = 3 + ECPublicKey.KEY_SIZE;
 

app/src/main/java/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java

@@ -37,7 +37,7 @@ import java.util.Map;
 
 public class UnidentifiedAccessUtil {
 
-  private static final String TAG = UnidentifiedAccessUtil.class.getSimpleName();
+  private static final String TAG = Log.tag(UnidentifiedAccessUtil.class);
 
   public static CertificateValidator getCertificateValidator() {
     try {

app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java

@@ -27,7 +27,7 @@ public class TextSecureIdentityKeyStore implements IdentityKeyStore {
 
   private static final int TIMESTAMP_THRESHOLD_SECONDS = 5;
 
-  private static final String TAG = TextSecureIdentityKeyStore.class.getSimpleName();
+  private static final String TAG = Log.tag(TextSecureIdentityKeyStore.class);
   private static final Object LOCK = new Object();
 
   private final Context context;

app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java

@@ -4,6 +4,7 @@ import android.content.Context;
 
 import androidx.annotation.NonNull;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.crypto.DatabaseSessionLock;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.whispersystems.libsignal.InvalidKeyIdException;
@@ -18,7 +19,7 @@ import java.util.List;
 public class TextSecurePreKeyStore implements PreKeyStore, SignedPreKeyStore {
 
   @SuppressWarnings("unused")
-  private static final String TAG = TextSecurePreKeyStore.class.getSimpleName();
+  private static final String TAG = Log.tag(TextSecurePreKeyStore.class);
 
   @NonNull
   private final Context context;

app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java

@@ -21,7 +21,7 @@ import java.util.List;
 
 public class TextSecureSessionStore implements SignalServiceSessionStore {
 
-  private static final String TAG = TextSecureSessionStore.class.getSimpleName();
+  private static final String TAG = Log.tag(TextSecureSessionStore.class);
 
   @NonNull  private final Context context;
 

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

@@ -37,7 +37,7 @@ import java.io.IOException;
  * Database to query APN and MMSC information
  */
 public class ApnDatabase {
-  private static final String TAG = ApnDatabase.class.getSimpleName();
+  private static final String TAG = Log.tag(ApnDatabase.class);
 
   private final SQLiteDatabase db;
   private final Context        context;

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

@@ -83,7 +83,7 @@ import java.util.Set;
 
 public class AttachmentDatabase extends Database {
   
-  private static final String TAG = AttachmentDatabase.class.getSimpleName();
+  private static final String TAG = Log.tag(AttachmentDatabase.class);
 
   public  static final String TABLE_NAME             = "part";
   public  static final String ROW_ID                 = "_id";

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

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.database;
 
 import androidx.annotation.NonNull;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.LRUCache;
 
@@ -10,7 +11,7 @@ import java.util.Map;
 
 public class EarlyReceiptCache {
 
-  private static final String TAG = EarlyReceiptCache.class.getSimpleName();
+  private static final String TAG = Log.tag(EarlyReceiptCache.class);
 
   private final LRUCache<Long, Map<RecipientId, Long>> cache = new LRUCache<>(100);
   private final String name;

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

@@ -24,6 +24,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.greenrobot.eventbus.EventBus;
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.database.identity.IdentityRecordList;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -41,7 +42,7 @@ import java.util.List;
 public class IdentityDatabase extends Database {
 
   @SuppressWarnings("unused")
-  private static final String TAG = IdentityDatabase.class.getSimpleName();
+  private static final String TAG = Log.tag(IdentityDatabase.class);
 
           static final String TABLE_NAME           = "identities";
   private static final String ID                   = "_id";

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

@@ -55,7 +55,7 @@ import java.util.UUID;
 
 public abstract class MessageDatabase extends Database implements MmsSmsColumns {
 
-  private static final String TAG = MessageDatabase.class.getSimpleName();
+  private static final String TAG = Log.tag(MessageDatabase.class);
 
   public MessageDatabase(Context context, SQLCipherOpenHelper databaseHelper) {
     super(context, databaseHelper);

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

@@ -97,7 +97,7 @@ import static org.thoughtcrime.securesms.contactshare.Contact.Avatar;
 
 public class MmsDatabase extends MessageDatabase {
 
-  private static final String TAG = MmsDatabase.class.getSimpleName();
+  private static final String TAG = Log.tag(MmsDatabase.class);
 
   public  static final String TABLE_NAME         = "mms";
           static final String DATE_SENT          = "date";

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

@@ -47,7 +47,7 @@ import java.util.Set;
 public class MmsSmsDatabase extends Database {
 
   @SuppressWarnings("unused")
-  private static final String TAG = MmsSmsDatabase.class.getSimpleName();
+  private static final String TAG = Log.tag(MmsSmsDatabase.class);
 
   public static final String TRANSPORT     = "transport_type";
   public static final String MMS_TRANSPORT = "mms";

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

@@ -21,7 +21,7 @@ import java.io.IOException;
 
 public class OneTimePreKeyDatabase extends Database {
 
-  private static final String TAG = OneTimePreKeyDatabase.class.getSimpleName();
+  private static final String TAG = Log.tag(OneTimePreKeyDatabase.class);
 
   public  static final String TABLE_NAME  = "one_time_prekeys";
   private static final String ID          = "_id";

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

@@ -21,7 +21,7 @@ import java.io.IOException;
 
 public class PushDatabase extends Database {
 
-  private static final String TAG = PushDatabase.class.getSimpleName();
+  private static final String TAG = Log.tag(PushDatabase.class);
 
   private static final String TABLE_NAME                 = "push";
   public  static final String ID                         = "_id";

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

@@ -90,7 +90,7 @@ import java.util.concurrent.TimeUnit;
 
 public class RecipientDatabase extends Database {
 
-  private static final String TAG = RecipientDatabase.class.getSimpleName();
+  private static final String TAG = Log.tag(RecipientDatabase.class);
 
           static final String TABLE_NAME                = "recipient";
   public  static final String ID                        = "_id";

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

@@ -23,7 +23,7 @@ import java.util.List;
 
 public class SessionDatabase extends Database {
 
-  private static final String TAG = SessionDatabase.class.getSimpleName();
+  private static final String TAG = Log.tag(SessionDatabase.class);
 
   public static final String TABLE_NAME = "sessions";
 

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

@@ -24,7 +24,7 @@ import java.util.List;
 
 public class SignedPreKeyDatabase extends Database {
 
-  private static final String TAG = SignedPreKeyDatabase.class.getSimpleName();
+  private static final String TAG = Log.tag(SignedPreKeyDatabase.class);
 
   public static final String TABLE_NAME = "signed_prekeys";
 

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

@@ -82,7 +82,7 @@ import java.util.UUID;
  */
 public class SmsDatabase extends MessageDatabase {
 
-  private static final String TAG = SmsDatabase.class.getSimpleName();
+  private static final String TAG = Log.tag(SmsDatabase.class);
 
   public  static final String TABLE_NAME         = "sms";
   public  static final String PERSON             = "person";

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

@@ -39,7 +39,7 @@ import java.util.StringTokenizer;
 
 public class SmsMigrator {
 
-  private static final String TAG = SmsMigrator.class.getSimpleName();
+  private static final String TAG = Log.tag(SmsMigrator.class);
 
   private static class SystemColumns {
     private static final String ADDRESS            = "address";

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

@@ -79,7 +79,7 @@ import java.util.Set;
 
 public class ThreadDatabase extends Database {
 
-  private static final String TAG = ThreadDatabase.class.getSimpleName();
+  private static final String TAG = Log.tag(ThreadDatabase.class);
 
   public static final long NO_TRIM_BEFORE_DATE_SET   = 0;
   public static final int  NO_TRIM_MESSAGE_COUNT_SET = Integer.MAX_VALUE;

app/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java

@@ -28,7 +28,7 @@ import java.util.Objects;
 
 public class IdentityKeyMismatch {
 
-  private static final String TAG = IdentityKeyMismatch.class.getSimpleName();
+  private static final String TAG = Log.tag(IdentityKeyMismatch.class);
 
   /** DEPRECATED */
   @JsonProperty(value = "a")

app/src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java

@@ -117,7 +117,7 @@ public class ClassicOpenHelper extends SQLiteOpenHelper {
   private static final int MORE_RECIPIENT_FIELDS                           = 47;
   private static final int DATABASE_VERSION                                = 47;
 
-  private static final String TAG = ClassicOpenHelper.class.getSimpleName();
+  private static final String TAG = Log.tag(ClassicOpenHelper.class);
 
   private final Context context;
 
@@ -1393,7 +1393,7 @@ public class ClassicOpenHelper extends SQLiteOpenHelper {
 
   private static class NumberMigrator {
 
-    private static final String TAG = NumberMigrator.class.getSimpleName();
+    private static final String TAG = Log.tag(NumberMigrator.class);
 
     private static final Set<String> SHORT_COUNTRIES = new HashSet<String>() {{
       add("NU");

app/src/main/java/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java

@@ -34,7 +34,7 @@ class PreKeyMigrationHelper {
   private static final int    PLAINTEXT_VERSION      = 2;
   private static final int    CURRENT_VERSION_MARKER = 2;
 
-  private static final String TAG = PreKeyMigrationHelper.class.getSimpleName();
+  private static final String TAG = Log.tag(PreKeyMigrationHelper.class);
 
   static boolean migratePreKeys(Context context, SQLiteDatabase database) {
     File[]  preKeyFiles = getPreKeyDirectory(context).listFiles();

app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java

@@ -31,7 +31,7 @@ import java.util.Set;
 
 public class SQLCipherMigrationHelper {
 
-  private static final String TAG = SQLCipherMigrationHelper.class.getSimpleName();
+  private static final String TAG = Log.tag(SQLCipherMigrationHelper.class);
 
   private static final long ENCRYPTION_SYMMETRIC_BIT  = 0x80000000;
   private static final long ENCRYPTION_ASYMMETRIC_BIT = 0x40000000;

app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java

@@ -81,7 +81,7 @@ import java.util.Set;
 public class SQLCipherOpenHelper extends SQLiteOpenHelper implements SignalDatabase {
 
   @SuppressWarnings("unused")
-  private static final String TAG = SQLCipherOpenHelper.class.getSimpleName();
+  private static final String TAG = Log.tag(SQLCipherOpenHelper.class);
 
   private static final int RECIPIENT_CALL_RINGTONE_VERSION  = 2;
   private static final int MIGRATE_PREKEYS_VERSION          = 3;

app/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java

@@ -19,7 +19,7 @@ import java.io.IOException;
 
 class SessionStoreMigrationHelper {
 
-  private static final String TAG = SessionStoreMigrationHelper.class.getSimpleName();
+  private static final String TAG = Log.tag(SessionStoreMigrationHelper.class);
 
   private static final String SESSIONS_DIRECTORY_V2 = "sessions-v2";
   private static final Object FILE_LOCK             = new Object();

app/src/main/java/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java

@@ -37,7 +37,7 @@ import static org.thoughtcrime.securesms.devicelist.DeviceNameProtos.DeviceName;
 
 public class DeviceListLoader extends AsyncLoader<List<Device>> {
 
-  private static final String TAG = DeviceListLoader.class.getSimpleName();
+  private static final String TAG = Log.tag(DeviceListLoader.class);
 
   private final SignalServiceAccountManager accountManager;
 

app/src/main/java/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java

@@ -8,6 +8,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.util.Pair;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.attachments.AttachmentId;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
@@ -19,7 +20,7 @@ import org.thoughtcrime.securesms.util.AsyncLoader;
 public final class PagingMediaLoader extends AsyncLoader<Pair<Cursor, Integer>> {
 
   @SuppressWarnings("unused")
-  private static final String TAG = PagingMediaLoader.class.getSimpleName();
+  private static final String TAG = Log.tag(PagingMediaLoader.class);
 
   private final Uri     uri;
   private final boolean leftIsRecent;