From a18ab6c0792c3039e948b36405179e9e3565f377 Mon Sep 17 00:00:00 2001
From: jubb <hjubb@users.noreply.github.com>
Date: Thu, 15 Jul 2021 16:56:13 +1000
Subject: [PATCH] refactor: remove PersistentLogger.java and fix libsignal
build.gradle minSdkVersion
---
.../securesms/ApplicationContext.java | 9 +-
.../securesms/logging/PersistentLogger.java | 244 ------------------
libsignal/build.gradle | 4 +
3 files changed, 5 insertions(+), 252 deletions(-)
delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.java
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
index 6ea6795f12..e2c82814e3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -56,7 +56,6 @@ import org.thoughtcrime.securesms.jobmanager.impl.JsonDataSerializer;
import org.thoughtcrime.securesms.jobs.FastJobStorage;
import org.thoughtcrime.securesms.jobs.JobManagerFactories;
import org.thoughtcrime.securesms.logging.AndroidLogger;
-import org.thoughtcrime.securesms.logging.PersistentLogger;
import org.thoughtcrime.securesms.logging.UncaughtExceptionLogger;
import org.thoughtcrime.securesms.home.HomeActivity;
import org.thoughtcrime.securesms.notifications.BackgroundPollWorker;
@@ -118,7 +117,6 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
private ReadReceiptManager readReceiptManager;
private ProfileManager profileManager;
private ObjectGraph objectGraph;
- private PersistentLogger persistentLogger;
public MessageNotifier messageNotifier = null;
public Poller poller = null;
public Broadcaster broadcaster = null;
@@ -248,10 +246,6 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
return isAppVisible;
}
- public PersistentLogger getPersistentLogger() {
- return persistentLogger;
- }
-
// Loki
private void initializeSecurityProvider() {
@@ -279,8 +273,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
}
private void initializeLogging() {
- persistentLogger = new PersistentLogger(this);
- Log.initialize(new AndroidLogger(), persistentLogger);
+ Log.initialize(new AndroidLogger());
}
private void initializeCrashHandling() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.java b/app/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.java
deleted file mode 100644
index ecb4b68983..0000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.java
+++ /dev/null
@@ -1,244 +0,0 @@
-package org.thoughtcrime.securesms.logging;
-
-import android.content.Context;
-import androidx.annotation.AnyThread;
-import androidx.annotation.WorkerThread;
-
-import org.session.libsignal.utilities.NoExternalStorageException;
-
-import org.session.libsignal.utilities.ListenableFuture;
-import org.session.libsignal.utilities.SettableFuture;
-import org.session.libsignal.utilities.Log;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-
-public class PersistentLogger extends Log.Logger {
-
- private static final String TAG = PersistentLogger.class.getSimpleName();
-
- private static final String LOG_V = "V";
- private static final String LOG_D = "D";
- private static final String LOG_I = "I";
- private static final String LOG_W = "W";
- private static final String LOG_E = "E";
- private static final String LOG_WTF = "A";
-
- private static final String LOG_DIRECTORY = "log";
- private static final String FILENAME_PREFIX = "log-";
- private static final int MAX_LOG_FILES = 5;
- private static final int MAX_LOG_SIZE = 300 * 1024;
- private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS zzz");
-
- private final Context context;
- private final Executor executor;
- private final byte[] secret;
-
- private LogFile.Writer writer;
-
- public PersistentLogger(Context context) {
- this.context = context.getApplicationContext();
- this.secret = LogSecretProvider.getOrCreateAttachmentSecret(context);
- this.executor = Executors.newSingleThreadExecutor(r -> {
- Thread thread = new Thread(r, "PersistentLogger");
- thread.setPriority(Thread.MIN_PRIORITY);
- return thread;
- });
-
- executor.execute(this::initializeWriter);
- }
-
- @Override
- public void v(String tag, String message, Throwable t) {
- write(LOG_V, tag, message, t);
- }
-
- @Override
- public void d(String tag, String message, Throwable t) {
- write(LOG_D, tag, message, t);
- }
-
- @Override
- public void i(String tag, String message, Throwable t) {
- write(LOG_I, tag, message, t);
- }
-
- @Override
- public void w(String tag, String message, Throwable t) {
- write(LOG_W, tag, message, t);
- }
-
- @Override
- public void e(String tag, String message, Throwable t) {
- write(LOG_E, tag, message, t);
- }
-
- @Override
- public void wtf(String tag, String message, Throwable t) {
- write(LOG_WTF, tag, message, t);
- }
-
- @Override
- public void blockUntilAllWritesFinished() {
- CountDownLatch latch = new CountDownLatch(1);
-
- executor.execute(latch::countDown);
-
- try {
- latch.await();
- } catch (InterruptedException e) {
- android.util.Log.w(TAG, "Failed to wait for all writes.");
- }
- }
-
- @WorkerThread
- public ListenableFuture<String> getLogs() {
- final SettableFuture<String> future = new SettableFuture<>();
-
- executor.execute(() -> {
- StringBuilder builder = new StringBuilder();
-
- try {
- File[] logs = getSortedLogFiles();
- for (int i = logs.length - 1; i >= 0; i--) {
- try {
- LogFile.Reader reader = new LogFile.Reader(secret, logs[i]);
- builder.append(reader.readAll());
- } catch (IOException e) {
- android.util.Log.w(TAG, "Failed to read log at index " + i + ". Removing reference.");
- logs[i].delete();
- }
- }
-
- future.set(builder.toString());
- } catch (NoExternalStorageException e) {
- future.setException(e);
- }
- });
-
- return future;
- }
-
- @WorkerThread
- private void initializeWriter() {
- try {
- writer = new LogFile.Writer(secret, getOrCreateActiveLogFile());
- } catch (NoExternalStorageException | IOException e) {
- android.util.Log.e(TAG, "Failed to initialize writer.", e);
- }
- }
-
- @AnyThread
- private void write(String level, String tag, String message, Throwable t) {
- executor.execute(() -> {
- try {
- if (writer == null) {
- return;
- }
-
- if (writer.getLogSize() >= MAX_LOG_SIZE) {
- writer.close();
- writer = new LogFile.Writer(secret, createNewLogFile());
- trimLogFilesOverMax();
- }
-
- for (String entry : buildLogEntries(level, tag, message, t)) {
- writer.writeEntry(entry);
- }
-
- } catch (NoExternalStorageException e) {
- android.util.Log.w(TAG, "Cannot persist logs.", e);
- } catch (IOException e) {
- android.util.Log.w(TAG, "Failed to write line. Deleting all logs and starting over.");
- deleteAllLogs();
- initializeWriter();
- }
- });
- }
-
- private void trimLogFilesOverMax() throws NoExternalStorageException {
- File[] logs = getSortedLogFiles();
- if (logs.length > MAX_LOG_FILES) {
- for (int i = MAX_LOG_FILES; i < logs.length; i++) {
- logs[i].delete();
- }
- }
- }
-
- private void deleteAllLogs() {
- try {
- File[] logs = getSortedLogFiles();
- for (File log : logs) {
- log.delete();
- }
- } catch (NoExternalStorageException e) {
- android.util.Log.w(TAG, "Was unable to delete logs.", e);
- }
- }
-
- private File getOrCreateActiveLogFile() throws NoExternalStorageException {
- File[] logs = getSortedLogFiles();
- if (logs.length > 0) {
- return logs[0];
- }
-
- return createNewLogFile();
- }
-
- private File createNewLogFile() throws NoExternalStorageException {
- return new File(getOrCreateLogDirectory(), FILENAME_PREFIX + System.currentTimeMillis());
- }
-
- private File[] getSortedLogFiles() throws NoExternalStorageException {
- File[] logs = getOrCreateLogDirectory().listFiles();
- if (logs != null) {
- Arrays.sort(logs, (o1, o2) -> o2.getName().compareTo(o1.getName()));
- return logs;
- }
- return new File[0];
- }
-
- private File getOrCreateLogDirectory() throws NoExternalStorageException {
- File logDir = new File(context.getCacheDir(), LOG_DIRECTORY);
- if (!logDir.exists() && !logDir.mkdir()) {
- throw new NoExternalStorageException("Unable to create log directory.");
- }
-
- return logDir;
- }
-
- private List<String> buildLogEntries(String level, String tag, String message, Throwable t) {
- List<String> entries = new LinkedList<>();
- Date date = new Date();
-
- entries.add(buildEntry(level, tag, message, date));
-
- if (t != null) {
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- t.printStackTrace(new PrintStream(outputStream));
-
- String trace = new String(outputStream.toByteArray());
- String[] lines = trace.split("\\n");
-
- for (String line : lines) {
- entries.add(buildEntry(level, tag, line, date));
- }
- }
-
- return entries;
- }
-
- private String buildEntry(String level, String tag, String message, Date date) {
- return DATE_FORMAT.format(date) + ' ' + level + ' ' + tag + ": " + message;
- }
-}
diff --git a/libsignal/build.gradle b/libsignal/build.gradle
index 5fa6d19ca2..91e50a37d5 100644
--- a/libsignal/build.gradle
+++ b/libsignal/build.gradle
@@ -4,6 +4,10 @@ apply plugin: 'kotlin-android'
android {
compileSdkVersion androidCompileSdkVersion
+ defaultConfig {
+ minSdkVersion androidMinimumSdkVersion
+ }
+
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8