From 0bac08dcc42fc4ec180d37c37f2a116b8c748f19 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 4 Nov 2021 12:59:02 -0400
Subject: [PATCH] Extend log duration to max(3 days, 20MB).

---
 .../securesms/FlipperApplicationContext.kt             | 10 +++++-----
 .../thoughtcrime/securesms/badges/BadgeImageView.kt    |  1 -
 .../org/thoughtcrime/securesms/database/LogDatabase.kt |  4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/src/flipper/java/org/thoughtcrime/securesms/FlipperApplicationContext.kt b/app/src/flipper/java/org/thoughtcrime/securesms/FlipperApplicationContext.kt
index ef793c346..6b939746a 100644
--- a/app/src/flipper/java/org/thoughtcrime/securesms/FlipperApplicationContext.kt
+++ b/app/src/flipper/java/org/thoughtcrime/securesms/FlipperApplicationContext.kt
@@ -1,13 +1,13 @@
 package org.thoughtcrime.securesms
 
-import com.facebook.soloader.SoLoader
 import com.facebook.flipper.android.AndroidFlipperClient
-import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin
-import com.facebook.flipper.plugins.inspector.DescriptorMapping
 import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin
-import org.thoughtcrime.securesms.database.FlipperSqlCipherAdapter
+import com.facebook.flipper.plugins.inspector.DescriptorMapping
+import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin
 import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin
+import com.facebook.soloader.SoLoader
 import leakcanary.LeakCanary
+import org.thoughtcrime.securesms.database.FlipperSqlCipherAdapter
 import shark.AndroidReferenceMatchers
 
 class FlipperApplicationContext : ApplicationContext() {
@@ -43,4 +43,4 @@ class FlipperApplicationContext : ApplicationContext() {
         )
     )
   }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt
index f43aa401c..ff0c4fad0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt
@@ -12,7 +12,6 @@ import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.ThemeUtil
-import org.thoughtcrime.securesms.util.visible
 import java.lang.IllegalArgumentException
 
 class BadgeImageView @JvmOverloads constructor(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/LogDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/LogDatabase.kt
index a08273e02..88b2cb52a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/LogDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/LogDatabase.kt
@@ -43,8 +43,8 @@ class LogDatabase private constructor(
   companion object {
     private val TAG = Log.tag(LogDatabase::class.java)
 
-    private val MAX_FILE_SIZE = ByteUnit.MEGABYTES.toBytes(15)
-    private val DEFAULT_LIFESPAN = TimeUnit.DAYS.toMillis(2)
+    private val MAX_FILE_SIZE = ByteUnit.MEGABYTES.toBytes(20)
+    private val DEFAULT_LIFESPAN = TimeUnit.DAYS.toMillis(3)
     private val LONGER_LIFESPAN = TimeUnit.DAYS.toMillis(14)
 
     private const val DATABASE_VERSION = 2