diff --git a/app/lint.xml b/app/lint.xml
index 99fff898e3..520c723619 100644
--- a/app/lint.xml
+++ b/app/lint.xml
@@ -18,7 +18,7 @@
     <issue id="ExtraTranslation" severity="warning" />
 
     <!-- Custom lints -->
-    <issue id="LogNotSignal" severity="warning" />
+    <issue id="LogNotSignal" severity="error" />
 
     <issue id="RestrictedApi" severity="error">
         <ignore path="*/org/thoughtcrime/securesms/mediasend/camerax/VideoCapture.java" />
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXVideoCaptureHelper.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXVideoCaptureHelper.java
index 4c502c9728..a952442d2e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXVideoCaptureHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXVideoCaptureHelper.java
@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.mediasend;
 import android.Manifest;
 import android.content.Context;
 import android.util.DisplayMetrics;
-import android.util.Log;
 import android.util.Size;
 import android.view.ViewGroup;
 import android.view.animation.LinearInterpolator;
@@ -19,6 +18,7 @@ import com.nineoldandroids.animation.Animator;
 import com.nineoldandroids.animation.ValueAnimator;
 
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mediasend.camerax.CameraXView;
 import org.thoughtcrime.securesms.mediasend.camerax.VideoCapture;
 import org.thoughtcrime.securesms.permissions.Permissions;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXModule.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXModule.java
index d4d54531b1..c762b98ccf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXModule.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXModule.java
@@ -20,7 +20,6 @@ import android.Manifest.permission;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.Resources;
-import android.util.Log;
 import android.util.Rational;
 import android.util.Size;
 
@@ -28,7 +27,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RequiresPermission;
-import androidx.camera.core.AspectRatio;
 import androidx.camera.core.Camera;
 import androidx.camera.core.CameraSelector;
 import androidx.camera.core.CameraX;
@@ -53,6 +51,7 @@ import androidx.lifecycle.OnLifecycleEvent;
 
 import com.google.common.util.concurrent.ListenableFuture;
 
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.MediaConstraints;
 import org.thoughtcrime.securesms.video.VideoUtil;
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXView.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXView.java
index f1c76cc949..a46fe7bdf7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXView.java
@@ -28,7 +28,6 @@ import android.os.Looper;
 import android.os.Parcelable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.Display;
 import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;
@@ -62,6 +61,7 @@ import androidx.lifecycle.LifecycleOwner;
 import com.google.common.util.concurrent.ListenableFuture;
 
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.logging.Log;
 
 import java.io.FileDescriptor;
 import java.util.concurrent.Executor;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/SurfaceViewImplementation.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/SurfaceViewImplementation.java
index 7c6963a5cf..25255ef67e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/SurfaceViewImplementation.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/SurfaceViewImplementation.java
@@ -16,7 +16,6 @@
 
 package org.thoughtcrime.securesms.mediasend.camerax;
 
-import android.util.Log;
 import android.util.Size;
 import android.view.Surface;
 import android.view.SurfaceHolder;
@@ -30,6 +29,8 @@ import androidx.camera.core.Preview;
 import androidx.camera.core.SurfaceRequest;
 import androidx.core.content.ContextCompat;
 
+import org.thoughtcrime.securesms.logging.Log;
+
 /**
  * The SurfaceView implementation for {@link PreviewView}.
  */
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 7e9213d5f9..c456de15ac 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
@@ -21,7 +21,6 @@ import static androidx.camera.core.SurfaceRequest.Result;
 import android.annotation.SuppressLint;
 import android.graphics.Point;
 import android.graphics.SurfaceTexture;
-import android.util.Log;
 import android.util.Pair;
 import android.util.Size;
 import android.view.Surface;
@@ -42,6 +41,8 @@ import androidx.core.util.Preconditions;
 
 import com.google.common.util.concurrent.ListenableFuture;
 
+import org.whispersystems.libsignal.logging.Log;
+
 /**
  * The {@link TextureView} implementation for {@link PreviewView}
  */
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/VideoCapture.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/VideoCapture.java
index d6baaea703..a9afd717d2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/VideoCapture.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/VideoCapture.java
@@ -45,7 +45,6 @@ import android.media.MediaMuxer;
 import android.media.MediaRecorder.AudioSource;
 import android.os.Handler;
 import android.os.HandlerThread;
-import android.util.Log;
 import android.util.Size;
 import android.view.Display;
 import android.view.Surface;
@@ -74,6 +73,7 @@ import androidx.camera.core.impl.VideoCaptureConfig;
 import androidx.camera.core.impl.utils.executor.CameraXExecutors;
 import androidx.camera.core.internal.utils.UseCaseConfigUtil;
 
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.video.VideoUtil;
 
 import java.io.File;
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 8d38fb062c..6b3e347fcf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/AlarmSleepTimer.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/AlarmSleepTimer.java
@@ -8,10 +8,10 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Build;
 import android.os.SystemClock;
-import android.util.Log;
 
 import java.util.concurrent.ConcurrentSkipListSet;
 
+import org.thoughtcrime.securesms.logging.Log;
 import org.whispersystems.signalservice.api.util.SleepTimer;
 
 /**