diff --git a/app/src/main/java/androidx/camera/view/SignalCameraView.java b/app/src/main/java/androidx/camera/view/SignalCameraView.java index 99641b106a..ab90b3c63e 100644 --- a/app/src/main/java/androidx/camera/view/SignalCameraView.java +++ b/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; diff --git a/app/src/main/java/org/signal/glide/apng/decode/APNGDecoder.java b/app/src/main/java/org/signal/glide/apng/decode/APNGDecoder.java index a8e50ab738..5ab21bed82 100644 --- a/app/src/main/java/org/signal/glide/apng/decode/APNGDecoder.java +++ b/app/src/main/java/org/signal/glide/apng/decode/APNGDecoder.java @@ -32,7 +32,7 @@ import java.util.List; */ public class APNGDecoder extends FrameSeqDecoder { - private static final String TAG = APNGDecoder.class.getSimpleName(); + private static final String TAG = Log.tag(APNGDecoder.class); private APNGWriter apngWriter; private int mLoopCount; diff --git a/app/src/main/java/org/signal/glide/common/FrameAnimationDrawable.java b/app/src/main/java/org/signal/glide/common/FrameAnimationDrawable.java index 7f2353faa7..f908290e23 100644 --- a/app/src/main/java/org/signal/glide/common/FrameAnimationDrawable.java +++ b/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 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); diff --git a/app/src/main/java/org/signal/glide/common/decode/FrameSeqDecoder.java b/app/src/main/java/org/signal/glide/common/decode/FrameSeqDecoder.java index 87ea2e3aa2..238797e49a 100644 --- a/app/src/main/java/org/signal/glide/common/decode/FrameSeqDecoder.java +++ b/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 { - 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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java index a6957fe42b..e04f05524c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java index bd3f19d498..c24a9791bb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java +++ b/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"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/ConfirmIdentityDialog.java b/app/src/main/java/org/thoughtcrime/securesms/ConfirmIdentityDialog.java index f35e2200b1..e0eb5fa4f3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ConfirmIdentityDialog.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java index b706234396..231c3fb235 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java +++ b/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"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java b/app/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java index b7b6a48111..47cdd66196 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java +++ b/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(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java index 740bf8d8b2..9a89a72bda 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/DeviceProvisioningActivity.java b/app/src/main/java/org/thoughtcrime/securesms/DeviceProvisioningActivity.java index 6625d5fb03..8b76ca114e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/DeviceProvisioningActivity.java +++ b/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() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java index aa06149ff9..0c4e67e1bd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java index b01bd638c0..435c0e9dc2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java +++ b/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) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphraseActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphraseActivity.java index 5bf576a308..90807a41bd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseActivity.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java index 0d38525b9a..88aa5de48b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java +++ b/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"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/PushContactSelectionActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PushContactSelectionActivity.java index 5e729813a5..6703b232fd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/PushContactSelectionActivity.java +++ b/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) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/SmsSendtoActivity.java b/app/src/main/java/org/thoughtcrime/securesms/SmsSendtoActivity.java index 53686d8f51..8068fa0251 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/SmsSendtoActivity.java +++ b/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) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/TransportOptions.java b/app/src/main/java/org/thoughtcrime/securesms/TransportOptions.java index 386c1e5941..846ca59dbb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/TransportOptions.java +++ b/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 listeners = new LinkedList<>(); private final Context context; diff --git a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java index 192828c9c3..28d3211d2e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java index caed6f337d..6397322249 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java +++ b/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"); diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java index 105f2f1282..f4d2382a10 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java +++ b/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); diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupBase.java b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupBase.java index c88c4fec21..d6e28422f8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupBase.java +++ b/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) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java index 379252a083..2ce94eddea 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java +++ b/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 BLACKLISTED_TABLES = SetUtil.newHashSet( SignedPreKeyDatabase.TABLE_NAME, diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java index 5b274495ef..b24d56e857 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java +++ b/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) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/AlertView.java b/app/src/main/java/org/thoughtcrime/securesms/components/AlertView.java index 1c703079a2..23c371156c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/AlertView.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/AudioView.java b/app/src/main/java/org/thoughtcrime/securesms/components/AudioView.java index a0d776cd15..4373fa308a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/AudioView.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java index 39a0e36dca..0a3dfc4380 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java +++ b/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(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java b/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java index 70a0220eaf..f2847fae73 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/CustomDefaultPreference.java b/app/src/main/java/org/thoughtcrime/securesms/components/CustomDefaultPreference.java index fc056e44f6..ed546c08c6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/CustomDefaultPreference.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/DeliveryStatusView.java b/app/src/main/java/org/thoughtcrime/securesms/components/DeliveryStatusView.java index 076791fce6..5e7a2893e6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/DeliveryStatusView.java +++ b/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, diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java b/app/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java index 8f5e806bba..35dfd11728 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java b/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java index df6b50dbd1..e6b8b2eb40 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java +++ b/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); diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java index 0c1d0d4687..675e40e760 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java b/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java index fb492ca128..8813e8b17f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java +++ b/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 hiddenListeners = new HashSet<>(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/PushRecipientsPanel.java b/app/src/main/java/org/thoughtcrime/securesms/components/PushRecipientsPanel.java index 194d00c50c..7a320ce838 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/PushRecipientsPanel.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java b/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java index ab489b849b..4bfbcb3d07 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/RatingManager.java b/app/src/main/java/org/thoughtcrime/securesms/components/RatingManager.java index aab2e5bb26..5c4be4b1c8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/RatingManager.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java b/app/src/main/java/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java index 7876b0205c..dda8d30d7c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java +++ b/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 { @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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java index f90f05a059..05d1b56b53 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java +++ b/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 { @SuppressWarnings("unused") - private static final String TAG = ThreadPhotoRailAdapter.class.getSimpleName(); + private static final String TAG = Log.tag(ThreadPhotoRailAdapter.class); @NonNull private final GlideRequests glideRequests; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java index 0debb78a91..97efaf48cb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusRepository.java b/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusRepository.java index 4fa1b5e17f..a236bf6c09 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusRepository.java +++ b/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); diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java b/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java index 25abdca93e..bc6fb79fe5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java +++ b/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); diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java index d0b790e9f5..d0a64c55be 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraUtils.java b/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraUtils.java index d72db818d2..7701cbbc79 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraUtils.java +++ b/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 */ diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java b/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java index 2c19603739..fda03605a5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java index 617c830e5f..1339e69705 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java +++ b/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); diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java index fe1fac9061..be4bb181ae 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java index 7befdcaa5a..fc5f046c6d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java +++ b/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); diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java index 0291a5a855..fda21c6765 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java index 5039914b69..b75ce064a8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java b/app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java index 2fdfa45477..b19098d731 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/location/SignalPlace.java b/app/src/main/java/org/thoughtcrime/securesms/components/location/SignalPlace.java index 7b2786d2fa..70035a073a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/location/SignalPlace.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java b/app/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java index 239f09069d..dc33c13a5f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java b/app/src/main/java/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java index ef07b4f131..60d154812f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java +++ b/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); diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java index 88c5c5d590..8c3e2f0b45 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java index e6f86802b6..8244da14d3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsDatabase.java index f386ca255e..f846858a0f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsDatabase.java +++ b/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"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java index dc1fb6ed13..ea3f790e07 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java +++ b/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); diff --git a/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactUtil.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactUtil.java index 9e6288f56d..0ec507f854 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactUtil.java +++ b/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 { diff --git a/app/src/main/java/org/thoughtcrime/securesms/contactshare/SharedContactRepository.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/SharedContactRepository.java index f93f41d647..2be7c642ec 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contactshare/SharedContactRepository.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/contactshare/VCardUtil.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/VCardUtil.java index 6b83f8b38a..4a3970f762 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contactshare/VCardUtil.java +++ b/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 parseContacts(@NonNull String vCardData) { List vContacts = Ezvcard.parse(vCardData).all(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 31a6dcde58..9a84693577 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/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"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java index 5ede673a49..c33bdaa871 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java index 038edc67ee..42cb492807 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java index d73c557888..2a5d826eba 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java +++ b/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() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java index 183bdc86da..e118b18aeb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java +++ b/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 batchSelected; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeRepository.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeRepository.java index 8669b3d151..1c41fe48b4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeRepository.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java index 9595955cff..3fa7f63e01 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java index 08747a141c..b15467c608 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java +++ b/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"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java index fbd35ccf35..e2db7ee93d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java +++ b/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) diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/MasterCipher.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/MasterCipher.java index f325aa4a12..3a8f9dd22b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/MasterCipher.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/PreKeyUtil.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/PreKeyUtil.java index 4644701b62..4ec767bca4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/PreKeyUtil.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/PublicKey.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/PublicKey.java index b52573b96a..026e45879e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/PublicKey.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java index 959ad7f429..014328fc1a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java +++ b/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 { diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java index dd3a7f629f..80f419b83f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureIdentityKeyStore.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java index e0adb13196..72a2942adb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java index d56f43ebad..e868d277a0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ApnDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ApnDatabase.java index 48fa192a75..0255200812 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/ApnDatabase.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java index 6c06e5af7f..9b78f9b484 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java +++ b/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"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/EarlyReceiptCache.java b/app/src/main/java/org/thoughtcrime/securesms/database/EarlyReceiptCache.java index 699e0045c6..2c06560707 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/EarlyReceiptCache.java +++ b/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> cache = new LRUCache<>(100); private final String name; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java index 24f2daa673..b9c9cf7c4b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java +++ b/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"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessageDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MessageDatabase.java index 39f77d590b..a5dcb7b151 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MessageDatabase.java +++ b/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); diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java index e168fdfb8f..39369710b7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java +++ b/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"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java index 73324861ef..c64e9616af 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java +++ b/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"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.java index f045351182..e2f9920f9e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.java +++ b/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"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java index cc3d69b29e..7a558d376e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java +++ b/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"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java index f10bf7ae47..fd2d679df2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java +++ b/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"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SessionDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SessionDatabase.java index 1f7b102744..7a811a1b5c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SessionDatabase.java +++ b/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"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java index 97a87ed3fd..5f432203c4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java +++ b/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"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java index fa46e571e7..b3d2ee38fe 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java +++ b/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"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsMigrator.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsMigrator.java index 9ce7ace899..63e14d8028 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsMigrator.java +++ b/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"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java index b39faba8bc..baca37633d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java b/app/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java index f9622a1349..237d98791c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/documents/IdentityKeyMismatch.java +++ b/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") diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java index 71b0edbbfb..e9dba09b8b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java +++ b/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 SHORT_COUNTRIES = new HashSet() {{ add("NU"); diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java index 7c2b156192..9e01aa77a0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java +++ b/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(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java index b08de29cc7..d73f2510ec 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java index 95bcbdfe4d..0705804995 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java +++ b/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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java index 6fcec92c8e..4eab2303ae 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java +++ b/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(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java index 1c3b283088..9edd814b7b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java +++ b/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> { - private static final String TAG = DeviceListLoader.class.getSimpleName(); + private static final String TAG = Log.tag(DeviceListLoader.class); private final SignalServiceAccountManager accountManager; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java index 8f7664b23b..c50fa6d497 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java +++ b/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> { @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; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java index ce3a50e963..018ccc2983 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java @@ -22,6 +22,7 @@ import android.text.SpannableString; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.contactshare.Contact; import org.thoughtcrime.securesms.database.MmsDatabase; @@ -43,7 +44,7 @@ import java.util.List; */ public class MediaMmsMessageRecord extends MmsMessageRecord { - private final static String TAG = MediaMmsMessageRecord.class.getSimpleName(); + private final static String TAG = Log.tag(MediaMmsMessageRecord.class); private final int partCount; private final boolean mentionsSelf; diff --git a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmJobService.java b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmJobService.java index 974bc68d6a..1309fc1f02 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmJobService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmJobService.java @@ -23,7 +23,7 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences; @RequiresApi(26) public class FcmJobService extends JobService { - private static final String TAG = FcmJobService.class.getSimpleName(); + private static final String TAG = Log.tag(FcmJobService.class); private static final int ID = 1337; diff --git a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java index 96e6af4243..54f1bcb4ec 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java @@ -18,7 +18,7 @@ import java.util.Locale; public class FcmReceiveService extends FirebaseMessagingService { - private static final String TAG = FcmReceiveService.class.getSimpleName(); + private static final String TAG = Log.tag(FcmReceiveService.class); @Override diff --git a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmUtil.java b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmUtil.java index f2ff0daf49..3139f17e61 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmUtil.java @@ -14,7 +14,7 @@ import java.util.concurrent.atomic.AtomicReference; public final class FcmUtil { - private static final String TAG = FcmUtil.class.getSimpleName(); + private static final String TAG = Log.tag(FcmUtil.class); /** * Retrieves the current FCM token. If one isn't available, it'll be generated. diff --git a/app/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyLoader.java b/app/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyLoader.java index de3677d901..fc0e7c304f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyLoader.java +++ b/app/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyLoader.java @@ -29,7 +29,7 @@ import okhttp3.Response; public abstract class GiphyLoader extends AsyncLoader> { - private static final String TAG = GiphyLoader.class.getSimpleName(); + private static final String TAG = Log.tag(GiphyLoader.class); public static int PAGE_SIZE = 100; diff --git a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java index bd0688a809..eadf0fb0f3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java @@ -40,7 +40,7 @@ public class GiphyActivity extends PassphraseRequiredActivity GiphyAdapter.OnItemClickListener { - private static final String TAG = GiphyActivity.class.getSimpleName(); + private static final String TAG = Log.tag(GiphyActivity.class); public static final String EXTRA_IS_MMS = "extra_is_mms"; public static final String EXTRA_WIDTH = "extra_width"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java index 53139056db..13f14c099a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java @@ -38,7 +38,7 @@ import java.util.concurrent.ExecutionException; class GiphyAdapter extends RecyclerView.Adapter { - private static final String TAG = GiphyAdapter.class.getSimpleName(); + private static final String TAG = Log.tag(GiphyAdapter.class); private final Context context; private final GlideRequests glideRequests; diff --git a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java index aa8b28e64b..c185a217c9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java @@ -17,6 +17,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.StaggeredGridLayoutManager; +import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.LoggingFragment; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.giph.model.GiphyImage; @@ -31,7 +32,7 @@ import java.util.List; public abstract class GiphyFragment extends LoggingFragment implements LoaderManager.LoaderCallbacks>, GiphyAdapter.OnItemClickListener { - private static final String TAG = GiphyFragment.class.getSimpleName(); + private static final String TAG = Log.tag(GiphyFragment.class); private GiphyAdapter giphyAdapter; private RecyclerView recyclerView; diff --git a/app/src/main/java/org/thoughtcrime/securesms/giph/util/InfiniteScrollListener.java b/app/src/main/java/org/thoughtcrime/securesms/giph/util/InfiniteScrollListener.java index ef0dfbedb1..997a11e772 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/giph/util/InfiniteScrollListener.java +++ b/app/src/main/java/org/thoughtcrime/securesms/giph/util/InfiniteScrollListener.java @@ -5,9 +5,11 @@ package org.thoughtcrime.securesms.giph.util; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; +import org.signal.core.util.logging.Log; + public abstract class InfiniteScrollListener extends RecyclerView.OnScrollListener { - public static String TAG = InfiniteScrollListener.class.getSimpleName(); + public static String TAG = Log.tag(InfiniteScrollListener.class); private int previousTotal = 0; // The total number of items in the dataset after the last load private boolean loading = true; // True if we are still waiting for the last set of data to load. diff --git a/app/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java index 11ab0c4ff5..7ca4c30ecd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java @@ -18,7 +18,7 @@ import okhttp3.OkHttpClient; class ChunkedImageUrlFetcher implements DataFetcher { - private static final String TAG = ChunkedImageUrlFetcher.class.getSimpleName(); + private static final String TAG = Log.tag(ChunkedImageUrlFetcher.class); private final OkHttpClient client; private final ChunkedImageUrl url; diff --git a/app/src/main/java/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java index 9b0bbf2056..09a03e57e9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java @@ -8,6 +8,8 @@ import com.bumptech.glide.load.data.DataFetcher; import com.bumptech.glide.load.model.GlideUrl; import com.bumptech.glide.util.ContentLengthInputStream; +import org.signal.core.util.logging.Log; + import java.io.IOException; import java.io.InputStream; import java.util.Map; @@ -22,7 +24,7 @@ import okhttp3.ResponseBody; */ class OkHttpStreamFetcher implements DataFetcher { - private static final String TAG = OkHttpStreamFetcher.class.getSimpleName(); + private static final String TAG = Log.tag(OkHttpStreamFetcher.class); private final OkHttpClient client; private final GlideUrl url; diff --git a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java index 4edd33e4b8..57c334c4e5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java @@ -19,7 +19,7 @@ import java.io.OutputStream; public class EncryptedBitmapResourceEncoder extends EncryptedCoder implements ResourceEncoder { - private static final String TAG = EncryptedBitmapResourceEncoder.class.getSimpleName(); + private static final String TAG = Log.tag(EncryptedBitmapResourceEncoder.class); private final byte[] secret; diff --git a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java index 3cae923013..4eace3ef52 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java @@ -17,7 +17,7 @@ import java.net.SocketException; public class EncryptedCacheEncoder extends EncryptedCoder implements Encoder { - private static final String TAG = EncryptedCacheEncoder.class.getSimpleName(); + private static final String TAG = Log.tag(EncryptedCacheEncoder.class); private final byte[] secret; private final ArrayPool byteArrayPool; diff --git a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java index be1c09b7cc..c1b5ae125b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java @@ -18,7 +18,7 @@ import java.io.OutputStream; public class EncryptedGifDrawableResourceEncoder extends EncryptedCoder implements ResourceEncoder { - private static final String TAG = EncryptedGifDrawableResourceEncoder.class.getSimpleName(); + private static final String TAG = Log.tag(EncryptedGifDrawableResourceEncoder.class); private final byte[] secret; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java index 54057cd5a6..96c020197e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java @@ -32,7 +32,7 @@ import java.util.UUID; */ public class AlarmManagerScheduler implements Scheduler { - private static final String TAG = AlarmManagerScheduler.class.getSimpleName(); + private static final String TAG = Log.tag(AlarmManagerScheduler.class); private final Application application; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/BootReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/BootReceiver.java index 2ef0df81e4..14b0ee145a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/BootReceiver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/BootReceiver.java @@ -8,7 +8,7 @@ import org.signal.core.util.logging.Log; public class BootReceiver extends BroadcastReceiver { - private static final String TAG = BootReceiver.class.getSimpleName(); + private static final String TAG = Log.tag(BootReceiver.class); @Override public void onReceive(Context context, Intent intent) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java index 5b49330c83..a6bdeb2105 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java @@ -24,7 +24,7 @@ import java.util.List; */ class InAppScheduler implements Scheduler { - private static final String TAG = InAppScheduler.class.getSimpleName(); + private static final String TAG = Log.tag(InAppScheduler.class); private final JobManager jobManager; private final Handler handler; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java index c455b44161..c406ec09d6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java @@ -36,7 +36,7 @@ import java.util.concurrent.TimeUnit; */ class JobController { - private static final String TAG = JobController.class.getSimpleName(); + private static final String TAG = Log.tag(JobController.class); private final Application application; private final JobStorage jobStorage; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java index 7e0ca63736..5ebb22a435 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java @@ -40,7 +40,7 @@ import java.util.concurrent.atomic.AtomicReference; */ public class JobManager implements ConstraintObserver.Notifier { - private static final String TAG = JobManager.class.getSimpleName(); + private static final String TAG = Log.tag(JobManager.class); public static final int CURRENT_VERSION = 8; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java index f83011620f..4973874a35 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java @@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit; */ class JobRunner extends Thread { - private static final String TAG = JobRunner.class.getSimpleName(); + private static final String TAG = Log.tag(JobRunner.class); private static long WAKE_LOCK_TIMEOUT = TimeUnit.MINUTES.toMillis(10); diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraintObserver.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraintObserver.java index f2a4180526..80ca8b4d32 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraintObserver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraintObserver.java @@ -9,11 +9,12 @@ import android.telephony.TelephonyManager; import androidx.annotation.NonNull; import org.signal.core.util.concurrent.SignalExecutors; +import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.jobmanager.ConstraintObserver; public class CellServiceConstraintObserver implements ConstraintObserver { - private static final String REASON = CellServiceConstraintObserver.class.getSimpleName(); + private static final String REASON = Log.tag(CellServiceConstraintObserver.class); private volatile Notifier notifier; private volatile ServiceState lastKnownState; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/ChargingConstraintObserver.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/ChargingConstraintObserver.java index d534fe2fa2..811b575ee0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/ChargingConstraintObserver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/ChargingConstraintObserver.java @@ -10,6 +10,7 @@ import android.os.BatteryManager; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.jobmanager.ConstraintObserver; /** @@ -17,7 +18,7 @@ import org.thoughtcrime.securesms.jobmanager.ConstraintObserver; */ public class ChargingConstraintObserver implements ConstraintObserver { - private static final String REASON = ChargingConstraintObserver.class.getSimpleName(); + private static final String REASON = Log.tag(ChargingConstraintObserver.class); private static final int STATUS_BATTERY = 0; private final Application application; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/DecryptionsDrainedConstraintObserver.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/DecryptionsDrainedConstraintObserver.java index 4bf7ec54f3..5539f13374 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/DecryptionsDrainedConstraintObserver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/DecryptionsDrainedConstraintObserver.java @@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.jobmanager.impl; import androidx.annotation.NonNull; +import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.jobmanager.ConstraintObserver; @@ -11,7 +12,7 @@ import org.thoughtcrime.securesms.jobmanager.ConstraintObserver; */ public class DecryptionsDrainedConstraintObserver implements ConstraintObserver { - private static final String REASON = DecryptionsDrainedConstraintObserver.class.getSimpleName(); + private static final String REASON = Log.tag(DecryptionsDrainedConstraintObserver.class); @Override public void register(@NonNull Notifier notifier) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraintObserver.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraintObserver.java index 0dcd3bde52..59ddcbf7cd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraintObserver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraintObserver.java @@ -9,11 +9,12 @@ import android.net.ConnectivityManager; import androidx.annotation.NonNull; +import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.jobmanager.ConstraintObserver; public class NetworkConstraintObserver implements ConstraintObserver { - private static final String REASON = NetworkConstraintObserver.class.getSimpleName(); + private static final String REASON = Log.tag(NetworkConstraintObserver.class); private final Application application; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NotInCallConstraintObserver.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NotInCallConstraintObserver.java index 4a1e083ae2..e005429992 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NotInCallConstraintObserver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/NotInCallConstraintObserver.java @@ -5,12 +5,13 @@ import androidx.annotation.NonNull; 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.events.WebRtcViewModel; import org.thoughtcrime.securesms.jobmanager.ConstraintObserver; public final class NotInCallConstraintObserver implements ConstraintObserver { - private static final String REASON = NotInCallConstraintObserver.class.getSimpleName(); + private static final String REASON = Log.tag(NotInCallConstraintObserver.class); @Override public void register(@NonNull Notifier notifier) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraintObserver.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraintObserver.java index 0c9225434d..56067aa3f1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraintObserver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraintObserver.java @@ -5,11 +5,12 @@ import androidx.annotation.NonNull; 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.jobmanager.ConstraintObserver; public class SqlCipherMigrationConstraintObserver implements ConstraintObserver { - private static final String REASON = SqlCipherMigrationConstraintObserver.class.getSimpleName(); + private static final String REASON = Log.tag(SqlCipherMigrationConstraintObserver.class); private Notifier notifier; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/workmanager/WorkManagerDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/workmanager/WorkManagerDatabase.java index 2da4d04e0f..70d8d8725e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/workmanager/WorkManagerDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/workmanager/WorkManagerDatabase.java @@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit; final class WorkManagerDatabase extends SQLiteOpenHelper { - private static final String TAG = WorkManagerDatabase.class.getSimpleName(); + private static final String TAG = Log.tag(WorkManagerDatabase.class); static final String DB_NAME = "androidx.work.workdb"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java index 637881396f..191b53e1af 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java @@ -46,7 +46,7 @@ public final class AttachmentDownloadJob extends BaseJob { public static final String KEY = "AttachmentDownloadJob"; private static final int MAX_ATTACHMENT_SIZE = 150 * 1024 * 1024; - private static final String TAG = AttachmentDownloadJob.class.getSimpleName(); + private static final String TAG = Log.tag(AttachmentDownloadJob.class); private static final String KEY_MESSAGE_ID = "message_id"; private static final String KEY_PART_ROW_ID = "part_row_id"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/BaseJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/BaseJob.java index 7564bb12b8..f693163388 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/BaseJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/BaseJob.java @@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.util.FeatureFlags; public abstract class BaseJob extends Job { - private static final String TAG = BaseJob.class.getSimpleName(); + private static final String TAG = Log.tag(BaseJob.class); private Data outputData; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java index c0fd9b2d0d..ea949c4e64 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java @@ -24,7 +24,7 @@ public class CleanPreKeysJob extends BaseJob { public static final String KEY = "CleanPreKeysJob"; - private static final String TAG = CleanPreKeysJob.class.getSimpleName(); + private static final String TAG = Log.tag(CleanPreKeysJob.class); private static final long ARCHIVE_AGE = TimeUnit.DAYS.toMillis(30); diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java index b4baf7765b..8e42cc4416 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java @@ -23,7 +23,7 @@ public class CreateSignedPreKeyJob extends BaseJob { public static final String KEY = "CreateSignedPreKeyJob"; - private static final String TAG = CreateSignedPreKeyJob.class.getSimpleName(); + private static final String TAG = Log.tag(CreateSignedPreKeyJob.class); public CreateSignedPreKeyJob(Context context) { this(new Job.Parameters.Builder() diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java index 980f819508..be2395d28f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java @@ -18,7 +18,7 @@ public class DirectoryRefreshJob extends BaseJob { public static final String KEY = "DirectoryRefreshJob"; - private static final String TAG = DirectoryRefreshJob.class.getSimpleName(); + private static final String TAG = Log.tag(DirectoryRefreshJob.class); private static final String KEY_RECIPIENT = "recipient"; private static final String KEY_NOTIFY_OF_NEW_USERS = "notify_of_new_users"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java index e16f1b784a..0f3c7a843f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java @@ -50,7 +50,7 @@ public class FcmRefreshJob extends BaseJob { public static final String KEY = "FcmRefreshJob"; - private static final String TAG = FcmRefreshJob.class.getSimpleName(); + private static final String TAG = Log.tag(FcmRefreshJob.class); public FcmRefreshJob() { this(new Job.Parameters.Builder() diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java index 3f2a1ae979..3a9fb03d77 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java @@ -52,7 +52,7 @@ public class MmsDownloadJob extends BaseJob { public static final String KEY = "MmsDownloadJob"; - private static final String TAG = MmsDownloadJob.class.getSimpleName(); + private static final String TAG = Log.tag(MmsDownloadJob.class); private static final String KEY_MESSAGE_ID = "message_id"; private static final String KEY_THREAD_ID = "thread_id"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java index a4a9c8bec9..56ae7951a7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java @@ -24,7 +24,7 @@ public class MmsReceiveJob extends BaseJob { public static final String KEY = "MmsReceiveJob"; - private static final String TAG = MmsReceiveJob.class.getSimpleName(); + private static final String TAG = Log.tag(MmsReceiveJob.class); private static final String KEY_DATA = "data"; private static final String KEY_SUBSCRIPTION_ID = "subscription_id"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsSendJob.java index ea04fd585c..49639b722a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsSendJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsSendJob.java @@ -61,7 +61,7 @@ public final class MmsSendJob extends SendJob { public static final String KEY = "MmsSendJobV2"; - private static final String TAG = MmsSendJob.class.getSimpleName(); + private static final String TAG = Log.tag(MmsSendJob.class); private static final String KEY_MESSAGE_ID = "message_id"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java index 28e9a61b2e..b2a909bcc2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java @@ -31,7 +31,7 @@ public class MultiDeviceBlockedUpdateJob extends BaseJob { public static final String KEY = "MultiDeviceBlockedUpdateJob"; @SuppressWarnings("unused") - private static final String TAG = MultiDeviceBlockedUpdateJob.class.getSimpleName(); + private static final String TAG = Log.tag(MultiDeviceBlockedUpdateJob.class); public MultiDeviceBlockedUpdateJob() { this(new Job.Parameters.Builder() diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java index 9d1368b632..8d0e29287c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java @@ -23,7 +23,7 @@ public class MultiDeviceConfigurationUpdateJob extends BaseJob { public static final String KEY = "MultiDeviceConfigurationUpdateJob"; - private static final String TAG = MultiDeviceConfigurationUpdateJob.class.getSimpleName(); + private static final String TAG = Log.tag(MultiDeviceConfigurationUpdateJob.class); private static final String KEY_READ_RECEIPTS_ENABLED = "read_receipts_enabled"; private static final String KEY_TYPING_INDICATORS_ENABLED = "typing_indicators_enabled"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java index aa90945a0a..022df026ae 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java @@ -56,7 +56,7 @@ public class MultiDeviceContactUpdateJob extends BaseJob { public static final String KEY = "MultiDeviceContactUpdateJob"; - private static final String TAG = MultiDeviceContactUpdateJob.class.getSimpleName(); + private static final String TAG = Log.tag(MultiDeviceContactUpdateJob.class); private static final long FULL_SYNC_TIME = TimeUnit.HOURS.toMillis(6); diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java index aacd50aa86..5039438f20 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java @@ -43,7 +43,7 @@ public class MultiDeviceGroupUpdateJob extends BaseJob { public static final String KEY = "MultiDeviceGroupUpdateJob"; - private static final String TAG = MultiDeviceGroupUpdateJob.class.getSimpleName(); + private static final String TAG = Log.tag(MultiDeviceGroupUpdateJob.class); public MultiDeviceGroupUpdateJob() { this(new Job.Parameters.Builder() diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceKeysUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceKeysUpdateJob.java index a1b6ee4507..d1df13e1c7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceKeysUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceKeysUpdateJob.java @@ -25,7 +25,7 @@ public class MultiDeviceKeysUpdateJob extends BaseJob { public static final String KEY = "MultiDeviceKeysUpdateJob"; - private static final String TAG = MultiDeviceKeysUpdateJob.class.getSimpleName(); + private static final String TAG = Log.tag(MultiDeviceKeysUpdateJob.class); public MultiDeviceKeysUpdateJob() { this(new Parameters.Builder() diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceMessageRequestResponseJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceMessageRequestResponseJob.java index 2365261568..351a03d281 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceMessageRequestResponseJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceMessageRequestResponseJob.java @@ -26,7 +26,7 @@ public class MultiDeviceMessageRequestResponseJob extends BaseJob { public static final String KEY = "MultiDeviceMessageRequestResponseJob"; - private static final String TAG = MultiDeviceMessageRequestResponseJob.class.getSimpleName(); + private static final String TAG = Log.tag(MultiDeviceMessageRequestResponseJob.class); private static final String KEY_THREAD_RECIPIENT = "thread_recipient"; private static final String KEY_TYPE = "type"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java index e0526143b9..7af5c221b7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java @@ -34,7 +34,7 @@ public class MultiDeviceProfileKeyUpdateJob extends BaseJob { public static String KEY = "MultiDeviceProfileKeyUpdateJob"; - private static final String TAG = MultiDeviceProfileKeyUpdateJob.class.getSimpleName(); + private static final String TAG = Log.tag(MultiDeviceProfileKeyUpdateJob.class); public MultiDeviceProfileKeyUpdateJob() { this(new Job.Parameters.Builder() diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java index 2fcda12f76..5fb6b5c2e5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java @@ -35,7 +35,7 @@ public class MultiDeviceReadUpdateJob extends BaseJob { public static final String KEY = "MultiDeviceReadUpdateJob"; - private static final String TAG = MultiDeviceReadUpdateJob.class.getSimpleName(); + private static final String TAG = Log.tag(MultiDeviceReadUpdateJob.class); private static final String KEY_MESSAGE_IDS = "message_ids"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java index 7aec201989..6237666f56 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java @@ -31,7 +31,7 @@ public class MultiDeviceVerifiedUpdateJob extends BaseJob { public static final String KEY = "MultiDeviceVerifiedUpdateJob"; - private static final String TAG = MultiDeviceVerifiedUpdateJob.class.getSimpleName(); + private static final String TAG = Log.tag(MultiDeviceVerifiedUpdateJob.class); private static final String KEY_DESTINATION = "destination"; private static final String KEY_IDENTITY_KEY = "identity_key"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java index 2abe6e30d1..dc8540ccdd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java @@ -72,7 +72,7 @@ public final class PushGroupSendJob extends PushSendJob { public static final String KEY = "PushGroupSendJob"; - private static final String TAG = PushGroupSendJob.class.getSimpleName(); + private static final String TAG = Log.tag(PushGroupSendJob.class); private static final String KEY_MESSAGE_ID = "message_id"; private static final String KEY_FILTER_RECIPIENT = "filter_recipient"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java index 4a30ac1336..fd4cbd19a1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java @@ -37,7 +37,7 @@ public class PushGroupUpdateJob extends BaseJob { public static final String KEY = "PushGroupUpdateJob"; - private static final String TAG = PushGroupUpdateJob.class.getSimpleName(); + private static final String TAG = Log.tag(PushGroupUpdateJob.class); private static final String KEY_SOURCE = "source"; private static final String KEY_GROUP_ID = "group_id"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java index 1554496b4a..88902c833d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java @@ -53,7 +53,7 @@ public class PushMediaSendJob extends PushSendJob { public static final String KEY = "PushMediaSendJob"; - private static final String TAG = PushMediaSendJob.class.getSimpleName(); + private static final String TAG = Log.tag(PushMediaSendJob.class); private static final String KEY_MESSAGE_ID = "message_id"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushReceivedJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushReceivedJob.java index 6b2cd193cd..1341b760db 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushReceivedJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushReceivedJob.java @@ -1,10 +1,11 @@ package org.thoughtcrime.securesms.jobs; +import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.jobmanager.Job; public abstract class PushReceivedJob extends BaseJob { - private static final String TAG = PushReceivedJob.class.getSimpleName(); + private static final String TAG = Log.tag(PushReceivedJob.class); protected PushReceivedJob(Job.Parameters parameters) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java index bddc023752..32248bccbb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java @@ -76,7 +76,7 @@ import java.util.concurrent.TimeUnit; public abstract class PushSendJob extends SendJob { - private static final String TAG = PushSendJob.class.getSimpleName(); + private static final String TAG = Log.tag(PushSendJob.class); private static final long CERTIFICATE_EXPIRATION_BUFFER = TimeUnit.DAYS.toMillis(1); protected PushSendJob(Job.Parameters parameters) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushTextSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushTextSendJob.java index 368437c9e2..e923cf1fc2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushTextSendJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushTextSendJob.java @@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.jobs; import androidx.annotation.NonNull; +import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.database.DatabaseFactory; @@ -41,7 +42,7 @@ public class PushTextSendJob extends PushSendJob { public static final String KEY = "PushTextSendJob"; - private static final String TAG = PushTextSendJob.class.getSimpleName(); + private static final String TAG = Log.tag(PushTextSendJob.class); private static final String KEY_MESSAGE_ID = "message_id"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java index a5900d39e6..95c11872ce 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java @@ -25,7 +25,7 @@ public class RefreshAttributesJob extends BaseJob { public static final String KEY = "RefreshAttributesJob"; - private static final String TAG = RefreshAttributesJob.class.getSimpleName(); + private static final String TAG = Log.tag(RefreshAttributesJob.class); public RefreshAttributesJob() { this(new Job.Parameters.Builder() diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java index 9276c5f443..c0556152be 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java @@ -26,7 +26,7 @@ public class RefreshPreKeysJob extends BaseJob { public static final String KEY = "RefreshPreKeysJob"; - private static final String TAG = RefreshPreKeysJob.class.getSimpleName(); + private static final String TAG = Log.tag(RefreshPreKeysJob.class); private static final int PREKEY_MINIMUM = 10; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java index 2f281bad19..ceb16fa695 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java @@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.jobs; import androidx.annotation.NonNull; +import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.groups.GroupId; @@ -26,7 +27,7 @@ public class RequestGroupInfoJob extends BaseJob { public static final String KEY = "RequestGroupInfoJob"; @SuppressWarnings("unused") - private static final String TAG = RequestGroupInfoJob.class.getSimpleName(); + private static final String TAG = Log.tag(RequestGroupInfoJob.class); private static final String KEY_SOURCE = "source"; private static final String KEY_GROUP_ID = "group_id"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java index ff3c5ef3b2..8dfa090a1a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java @@ -31,7 +31,7 @@ public class RetrieveProfileAvatarJob extends BaseJob { public static final String KEY = "RetrieveProfileAvatarJob"; - private static final String TAG = RetrieveProfileAvatarJob.class.getSimpleName(); + private static final String TAG = Log.tag(RetrieveProfileAvatarJob.class); private static final int MAX_PROFILE_SIZE_BYTES = 20 * 1024 * 1024; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java index b0aa1d0f5a..edc667d1b1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java @@ -70,7 +70,7 @@ public class RetrieveProfileJob extends BaseJob { public static final String KEY = "RetrieveProfileJob"; - private static final String TAG = RetrieveProfileJob.class.getSimpleName(); + private static final String TAG = Log.tag(RetrieveProfileJob.class); private static final String KEY_RECIPIENTS = "recipients"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java index 8bb1ed2fd7..164249134f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java @@ -22,7 +22,7 @@ public class RotateSignedPreKeyJob extends BaseJob { public static final String KEY = "RotateSignedPreKeyJob"; - private static final String TAG = RotateSignedPreKeyJob.class.getSimpleName(); + private static final String TAG = Log.tag(RotateSignedPreKeyJob.class); public RotateSignedPreKeyJob() { this(new Job.Parameters.Builder() diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java index d42ae44a04..e59738350f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java @@ -32,7 +32,7 @@ public class SendDeliveryReceiptJob extends BaseJob { private static final String KEY_MESSAGE_ID = "message_id"; private static final String KEY_TIMESTAMP = "timestamp"; - private static final String TAG = SendReadReceiptJob.class.getSimpleName(); + private static final String TAG = Log.tag(SendReadReceiptJob.class); private RecipientId recipientId; private long messageId; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendJob.java index 324e7cff2d..5c1ffe3ecb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendJob.java @@ -24,7 +24,7 @@ import java.util.List; public abstract class SendJob extends BaseJob { @SuppressWarnings("unused") - private final static String TAG = SendJob.class.getSimpleName(); + private final static String TAG = Log.tag(SendJob.class); public SendJob(Job.Parameters parameters) { super(parameters); diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java index a5094e4a93..ec06cba140 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java @@ -34,7 +34,7 @@ public class SendReadReceiptJob extends BaseJob { public static final String KEY = "SendReadReceiptJob"; - private static final String TAG = SendReadReceiptJob.class.getSimpleName(); + private static final String TAG = Log.tag(SendReadReceiptJob.class); static final int MAX_TIMESTAMPS = 500; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendViewedReceiptJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendViewedReceiptJob.java index d99ab79c76..da2b7e88fb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendViewedReceiptJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendViewedReceiptJob.java @@ -32,7 +32,7 @@ public class SendViewedReceiptJob extends BaseJob { public static final String KEY = "SendViewedReceiptJob"; - private static final String TAG = SendViewedReceiptJob.class.getSimpleName(); + private static final String TAG = Log.tag(SendViewedReceiptJob.class); private static final String KEY_THREAD = "thread"; private static final String KEY_ADDRESS = "address"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java index 1aeaec029f..b47d620cb8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java @@ -19,7 +19,7 @@ public class ServiceOutageDetectionJob extends BaseJob { public static final String KEY = "ServiceOutageDetectionJob"; - private static final String TAG = ServiceOutageDetectionJob.class.getSimpleName(); + private static final String TAG = Log.tag(ServiceOutageDetectionJob.class); private static final String IP_SUCCESS = "127.0.0.1"; private static final String IP_FAILURE = "127.0.0.2"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java index dddf82ae3f..82249ae0fd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java @@ -43,7 +43,7 @@ public class SmsReceiveJob extends BaseJob { public static final String KEY = "SmsReceiveJob"; - private static final String TAG = SmsReceiveJob.class.getSimpleName(); + private static final String TAG = Log.tag(SmsReceiveJob.class); private static final String KEY_PDUS = "pdus"; private static final String KEY_SUBSCRIPTION_ID = "subscription_id"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java index 897d52b6eb..aeecdb29f5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSendJob.java @@ -10,6 +10,7 @@ import android.telephony.SmsManager; import androidx.annotation.NonNull; +import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MessageDatabase; import org.thoughtcrime.securesms.database.NoSuchMessageException; @@ -30,7 +31,7 @@ public class SmsSendJob extends SendJob { public static final String KEY = "SmsSendJob"; - private static final String TAG = SmsSendJob.class.getSimpleName(); + private static final String TAG = Log.tag(SmsSendJob.class); private static final int MAX_ATTEMPTS = 15; private static final String KEY_MESSAGE_ID = "message_id"; private static final String KEY_RUN_ATTEMPT = "run_attempt"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSentJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSentJob.java index 00cedd58c9..c186defb5b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSentJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsSentJob.java @@ -19,7 +19,7 @@ public class SmsSentJob extends BaseJob { public static final String KEY = "SmsSentJob"; - private static final String TAG = SmsSentJob.class.getSimpleName(); + private static final String TAG = Log.tag(SmsSentJob.class); private static final String KEY_MESSAGE_ID = "message_id"; private static final String KEY_ACTION = "action"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java index 2acb238a72..7c923960b7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java @@ -30,7 +30,7 @@ public class TrimThreadJob extends BaseJob { public static final String KEY = "TrimThreadJob"; - private static final String TAG = TrimThreadJob.class.getSimpleName(); + private static final String TAG = Log.tag(TrimThreadJob.class); private static final String KEY_THREAD_ID = "thread_id"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/TypingSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/TypingSendJob.java index 391b3e1356..25c0e29e3d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/TypingSendJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/TypingSendJob.java @@ -31,7 +31,7 @@ public class TypingSendJob extends BaseJob { public static final String KEY = "TypingSendJob"; - private static final String TAG = TypingSendJob.class.getSimpleName(); + private static final String TAG = Log.tag(TypingSendJob.class); private static final String KEY_THREAD_ID = "thread_id"; private static final String KEY_TYPING = "typing"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java index 2a61efacd5..759919b315 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java @@ -38,7 +38,7 @@ public class UpdateApkJob extends BaseJob { public static final String KEY = "UpdateApkJob"; - private static final String TAG = UpdateApkJob.class.getSimpleName(); + private static final String TAG = Log.tag(UpdateApkJob.class); public UpdateApkJob() { this(new Job.Parameters.Builder() diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java index cbccc6e450..0f29f4b9f2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java @@ -65,7 +65,7 @@ import okhttp3.Response; public class LinkPreviewRepository { - private static final String TAG = LinkPreviewRepository.class.getSimpleName(); + private static final String TAG = Log.tag(LinkPreviewRepository.class); private static final CacheControl NO_CACHE = new CacheControl.Builder().noCache().build(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java index 185d78da36..5931eacc55 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java @@ -26,7 +26,7 @@ import java.io.InputStream; class LongMessageRepository { - private final static String TAG = LongMessageRepository.class.getSimpleName(); + private final static String TAG = Log.tag(LongMessageRepository.class); private final MessageDatabase mmsDatabase; private final MessageDatabase smsDatabase; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Controller.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Controller.java index 193a0874c4..b562c3f177 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Controller.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Controller.java @@ -14,7 +14,7 @@ import java.util.List; class Camera1Controller { - private static final String TAG = Camera1Controller.class.getSimpleName(); + private static final String TAG = Log.tag(Camera1Controller.class); private final int screenWidth; private final int screenHeight; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java index e3d49c29e7..c94806f729 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java @@ -55,7 +55,7 @@ public class Camera1Fragment extends LoggingFragment implements CameraFragment, Camera1Controller.EventListener { - private static final String TAG = Camera1Fragment.class.getSimpleName(); + private static final String TAG = Log.tag(Camera1Fragment.class); private TextureView cameraPreview; private ViewGroup controlsContainer; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java index fc13ee7477..fa59fe2601 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java @@ -107,7 +107,7 @@ public class MediaSendActivity extends PassphraseRequiredActivity implements Med InputAwareLayout.OnKeyboardShownListener, InputAwareLayout.OnKeyboardHiddenListener { - private static final String TAG = MediaSendActivity.class.getSimpleName(); + private static final String TAG = Log.tag(MediaSendActivity.class); public static final String EXTRA_RESULT = "result"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java index 6abc0ee15a..3f235d9998 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java @@ -51,7 +51,7 @@ import java.util.Objects; */ class MediaSendViewModel extends ViewModel { - private static final String TAG = MediaSendViewModel.class.getSimpleName(); + private static final String TAG = Log.tag(MediaSendViewModel.class); private final Application application; private final MediaRepository repository; diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.java b/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.java index e8800f1120..0b630e26bd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.java @@ -41,7 +41,7 @@ import java.util.concurrent.atomic.AtomicInteger; public class IncomingMessageObserver { - private static final String TAG = IncomingMessageObserver.class.getSimpleName(); + private static final String TAG = Log.tag(IncomingMessageObserver.class); public static final int FOREGROUND_ID = 313399; private static final long REQUEST_TIMEOUT_MINUTES = 1; diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/RestStrategy.java b/app/src/main/java/org/thoughtcrime/securesms/messages/RestStrategy.java index f5541f5dfa..70fecb8310 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messages/RestStrategy.java +++ b/app/src/main/java/org/thoughtcrime/securesms/messages/RestStrategy.java @@ -115,6 +115,6 @@ public class RestStrategy extends MessageRetrievalStrategy { @Override public @NonNull String toString() { - return RestStrategy.class.getSimpleName(); + return Log.tag(RestStrategy.class); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java index 8c2278a268..37571c57b0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java @@ -76,7 +76,7 @@ import java.util.concurrent.ExecutionException; public class AttachmentManager { - private final static String TAG = AttachmentManager.class.getSimpleName(); + private final static String TAG = Log.tag(AttachmentManager.class); private final @NonNull Context context; private final @NonNull Stub attachmentViewStub; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java index bd1a999189..2f1ef3dc16 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java @@ -17,7 +17,7 @@ import java.io.InputStream; class AttachmentStreamLocalUriFetcher implements DataFetcher { - private static final String TAG = AttachmentStreamLocalUriFetcher.class.getSimpleName(); + private static final String TAG = Log.tag(AttachmentStreamLocalUriFetcher.class); private final File attachment; private final byte[] key; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/CompatMmsConnection.java b/app/src/main/java/org/thoughtcrime/securesms/mms/CompatMmsConnection.java index 701953011f..b2d291e8f5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/CompatMmsConnection.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/CompatMmsConnection.java @@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.transport.UndeliverableMessageException; import java.io.IOException; public class CompatMmsConnection implements OutgoingMmsConnection, IncomingMmsConnection { - private static final String TAG = CompatMmsConnection.class.getSimpleName(); + private static final String TAG = Log.tag(CompatMmsConnection.class); private Context context; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/ContactPhotoLocalUriFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/mms/ContactPhotoLocalUriFetcher.java index 374800a61e..33f232e7f3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/ContactPhotoLocalUriFetcher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/ContactPhotoLocalUriFetcher.java @@ -9,12 +9,14 @@ import android.provider.ContactsContract; import com.bumptech.glide.load.data.StreamLocalUriFetcher; +import org.signal.core.util.logging.Log; + import java.io.FileNotFoundException; import java.io.InputStream; class ContactPhotoLocalUriFetcher extends StreamLocalUriFetcher { - private static final String TAG = ContactPhotoLocalUriFetcher.class.getSimpleName(); + private static final String TAG = Log.tag(ContactPhotoLocalUriFetcher.class); ContactPhotoLocalUriFetcher(Context context, Uri uri) { super(context.getContentResolver(), uri); diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java index 1ff387f3a5..b4172dd5ce 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java @@ -18,7 +18,7 @@ import java.io.InputStream; class DecryptableStreamLocalUriFetcher extends StreamLocalUriFetcher { - private static final String TAG = DecryptableStreamLocalUriFetcher.class.getSimpleName(); + private static final String TAG = Log.tag(DecryptableStreamLocalUriFetcher.class); private Context context; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/ImageSlide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/ImageSlide.java index f2998834ca..ebec7d3f9d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/ImageSlide.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/ImageSlide.java @@ -24,6 +24,7 @@ import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.blurhash.BlurHash; @@ -34,7 +35,7 @@ public class ImageSlide extends Slide { private final boolean borderless; @SuppressWarnings("unused") - private static final String TAG = ImageSlide.class.getSimpleName(); + private static final String TAG = Log.tag(ImageSlide.class); public ImageSlide(@NonNull Context context, @NonNull Attachment attachment) { super(context, attachment); diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java b/app/src/main/java/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java index 7bccf2e1d6..b3144d539f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java @@ -42,7 +42,7 @@ import java.util.Arrays; @SuppressWarnings("deprecation") public class IncomingLegacyMmsConnection extends LegacyMmsConnection implements IncomingMmsConnection { - private static final String TAG = IncomingLegacyMmsConnection.class.getSimpleName(); + private static final String TAG = Log.tag(IncomingLegacyMmsConnection.class); public IncomingLegacyMmsConnection(Context context) throws ApnUnavailableException { super(context); diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java b/app/src/main/java/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java index b6576448ae..2bf5cc13d1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java @@ -49,7 +49,7 @@ import java.util.concurrent.TimeoutException; public class IncomingLollipopMmsConnection extends LollipopMmsConnection implements IncomingMmsConnection { public static final String ACTION = IncomingLollipopMmsConnection.class.getCanonicalName() + "MMS_DOWNLOADED_ACTION"; - private static final String TAG = IncomingLollipopMmsConnection.class.getSimpleName(); + private static final String TAG = Log.tag(IncomingLollipopMmsConnection.class); public IncomingLollipopMmsConnection(Context context) { super(context, ACTION); diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java b/app/src/main/java/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java index b4d1d82036..f2a2d37c52 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java @@ -67,7 +67,7 @@ public abstract class LegacyMmsConnection { public static final String USER_AGENT = "Android-Mms/2.0"; - private static final String TAG = LegacyMmsConnection.class.getSimpleName(); + private static final String TAG = Log.tag(LegacyMmsConnection.class); protected final Context context; protected final Apn apn; @@ -302,7 +302,7 @@ public abstract class LegacyMmsConnection { @Override public @NonNull String toString() { - return Apn.class.getSimpleName() + + return Log.tag(Apn.class) + "{ mmsc: \"" + mmsc + "\"" + ", proxy: " + (proxy == null ? "none" : '"' + proxy + '"') + ", port: " + (port == null ? "(none)" : port) + diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/LollipopMmsConnection.java b/app/src/main/java/org/thoughtcrime/securesms/mms/LollipopMmsConnection.java index cdd8052f49..982142980a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/LollipopMmsConnection.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/LollipopMmsConnection.java @@ -28,7 +28,7 @@ import org.thoughtcrime.securesms.util.Util; import java.util.concurrent.TimeoutException; public abstract class LollipopMmsConnection extends BroadcastReceiver { - private static final String TAG = LollipopMmsConnection.class.getSimpleName(); + private static final String TAG = Log.tag(LollipopMmsConnection.class); private final Context context; private final String action; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java b/app/src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java index 5810a18411..54184ea8de 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.io.InputStream; public abstract class MediaConstraints { - private static final String TAG = MediaConstraints.class.getSimpleName(); + private static final String TAG = Log.tag(MediaConstraints.class); public static MediaConstraints getPushMediaConstraints() { return new PushMediaConstraints(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/MmsRadio.java b/app/src/main/java/org/thoughtcrime/securesms/mms/MmsRadio.java index 456b060050..ed9a288f5c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/MmsRadio.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/MmsRadio.java @@ -16,7 +16,7 @@ import java.lang.reflect.Method; public class MmsRadio { - private static final String TAG = MmsRadio.class.getSimpleName(); + private static final String TAG = Log.tag(MmsRadio.class); private static MmsRadio instance; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingLegacyMmsConnection.java b/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingLegacyMmsConnection.java index 39d8144af0..e3f560d35d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingLegacyMmsConnection.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingLegacyMmsConnection.java @@ -41,7 +41,7 @@ import java.io.IOException; @SuppressWarnings("deprecation") public class OutgoingLegacyMmsConnection extends LegacyMmsConnection implements OutgoingMmsConnection { - private final static String TAG = OutgoingLegacyMmsConnection.class.getSimpleName(); + private final static String TAG = Log.tag(OutgoingLegacyMmsConnection.class); public OutgoingLegacyMmsConnection(Context context) throws ApnUnavailableException { super(context); diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java b/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java index 7735dfeaf5..a2371cae78 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java @@ -41,7 +41,7 @@ import java.io.IOException; import java.util.concurrent.TimeoutException; public class OutgoingLollipopMmsConnection extends LollipopMmsConnection implements OutgoingMmsConnection { - private static final String TAG = OutgoingLollipopMmsConnection.class.getSimpleName(); + private static final String TAG = Log.tag(OutgoingLollipopMmsConnection.class); private static final String ACTION = OutgoingLollipopMmsConnection.class.getCanonicalName() + "MMS_SENT_ACTION"; private byte[] response; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/QuoteId.java b/app/src/main/java/org/thoughtcrime/securesms/mms/QuoteId.java index 42622ed60c..0f27690cdc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/QuoteId.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/QuoteId.java @@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.recipients.RecipientId; */ public class QuoteId { - private static final String TAG = QuoteId.class.getSimpleName(); + private static final String TAG = Log.tag(QuoteId.class); private static final String ID = "id"; private static final String AUTHOR_DEPRECATED = "author"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java index e0addf4471..0c7d952219 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java @@ -29,7 +29,7 @@ import okhttp3.Response; public class ChunkedDataFetcher { - private static final String TAG = ChunkedDataFetcher.class.getSimpleName(); + private static final String TAG = Log.tag(ChunkedDataFetcher.class); private static final CacheControl NO_CACHE = new CacheControl.Builder().noCache().build(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/ContentProxySelector.java b/app/src/main/java/org/thoughtcrime/securesms/net/ContentProxySelector.java index db77bf900f..061a414031 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/net/ContentProxySelector.java +++ b/app/src/main/java/org/thoughtcrime/securesms/net/ContentProxySelector.java @@ -18,7 +18,7 @@ import java.util.Set; public class ContentProxySelector extends ProxySelector { - private static final String TAG = ContentProxySelector.class.getSimpleName(); + private static final String TAG = Log.tag(ContentProxySelector.class); public static final Set WHITELISTED_DOMAINS = new HashSet<>(); static { diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java index 20a11e6111..a44199bf3e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java @@ -11,6 +11,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.app.NotificationCompat; +import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.preferences.widgets.NotificationPrivacyPreference; @@ -21,7 +22,7 @@ import org.thoughtcrime.securesms.util.Util; public abstract class AbstractNotificationBuilder extends NotificationCompat.Builder { @SuppressWarnings("unused") - private static final String TAG = AbstractNotificationBuilder.class.getSimpleName(); + private static final String TAG = Log.tag(AbstractNotificationBuilder.class); private static final int MAX_DISPLAY_LENGTH = 500; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java index e91ac95e05..0496361270 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java @@ -96,7 +96,7 @@ import me.leolin.shortcutbadger.ShortcutBadger; */ public class DefaultMessageNotifier implements MessageNotifier { - private static final String TAG = DefaultMessageNotifier.class.getSimpleName(); + private static final String TAG = Log.tag(DefaultMessageNotifier.class); public static final String EXTRA_REMOTE_REPLY = "extra_remote_reply"; public static final String NOTIFICATION_GROUP = "messages"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java index b5bfc9130e..8bb674b30b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java @@ -29,7 +29,7 @@ import java.util.Map; public class MarkReadReceiver extends BroadcastReceiver { - private static final String TAG = MarkReadReceiver.class.getSimpleName(); + private static final String TAG = Log.tag(MarkReadReceiver.class); public static final String CLEAR_ACTION = "org.thoughtcrime.securesms.notifications.CLEAR"; public static final String THREAD_IDS_EXTRA = "thread_ids"; public static final String NOTIFICATION_ID_EXTRA = "notification_id"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationState.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationState.java index be3d10ac88..2f905d45d9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationState.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationState.java @@ -23,7 +23,7 @@ import java.util.List; public class NotificationState { - private static final String TAG = NotificationState.class.getSimpleName(); + private static final String TAG = Log.tag(NotificationState.class); private final Comparator notificationItemComparator = (a, b) -> -Long.compare(a.getTimestamp(), b.getTimestamp()); private final List notifications = new LinkedList<>(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java index 36dc9daa62..708ad73e39 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java @@ -27,6 +27,7 @@ import android.os.Bundle; import androidx.core.app.RemoteInput; import org.signal.core.util.concurrent.SignalExecutors; +import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MessageDatabase.MarkedMessageInfo; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; @@ -46,7 +47,7 @@ import java.util.List; */ public class RemoteReplyReceiver extends BroadcastReceiver { - public static final String TAG = RemoteReplyReceiver.class.getSimpleName(); + public static final String TAG = Log.tag(RemoteReplyReceiver.class); public static final String REPLY_ACTION = "org.thoughtcrime.securesms.notifications.WEAR_REPLY"; public static final String RECIPIENT_EXTRA = "recipient_extra"; public static final String REPLY_METHOD = "reply_method"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java index 3cc449fdcc..05b3518d9c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java @@ -50,7 +50,7 @@ import java.util.concurrent.ExecutionException; public class SingleRecipientNotificationBuilder extends AbstractNotificationBuilder { - private static final String TAG = SingleRecipientNotificationBuilder.class.getSimpleName(); + private static final String TAG = Log.tag(SingleRecipientNotificationBuilder.class); private static final int BIG_PICTURE_DIMEN = 500; private static final int LARGE_ICON_DIMEN = 250; diff --git a/app/src/main/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java b/app/src/main/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java index cff9a53a52..1ca1560757 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/phonenumbers/PhoneNumberFormatter.java @@ -29,7 +29,7 @@ import java.util.regex.Pattern; public class PhoneNumberFormatter { - private static final String TAG = PhoneNumberFormatter.class.getSimpleName(); + private static final String TAG = Log.tag(PhoneNumberFormatter.class); private static final Set SHORT_COUNTRIES = new HashSet() {{ add("NU"); diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java index f743e8c0b0..f181b06fc6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java @@ -45,7 +45,7 @@ import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedE import java.io.IOException; public class AdvancedPreferenceFragment extends CorrectedPreferenceFragment { - private static final String TAG = AdvancedPreferenceFragment.class.getSimpleName(); + private static final String TAG = Log.tag(AdvancedPreferenceFragment.class); private static final String PUSH_MESSAGING_PREF = "pref_toggle_push_messaging"; private static final String SUBMIT_DEBUG_LOG_PREF = "pref_submit_debug_logs"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/MmsPreferencesFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/MmsPreferencesFragment.java index c1b83673f6..2ec79f35e2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/MmsPreferencesFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/MmsPreferencesFragment.java @@ -36,7 +36,7 @@ import java.io.IOException; public class MmsPreferencesFragment extends CorrectedPreferenceFragment { - private static final String TAG = MmsPreferencesFragment.class.getSimpleName(); + private static final String TAG = Log.tag(MmsPreferencesFragment.class); @Override public void onCreate(Bundle paramBundle) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java index 2a63a896b8..f400d98778 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java @@ -15,6 +15,7 @@ import androidx.annotation.Nullable; import androidx.preference.ListPreference; import androidx.preference.Preference; +import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.ApplicationPreferencesActivity; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.components.SwitchPreferenceCompat; @@ -28,7 +29,7 @@ import static android.app.Activity.RESULT_OK; public class NotificationsPreferenceFragment extends ListSummaryPreferenceFragment { @SuppressWarnings("unused") - private static final String TAG = NotificationsPreferenceFragment.class.getSimpleName(); + private static final String TAG = Log.tag(NotificationsPreferenceFragment.class); @Override public void onCreate(Bundle paramBundle) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreference.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreference.java index 87e28cf8da..aec8186494 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreference.java +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreference.java @@ -18,11 +18,12 @@ import com.takisoft.colorpicker.ColorPickerDialog; import com.takisoft.colorpicker.ColorPickerDialog.Size; import com.takisoft.colorpicker.ColorStateDrawable; +import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.R; public class ColorPickerPreference extends DialogPreference { - private static final String TAG = ColorPickerPreference.class.getSimpleName(); + private static final String TAG = Log.tag(ColorPickerPreference.class); private int[] colors; private CharSequence[] colorDescriptions; diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/LEDColorListPreference.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/LEDColorListPreference.java index 4d22931861..7bfaabc0d1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/LEDColorListPreference.java +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/LEDColorListPreference.java @@ -25,6 +25,7 @@ import androidx.annotation.NonNull; import androidx.preference.ListPreference; import androidx.preference.PreferenceViewHolder; +import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.R; /** @@ -35,7 +36,7 @@ import org.thoughtcrime.securesms.R; public class LEDColorListPreference extends ListPreference { - private static final String TAG = LEDColorListPreference.class.getSimpleName(); + private static final String TAG = Log.tag(LEDColorListPreference.class); private ImageView colorImageView; diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/SystemProfileUtil.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/SystemProfileUtil.java index 93376383d6..946e2934e8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/profiles/SystemProfileUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/SystemProfileUtil.java @@ -23,7 +23,7 @@ import org.thoughtcrime.securesms.util.concurrent.SettableFuture; public class SystemProfileUtil { - private static final String TAG = SystemProfileUtil.class.getSimpleName(); + private static final String TAG = Log.tag(SystemProfileUtil.class); @SuppressLint("StaticFieldLeak") public static ListenableFuture getSystemProfileAvatar(final @NonNull Context context, MediaConstraints mediaConstraints) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/providers/BlobProvider.java b/app/src/main/java/org/thoughtcrime/securesms/providers/BlobProvider.java index 37c3ab8968..794544b6d3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/providers/BlobProvider.java +++ b/app/src/main/java/org/thoughtcrime/securesms/providers/BlobProvider.java @@ -42,7 +42,7 @@ import java.util.concurrent.atomic.AtomicReference; */ public class BlobProvider { - private static final String TAG = BlobProvider.class.getSimpleName(); + private static final String TAG = Log.tag(BlobProvider.class); private static final String MULTI_SESSION_DIRECTORY = "multi_session_blobs"; private static final String SINGLE_SESSION_DIRECTORY = "single_session_blobs"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/providers/MmsBodyProvider.java b/app/src/main/java/org/thoughtcrime/securesms/providers/MmsBodyProvider.java index 30b244f275..0085663bcd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/providers/MmsBodyProvider.java +++ b/app/src/main/java/org/thoughtcrime/securesms/providers/MmsBodyProvider.java @@ -35,7 +35,7 @@ import java.io.InputStream; import java.io.OutputStream; public final class MmsBodyProvider extends BaseContentProvider { - private static final String TAG = MmsBodyProvider.class.getSimpleName(); + private static final String TAG = Log.tag(MmsBodyProvider.class); private static final String CONTENT_AUTHORITY = BuildConfig.APPLICATION_ID + ".mms"; private static final String CONTENT_URI_STRING = "content://" + CONTENT_AUTHORITY + "/mms"; public static final Uri CONTENT_URI = Uri.parse(CONTENT_URI_STRING); diff --git a/app/src/main/java/org/thoughtcrime/securesms/push/AccountManagerFactory.java b/app/src/main/java/org/thoughtcrime/securesms/push/AccountManagerFactory.java index 5ce93c9eaa..8e52fae15b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/push/AccountManagerFactory.java +++ b/app/src/main/java/org/thoughtcrime/securesms/push/AccountManagerFactory.java @@ -16,7 +16,7 @@ import java.util.UUID; public class AccountManagerFactory { - private static final String TAG = AccountManagerFactory.class.getSimpleName(); + private static final String TAG = Log.tag(AccountManagerFactory.class); public static @NonNull SignalServiceAccountManager createAuthenticated(@NonNull Context context, @NonNull UUID uuid, diff --git a/app/src/main/java/org/thoughtcrime/securesms/push/SecurityEventListener.java b/app/src/main/java/org/thoughtcrime/securesms/push/SecurityEventListener.java index cbb7bd0fe0..0e6ad6f8e0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/push/SecurityEventListener.java +++ b/app/src/main/java/org/thoughtcrime/securesms/push/SecurityEventListener.java @@ -2,13 +2,14 @@ package org.thoughtcrime.securesms.push; import android.content.Context; +import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.crypto.SecurityEvent; import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.push.SignalServiceAddress; public class SecurityEventListener implements SignalServiceMessageSender.EventListener { - private static final String TAG = SecurityEventListener.class.getSimpleName(); + private static final String TAG = Log.tag(SecurityEventListener.class); private final Context context; diff --git a/app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.java b/app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.java index 61d2ae2e00..19c73940b0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.java +++ b/app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.java @@ -7,6 +7,7 @@ import com.annimon.stream.Stream; import androidx.annotation.Nullable; +import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.BuildConfig; import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.thoughtcrime.securesms.net.CustomDns; @@ -44,7 +45,7 @@ import okhttp3.TlsVersion; public class SignalServiceNetworkAccess { @SuppressWarnings("unused") - private static final String TAG = SignalServiceNetworkAccess.class.getSimpleName(); + private static final String TAG = Log.tag(SignalServiceNetworkAccess.class); public static final Dns DNS = new SequentialDns(Dns.SYSTEM, new CustomDns("1.1.1.1")); diff --git a/app/src/main/java/org/thoughtcrime/securesms/qr/ScanningThread.java b/app/src/main/java/org/thoughtcrime/securesms/qr/ScanningThread.java index d591a3ee7b..ecb1d2e2fb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/qr/ScanningThread.java +++ b/app/src/main/java/org/thoughtcrime/securesms/qr/ScanningThread.java @@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicReference; public class ScanningThread extends Thread implements CameraView.PreviewCallback { - private static final String TAG = ScanningThread.class.getSimpleName(); + private static final String TAG = Log.tag(ScanningThread.class); private final QRCodeReader reader = new QRCodeReader(); private final AtomicReference scanListener = new AtomicReference<>(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java index 2f3f78c216..36aff425d1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java @@ -54,7 +54,7 @@ import static org.thoughtcrime.securesms.database.SearchDatabase.SNIPPET_WRAP; */ public class SearchRepository { - private static final String TAG = SearchRepository.class.getSimpleName(); + private static final String TAG = Log.tag(SearchRepository.class); private static final Set BANNED_CHARACTERS = new HashSet<>(); static { diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/ApplicationMigrationService.java b/app/src/main/java/org/thoughtcrime/securesms/service/ApplicationMigrationService.java index 81e9184976..8a37a7079b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/ApplicationMigrationService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/ApplicationMigrationService.java @@ -17,6 +17,7 @@ import android.os.PowerManager.WakeLock; import androidx.core.app.NotificationCompat; +import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.MainActivity; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.database.SmsMigrator; @@ -32,7 +33,7 @@ import java.util.concurrent.Executors; public class ApplicationMigrationService extends Service implements SmsMigrator.SmsMigrationProgressListener { - private static final String TAG = ApplicationMigrationService.class.getSimpleName(); + private static final String TAG = Log.tag(ApplicationMigrationService.class); public static final String MIGRATE_DATABASE = "org.thoughtcrime.securesms.ApplicationMigration.MIGRATE_DATABSE"; public static final String COMPLETED_ACTION = "org.thoughtcrime.securesms.ApplicationMigrationService.COMPLETED"; private static final String PREFERENCES_NAME = "SecureSMS"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/DirectShareService.java b/app/src/main/java/org/thoughtcrime/securesms/service/DirectShareService.java index 329ee054ec..d66ccc5c78 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/DirectShareService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/DirectShareService.java @@ -44,7 +44,7 @@ import java.util.concurrent.ExecutionException; public class DirectShareService extends ChooserTargetService { - private static final String TAG = DirectShareService.class.getSimpleName(); + private static final String TAG = Log.tag(DirectShareService.class); private static final int MAX_TARGETS = 10; @Override diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java b/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java index 9a133f7647..5daa247f6b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java @@ -16,7 +16,7 @@ import java.util.concurrent.Executors; public class ExpiringMessageManager { - private static final String TAG = ExpiringMessageManager.class.getSimpleName(); + private static final String TAG = Log.tag(ExpiringMessageManager.class); private final TreeSet expiringMessageReferences = new TreeSet<>(new ExpiringMessageComparator()); private final Executor executor = Executors.newSingleThreadExecutor(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java b/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java index e06ad8cd79..a3f7ea7219 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java @@ -58,7 +58,7 @@ import java.util.concurrent.TimeUnit; public class KeyCachingService extends Service { - private static final String TAG = KeyCachingService.class.getSimpleName(); + private static final String TAG = Log.tag(KeyCachingService.class); public static final int SERVICE_RUNNING_ID = 4141; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/MmsListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/MmsListener.java index f3ad7bd149..3746233ae0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/MmsListener.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/MmsListener.java @@ -28,7 +28,7 @@ import org.thoughtcrime.securesms.util.Util; public class MmsListener extends BroadcastReceiver { - private static final String TAG = MmsListener.class.getSimpleName(); + private static final String TAG = Log.tag(MmsListener.class); private boolean isRelevant(Context context, Intent intent) { if (!ApplicationMigrationService.isDatabaseImported(context)) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java index 5aec76f97f..0a6f73511a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java @@ -11,7 +11,7 @@ import org.signal.core.util.logging.Log; public abstract class PersistentAlarmManagerListener extends BroadcastReceiver { - private static final String TAG = PersistentAlarmManagerListener.class.getSimpleName(); + private static final String TAG = Log.tag(PersistentAlarmManagerListener.class); protected abstract long getNextScheduledExecutionTime(Context context); protected abstract long onAlarm(Context context, long scheduledTime); diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/PersistentConnectionBootListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/PersistentConnectionBootListener.java index feeefb7a85..cd855f64eb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/PersistentConnectionBootListener.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/PersistentConnectionBootListener.java @@ -9,7 +9,7 @@ import org.signal.core.util.logging.Log; public class PersistentConnectionBootListener extends BroadcastReceiver { - private static final String TAG = PersistentConnectionBootListener.class.getSimpleName(); + private static final String TAG = Log.tag(PersistentConnectionBootListener.class); @Override public void onReceive(Context context, Intent intent) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/QuickResponseService.java b/app/src/main/java/org/thoughtcrime/securesms/service/QuickResponseService.java index 42383b9a64..a4d5e22282 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/QuickResponseService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/QuickResponseService.java @@ -18,7 +18,7 @@ import java.net.URLDecoder; public class QuickResponseService extends IntentService { - private static final String TAG = QuickResponseService.class.getSimpleName(); + private static final String TAG = Log.tag(QuickResponseService.class); public QuickResponseService() { super("QuickResponseService"); diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/SmsDeliveryListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/SmsDeliveryListener.java index c4429b2155..6227621951 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/SmsDeliveryListener.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/SmsDeliveryListener.java @@ -13,7 +13,7 @@ import org.thoughtcrime.securesms.jobs.SmsSentJob; public class SmsDeliveryListener extends BroadcastReceiver { - private static final String TAG = SmsDeliveryListener.class.getSimpleName(); + private static final String TAG = Log.tag(SmsDeliveryListener.class); public static final String SENT_SMS_ACTION = "org.thoughtcrime.securesms.SendReceiveService.SENT_SMS_ACTION"; public static final String DELIVERED_SMS_ACTION = "org.thoughtcrime.securesms.SendReceiveService.DELIVERED_SMS_ACTION"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java index 3cbd11403b..2428c1fc0d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java @@ -29,7 +29,7 @@ import java.security.MessageDigest; public class UpdateApkReadyListener extends BroadcastReceiver { - private static final String TAG = UpdateApkReadyListener.class.getSimpleName(); + private static final String TAG = Log.tag(UpdateApkReadyListener.class); @Override public void onReceive(Context context, Intent intent) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java index b125b1c53a..9a580f88b3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java @@ -14,7 +14,7 @@ import java.util.concurrent.TimeUnit; public class UpdateApkRefreshListener extends PersistentAlarmManagerListener { - private static final String TAG = UpdateApkRefreshListener.class.getSimpleName(); + private static final String TAG = Log.tag(UpdateApkRefreshListener.class); private static final long INTERVAL = TimeUnit.HOURS.toMillis(6); diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java b/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java index dcb375d9a6..fba10f50c3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java @@ -96,7 +96,7 @@ public class WebRtcCallService extends Service implements CallManager.Observer, GroupCall.Observer { - private static final String TAG = WebRtcCallService.class.getSimpleName(); + private static final String TAG = Log.tag(WebRtcCallService.class); public static final String EXTRA_MUTE = "mute_value"; public static final String EXTRA_AVAILABLE = "enabled_value"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/sharing/ShareActivity.java b/app/src/main/java/org/thoughtcrime/securesms/sharing/ShareActivity.java index b6fe18faa2..24912b94b3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/sharing/ShareActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/sharing/ShareActivity.java @@ -80,7 +80,7 @@ public class ShareActivity extends PassphraseRequiredActivity implements ContactSelectionListFragment.OnContactSelectedListener, ContactSelectionListFragment.OnSelectionLimitReachedListener { - private static final String TAG = ShareActivity.class.getSimpleName(); + private static final String TAG = Log.tag(ShareActivity.class); private static final short RESULT_TEXT_CONFIRMATION = 1; private static final short RESULT_MEDIA_CONFIRMATION = 2; diff --git a/app/src/main/java/org/thoughtcrime/securesms/sms/IncomingTextMessage.java b/app/src/main/java/org/thoughtcrime/securesms/sms/IncomingTextMessage.java index 0c978f0935..d00b617fa1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/sms/IncomingTextMessage.java +++ b/app/src/main/java/org/thoughtcrime/securesms/sms/IncomingTextMessage.java @@ -7,6 +7,7 @@ import android.telephony.SmsMessage; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.groups.GroupId; import org.thoughtcrime.securesms.recipients.RecipientId; import org.whispersystems.libsignal.util.guava.Optional; @@ -27,7 +28,7 @@ public class IncomingTextMessage implements Parcelable { return new IncomingTextMessage[size]; } }; - private static final String TAG = IncomingTextMessage.class.getSimpleName(); + private static final String TAG = Log.tag(IncomingTextMessage.class); private final String message; private final RecipientId sender; diff --git a/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java b/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java index a0b364548f..50bb256248 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java +++ b/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java @@ -84,7 +84,7 @@ import java.util.List; public class MessageSender { - private static final String TAG = MessageSender.class.getSimpleName(); + private static final String TAG = Log.tag(MessageSender.class); /** * Suitable for a 1:1 conversation or a GV1 group only. diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/AbstractCursorLoader.java b/app/src/main/java/org/thoughtcrime/securesms/util/AbstractCursorLoader.java index d1fa111045..5b4b8bf8e8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/AbstractCursorLoader.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/AbstractCursorLoader.java @@ -15,7 +15,7 @@ import org.signal.core.util.logging.Log; public abstract class AbstractCursorLoader extends AsyncTaskLoader { @SuppressWarnings("unused") - private static final String TAG = AbstractCursorLoader.class.getSimpleName(); + private static final String TAG = Log.tag(AbstractCursorLoader.class); @SuppressLint("StaticFieldLeak") protected final Context context; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/AlarmSleepTimer.java b/app/src/main/java/org/thoughtcrime/securesms/util/AlarmSleepTimer.java index 4341868d65..3004f97c30 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/AlarmSleepTimer.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/AlarmSleepTimer.java @@ -20,7 +20,7 @@ import java.util.concurrent.ConcurrentSkipListSet; * */ public class AlarmSleepTimer implements SleepTimer { - private static final String TAG = AlarmSleepTimer.class.getSimpleName(); + private static final String TAG = Log.tag(AlarmSleepTimer.class); private static ConcurrentSkipListSet actionIdList = new ConcurrentSkipListSet<>(); private final Context context; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java index b00b356568..ca5ea64451 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java @@ -24,7 +24,7 @@ import java.util.Set; public class AttachmentUtil { - private static final String TAG = AttachmentUtil.class.getSimpleName(); + private static final String TAG = Log.tag(AttachmentUtil.class); @WorkerThread public static boolean isAutoDownloadPermitted(@NonNull Context context, @Nullable DatabaseAttachment attachment) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.java index d236088337..9a4690b72b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.java @@ -33,7 +33,7 @@ import java.util.Objects; public class BackupUtil { - private static final String TAG = BackupUtil.class.getSimpleName(); + private static final String TAG = Log.tag(BackupUtil.class); public static final int PASSPHRASE_LENGTH = 30; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/BitmapUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/BitmapUtil.java index 6ff81f689b..33cf9b0c2e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/BitmapUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/BitmapUtil.java @@ -41,7 +41,7 @@ import javax.microedition.khronos.egl.EGLDisplay; public class BitmapUtil { - private static final String TAG = BitmapUtil.class.getSimpleName(); + private static final String TAG = Log.tag(BitmapUtil.class); private static final int MAX_COMPRESSION_QUALITY = 90; private static final int MIN_COMPRESSION_QUALITY = 45; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java b/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java index 5a892bc07c..ad61ec7456 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java @@ -40,7 +40,7 @@ import java.util.concurrent.TimeUnit; public class DateUtils extends android.text.format.DateUtils { @SuppressWarnings("unused") - private static final String TAG = DateUtils.class.getSimpleName(); + private static final String TAG = Log.tag(DateUtils.class); private static final ThreadLocal DATE_FORMAT = new ThreadLocal<>(); private static final ThreadLocal BRIEF_EXACT_FORMAT = new ThreadLocal<>(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java index 845369d232..437e988e20 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java @@ -48,7 +48,7 @@ import java.util.concurrent.ExecutionException; public class MediaUtil { - private static final String TAG = MediaUtil.class.getSimpleName(); + private static final String TAG = Log.tag(MediaUtil.class); public static final String IMAGE_PNG = "image/png"; public static final String IMAGE_JPEG = "image/jpeg"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/PlayServicesUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/PlayServicesUtil.java index 07928f3da1..60143358b6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/PlayServicesUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/PlayServicesUtil.java @@ -12,7 +12,7 @@ import org.signal.core.util.logging.Log; public class PlayServicesUtil { - private static final String TAG = PlayServicesUtil.class.getSimpleName(); + private static final String TAG = Log.tag(PlayServicesUtil.class); public enum PlayServicesStatus { SUCCESS, diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java index 0e8e55d681..c07c93a464 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java @@ -36,7 +36,7 @@ import java.util.Objects; import java.util.concurrent.TimeUnit; public class SaveAttachmentTask extends ProgressDialogAsyncTask> { - private static final String TAG = SaveAttachmentTask.class.getSimpleName(); + private static final String TAG = Log.tag(SaveAttachmentTask.class); static final int SUCCESS = 0; private static final int FAILURE = 1; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ShortCodeUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ShortCodeUtil.java index 08a86bd413..9621324f63 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/ShortCodeUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/ShortCodeUtil.java @@ -14,7 +14,7 @@ import java.util.Set; public class ShortCodeUtil { - private static final String TAG = ShortCodeUtil.class.getSimpleName(); + private static final String TAG = Log.tag(ShortCodeUtil.class); private static final Set SHORT_COUNTRIES = new HashSet() {{ add("NU"); diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SignalUncaughtExceptionHandler.java b/app/src/main/java/org/thoughtcrime/securesms/util/SignalUncaughtExceptionHandler.java index 5ad6da99eb..5dd072c54a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SignalUncaughtExceptionHandler.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SignalUncaughtExceptionHandler.java @@ -8,7 +8,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore; public class SignalUncaughtExceptionHandler implements Thread.UncaughtExceptionHandler { - private static final String TAG = SignalUncaughtExceptionHandler.class.getSimpleName(); + private static final String TAG = Log.tag(SignalUncaughtExceptionHandler.class); private final Thread.UncaughtExceptionHandler originalHandler; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SingleLiveEvent.java b/app/src/main/java/org/thoughtcrime/securesms/util/SingleLiveEvent.java index 3f6a7f13b8..38081253bb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SingleLiveEvent.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SingleLiveEvent.java @@ -39,7 +39,7 @@ import java.util.concurrent.atomic.AtomicBoolean; */ public class SingleLiveEvent extends MutableLiveData { - private static final String TAG = SingleLiveEvent.class.getSimpleName(); + private static final String TAG = Log.tag(SingleLiveEvent.class); private final AtomicBoolean mPending = new AtomicBoolean(false); diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java b/app/src/main/java/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java index c3854d4362..65db7dd74b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java @@ -22,7 +22,7 @@ import org.signal.core.util.logging.Log; public class SmsCharacterCalculator extends CharacterCalculator { - private static final String TAG = SmsCharacterCalculator.class.getSimpleName(); + private static final String TAG = Log.tag(SmsCharacterCalculator.class); @Override public CharacterState calculateCharacters(String messageBody) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/TelephonyUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/TelephonyUtil.java index 06de5e97da..982921de41 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/TelephonyUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/TelephonyUtil.java @@ -12,7 +12,7 @@ import org.signal.core.util.logging.Log; import java.util.Locale; public class TelephonyUtil { - private static final String TAG = TelephonyUtil.class.getSimpleName(); + private static final String TAG = Log.tag(TelephonyUtil.class); public static TelephonyManager getManager(final Context context) { return (TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE); diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java index dbbe94dd50..4f27cd446d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java @@ -38,7 +38,7 @@ import java.util.UUID; public class TextSecurePreferences { - private static final String TAG = TextSecurePreferences.class.getSimpleName(); + private static final String TAG = Log.tag(TextSecurePreferences.class); public static final String IDENTITY_PREF = "pref_choose_identity"; public static final String CHANGE_PASSPHRASE_PREF = "pref_change_passphrase"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/Util.java b/app/src/main/java/org/thoughtcrime/securesms/util/Util.java index c1eb02af67..afa678325d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/Util.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/Util.java @@ -66,7 +66,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; public class Util { - private static final String TAG = Util.class.getSimpleName(); + private static final String TAG = Log.tag(Util.class); private static final long BUILD_LIFESPAN = TimeUnit.DAYS.toMillis(90); diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/WakeLockUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/WakeLockUtil.java index a4e5273714..471ecaaed4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/WakeLockUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/WakeLockUtil.java @@ -11,7 +11,7 @@ import org.signal.core.util.logging.Log; public class WakeLockUtil { - private static final String TAG = WakeLockUtil.class.getSimpleName(); + private static final String TAG = Log.tag(WakeLockUtil.class); /** * Run a runnable with a wake lock. Ensures that the lock is safely acquired and released. diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/VoiceCallShare.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/VoiceCallShare.java index 881c246271..5f0b3d210f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/VoiceCallShare.java +++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/VoiceCallShare.java @@ -7,6 +7,7 @@ import android.os.Bundle; import android.provider.ContactsContract; import android.text.TextUtils; +import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.WebRtcCallActivity; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.ringrtc.RemotePeer; @@ -16,7 +17,7 @@ import org.whispersystems.signalservice.api.messages.calls.OfferMessage; public class VoiceCallShare extends Activity { - private static final String TAG = VoiceCallShare.class.getSimpleName(); + private static final String TAG = Log.tag(VoiceCallShare.class); @Override public void onCreate(Bundle icicle) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java index e9ba762af3..d1f83077ea 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java +++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java @@ -21,7 +21,7 @@ import java.io.IOException; public class IncomingRinger { - private static final String TAG = IncomingRinger.class.getSimpleName(); + private static final String TAG = Log.tag(IncomingRinger.class); private static final long[] VIBRATE_PATTERN = {0, 1000, 1000}; diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java index 8d682b9a0b..bfc66b3063 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java +++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java @@ -16,7 +16,7 @@ import java.io.IOException; public class OutgoingRinger { - private static final String TAG = OutgoingRinger.class.getSimpleName(); + private static final String TAG = Log.tag(OutgoingRinger.class); public enum Type { RINGING, diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java index cd2c4e19b7..ec6a7bc46a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java @@ -9,13 +9,14 @@ import android.net.Uri; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.util.ServiceUtil; public class SignalAudioManager { @SuppressWarnings("unused") - private static final String TAG = SignalAudioManager.class.getSimpleName(); + private static final String TAG = Log.tag(SignalAudioManager.class); private final Context context; private final IncomingRinger incomingRinger; diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/locks/LockManager.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/locks/LockManager.java index 83be6fa501..d9abd8239d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/locks/LockManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/locks/LockManager.java @@ -14,7 +14,7 @@ import org.signal.core.util.logging.Log; */ public class LockManager { - private static final String TAG = LockManager.class.getSimpleName(); + private static final String TAG = Log.tag(LockManager.class); private final PowerManager.WakeLock fullLock; private final PowerManager.WakeLock partialLock; diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/locks/ProximityLock.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/locks/ProximityLock.java index d732eef2bc..dde1884b97 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/locks/ProximityLock.java +++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/locks/ProximityLock.java @@ -17,7 +17,7 @@ import java.lang.reflect.Method; */ class ProximityLock { - private static final String TAG = ProximityLock.class.getSimpleName(); + private static final String TAG = Log.tag(ProximityLock.class); private final Method wakelockParameterizedRelease = getWakelockParamterizedReleaseMethod(); private final Optional proximityLock;