Use Log.tag where appropriate.

This commit is contained in:
Greyson Parrelli
2021-03-29 18:37:22 -04:00
committed by Alex Hart
parent 2144dc3b67
commit b053fbc4a7
251 changed files with 313 additions and 253 deletions

View File

@@ -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<View> attachmentViewStub;

View File

@@ -17,7 +17,7 @@ import java.io.InputStream;
class AttachmentStreamLocalUriFetcher implements DataFetcher<InputStream> {
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;

View File

@@ -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;

View File

@@ -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);

View File

@@ -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;

View File

@@ -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);

View File

@@ -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);

View File

@@ -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);

View File

@@ -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) +

View File

@@ -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;

View File

@@ -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();

View File

@@ -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;

View File

@@ -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);

View File

@@ -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;

View File

@@ -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";