From b3f4e0a7fe6a6a36b43e2e3ef4f2e2a20a270141 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 11 Feb 2022 11:11:25 -0500 Subject: [PATCH] Move scrubber to proper package. --- .../org/thoughtcrime/securesms/logging/PersistentLogger.kt | 2 +- .../org/thoughtcrime/securesms/logsubmit/LogDataSource.kt | 1 - .../securesms/logsubmit/SubmitDebugLogRepository.java | 7 +------ .../src/main/java/org/signal/core/util/ExceptionUtil.java | 2 +- .../util => signal/core/util/logging}/Scrubber.java | 2 +- .../java/org/signal/core/util/logging}/ScrubberTest.java | 2 +- 6 files changed, 5 insertions(+), 11 deletions(-) rename core-util/src/main/java/org/{thoughtcrime/securesms/logsubmit/util => signal/core/util/logging}/Scrubber.java (99%) rename {app/src/test/java/org/thoughtcrime/securesms/logsubmit/util => core-util/src/test/java/org/signal/core/util/logging}/ScrubberTest.java (98%) diff --git a/app/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.kt b/app/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.kt index 2503d2fa2..9eb16f97f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.kt @@ -3,10 +3,10 @@ package org.thoughtcrime.securesms.logging import android.app.Application import android.os.Looper import org.signal.core.util.logging.Log +import org.signal.core.util.logging.Scrubber import org.thoughtcrime.securesms.BuildConfig import org.thoughtcrime.securesms.database.LogDatabase import org.thoughtcrime.securesms.database.model.LogEntry -import org.thoughtcrime.securesms.logsubmit.util.Scrubber import java.io.ByteArrayOutputStream import java.io.PrintStream import java.text.SimpleDateFormat diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogDataSource.kt b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogDataSource.kt index 2f692a4d2..d5f67fa92 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogDataSource.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogDataSource.kt @@ -4,7 +4,6 @@ import android.app.Application import org.signal.core.util.logging.Scrubber import org.signal.paging.PagedDataSource import org.thoughtcrime.securesms.database.LogDatabase -import org.thoughtcrime.securesms.logsubmit.util.Scrubber import java.lang.UnsupportedOperationException /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogRepository.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogRepository.java index c20b5cda2..f1ced8fab 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogRepository.java @@ -5,7 +5,6 @@ import android.content.Context; import android.net.Uri; import android.os.Build; import android.os.ParcelFileDescriptor; -import android.os.SystemClock; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -21,24 +20,20 @@ import org.signal.core.util.logging.Log; import org.signal.core.util.tracing.Tracer; import org.thoughtcrime.securesms.database.LogDatabase; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; -import org.thoughtcrime.securesms.logsubmit.util.Scrubber; +import org.signal.core.util.logging.Scrubber; import org.thoughtcrime.securesms.net.StandardUserAgentInterceptor; import org.thoughtcrime.securesms.providers.BlobProvider; import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess; -import org.thoughtcrime.securesms.util.ByteUnit; import org.thoughtcrime.securesms.util.FeatureFlags; import org.thoughtcrime.securesms.util.Stopwatch; -import org.thoughtcrime.securesms.util.Util; import org.whispersystems.libsignal.util.guava.Optional; import java.io.IOException; import java.io.OutputStream; import java.util.ArrayList; -import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.concurrent.ExecutorService; -import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; import java.util.zip.GZIPOutputStream; diff --git a/core-util/src/main/java/org/signal/core/util/ExceptionUtil.java b/core-util/src/main/java/org/signal/core/util/ExceptionUtil.java index 65feca52b..43f0b23e6 100644 --- a/core-util/src/main/java/org/signal/core/util/ExceptionUtil.java +++ b/core-util/src/main/java/org/signal/core/util/ExceptionUtil.java @@ -2,7 +2,7 @@ package org.signal.core.util; import androidx.annotation.NonNull; -import org.thoughtcrime.securesms.logsubmit.util.Scrubber; +import org.signal.core.util.logging.Scrubber; import java.io.ByteArrayOutputStream; import java.io.PrintStream; diff --git a/core-util/src/main/java/org/thoughtcrime/securesms/logsubmit/util/Scrubber.java b/core-util/src/main/java/org/signal/core/util/logging/Scrubber.java similarity index 99% rename from core-util/src/main/java/org/thoughtcrime/securesms/logsubmit/util/Scrubber.java rename to core-util/src/main/java/org/signal/core/util/logging/Scrubber.java index 0493b7a7f..ce719a557 100644 --- a/core-util/src/main/java/org/thoughtcrime/securesms/logsubmit/util/Scrubber.java +++ b/core-util/src/main/java/org/signal/core/util/logging/Scrubber.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package org.thoughtcrime.securesms.logsubmit.util; +package org.signal.core.util.logging; import androidx.annotation.NonNull; diff --git a/app/src/test/java/org/thoughtcrime/securesms/logsubmit/util/ScrubberTest.java b/core-util/src/test/java/org/signal/core/util/logging/ScrubberTest.java similarity index 98% rename from app/src/test/java/org/thoughtcrime/securesms/logsubmit/util/ScrubberTest.java rename to core-util/src/test/java/org/signal/core/util/logging/ScrubberTest.java index 235aed604..d47deeff6 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/logsubmit/util/ScrubberTest.java +++ b/core-util/src/test/java/org/signal/core/util/logging/ScrubberTest.java @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.logsubmit.util; +package org.signal.core.util.logging; import org.junit.Test; import org.junit.runner.RunWith;