From b4191ee5ccda2838eaa0ed90ef7c4c4190279049 Mon Sep 17 00:00:00 2001 From: Alan Evans Date: Mon, 11 May 2020 10:19:00 -0300 Subject: [PATCH] Fix usages of service logging in app. --- app/lint.xml | 2 +- .../mediasend/camerax/TextureViewImplementation.java | 2 +- .../securesms/notifications/AndroidAutoHeardReceiver.java | 4 ++-- .../securesms/notifications/AndroidAutoReplyReceiver.java | 4 ++-- .../securesms/notifications/NotificationChannels.java | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/lint.xml b/app/lint.xml index 78c9727387..d6dae28afa 100644 --- a/app/lint.xml +++ b/app/lint.xml @@ -19,7 +19,7 @@ - + diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/TextureViewImplementation.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/TextureViewImplementation.java index c456de15ac..ccc76669c8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/TextureViewImplementation.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/TextureViewImplementation.java @@ -41,7 +41,7 @@ import androidx.core.util.Preconditions; import com.google.common.util.concurrent.ListenableFuture; -import org.whispersystems.libsignal.logging.Log; +import org.thoughtcrime.securesms.logging.Log; /** * The {@link TextureView} implementation for {@link PreviewView} diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java index 8bc9cf6fb2..615887c3fc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java @@ -26,7 +26,7 @@ import androidx.core.app.NotificationManagerCompat; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo; -import org.whispersystems.libsignal.logging.Log; +import org.thoughtcrime.securesms.logging.Log; import java.util.LinkedList; import java.util.List; @@ -36,7 +36,7 @@ import java.util.List; */ public class AndroidAutoHeardReceiver extends BroadcastReceiver { - public static final String TAG = AndroidAutoHeardReceiver.class.getSimpleName(); + public static final String TAG = Log.tag(AndroidAutoHeardReceiver.class); public static final String HEARD_ACTION = "org.thoughtcrime.securesms.notifications.ANDROID_AUTO_HEARD"; public static final String THREAD_IDS_EXTRA = "car_heard_thread_ids"; public static final String NOTIFICATION_ID_EXTRA = "car_notification_id"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java index 8615f8676c..58666ac558 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java @@ -27,11 +27,11 @@ import androidx.core.app.RemoteInput; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.OutgoingMediaMessage; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.sms.MessageSender; import org.thoughtcrime.securesms.sms.OutgoingTextMessage; -import org.whispersystems.libsignal.logging.Log; import java.util.Collections; import java.util.LinkedList; @@ -42,7 +42,7 @@ import java.util.List; */ public class AndroidAutoReplyReceiver extends BroadcastReceiver { - public static final String TAG = AndroidAutoReplyReceiver.class.getSimpleName(); + public static final String TAG = Log.tag(AndroidAutoReplyReceiver.class); public static final String REPLY_ACTION = "org.thoughtcrime.securesms.notifications.ANDROID_AUTO_REPLY"; public static final String RECIPIENT_EXTRA = "car_recipient"; public static final String VOICE_REPLY_KEY = "car_voice_reply_key"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java index 7d71a5f54b..b7f3c922a4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java @@ -25,10 +25,10 @@ import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.database.RecipientDatabase.VibrateState; +import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.ServiceUtil; import org.thoughtcrime.securesms.util.TextSecurePreferences; -import org.whispersystems.libsignal.logging.Log; import java.util.ArrayList; import java.util.Arrays; @@ -38,7 +38,7 @@ import java.util.Set; public class NotificationChannels { - private static final String TAG = NotificationChannels.class.getSimpleName(); + private static final String TAG = Log.tag(NotificationChannels.class); private static class Version { static final int MESSAGES_CATEGORY = 2;