Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-25 11:20:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move scrubber to proper package.

Browse Source
This commit is contained in:
Greyson Parrelli
2022-02-11 11:11:25 -05:00
parent 4db58a27a1
commit b3f4e0a7fe
6 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.kt
View File

@@ -3,10 +3,10 @@ package org.thoughtcrime.securesms.logging
import android.app.Application import android.app.Application
import android.os.Looper import android.os.Looper
import org.signal.core.util.logging.Log import org.signal.core.util.logging.Log
import org.signal.core.util.logging.Scrubber
import org.thoughtcrime.securesms.BuildConfig import org.thoughtcrime.securesms.BuildConfig
import org.thoughtcrime.securesms.database.LogDatabase import org.thoughtcrime.securesms.database.LogDatabase
import org.thoughtcrime.securesms.database.model.LogEntry import org.thoughtcrime.securesms.database.model.LogEntry
import org.thoughtcrime.securesms.logsubmit.util.Scrubber
import java.io.ByteArrayOutputStream import java.io.ByteArrayOutputStream
import java.io.PrintStream import java.io.PrintStream
import java.text.SimpleDateFormat import java.text.SimpleDateFormat

1
app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogDataSource.kt
View File

@@ -4,7 +4,6 @@ import android.app.Application
import org.signal.core.util.logging.Scrubber import org.signal.core.util.logging.Scrubber
import org.signal.paging.PagedDataSource import org.signal.paging.PagedDataSource
import org.thoughtcrime.securesms.database.LogDatabase import org.thoughtcrime.securesms.database.LogDatabase
import org.thoughtcrime.securesms.logsubmit.util.Scrubber
import java.lang.UnsupportedOperationException import java.lang.UnsupportedOperationException
/** /**

7
app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogRepository.java
View File

@@ -5,7 +5,6 @@ import android.content.Context;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.os.SystemClock;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
@@ -21,24 +20,20 @@ import org.signal.core.util.logging.Log;
import org.signal.core.util.tracing.Tracer; import org.signal.core.util.tracing.Tracer;
import org.thoughtcrime.securesms.database.LogDatabase; import org.thoughtcrime.securesms.database.LogDatabase;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; 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.net.StandardUserAgentInterceptor;
import org.thoughtcrime.securesms.providers.BlobProvider; import org.thoughtcrime.securesms.providers.BlobProvider;
import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess; import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
import org.thoughtcrime.securesms.util.ByteUnit;
import org.thoughtcrime.securesms.util.FeatureFlags; import org.thoughtcrime.securesms.util.FeatureFlags;
import org.thoughtcrime.securesms.util.Stopwatch; import org.thoughtcrime.securesms.util.Stopwatch;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.libsignal.util.guava.Optional; import org.whispersystems.libsignal.util.guava.Optional;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.zip.GZIPOutputStream; import java.util.zip.GZIPOutputStream;

2
core-util/src/main/java/org/signal/core/util/ExceptionUtil.java
View File

@@ -2,7 +2,7 @@ package org.signal.core.util;
import androidx.annotation.NonNull; 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.ByteArrayOutputStream;
import java.io.PrintStream; import java.io.PrintStream;

2
core-util/src/main/java/org/thoughtcrime/securesms/logsubmit/util/Scrubber.java → core-util/src/main/java/org/signal/core/util/logging/Scrubber.java
View File

@@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.thoughtcrime.securesms.logsubmit.util; package org.signal.core.util.logging;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;

2
app/src/test/java/org/thoughtcrime/securesms/logsubmit/util/ScrubberTest.java → core-util/src/test/java/org/signal/core/util/logging/ScrubberTest.java
View File

@@ -1,4 +1,4 @@
package org.thoughtcrime.securesms.logsubmit.util; package org.signal.core.util.logging;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;