Replace Timber with logcat (#1509)

* Replace Timber with logcat (#1505)

* Add extension for asLog which takes a message param

Co-authored-by: Aditya Wasan <adityawasan55@gmail.com>

5 files changed, 37 insertions, 27 deletions

diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillDecryptActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillDecryptActivity.kt
index 07ae4c42..67273110 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillDecryptActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillDecryptActivity.kt
@@ -17,8 +17,6 @@ import androidx.activity.result.contract.ActivityResultContracts.StartIntentSend
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
-import com.github.ajalt.timberkt.d
-import com.github.ajalt.timberkt.e
 import com.github.androidpasswordstore.autofillparser.AutofillAction
 import com.github.androidpasswordstore.autofillparser.Credentials
 import com.github.michaelbull.result.getOrElse
@@ -31,6 +29,7 @@ import dev.msfjarvis.aps.util.autofill.AutofillPreferences
 import dev.msfjarvis.aps.util.autofill.AutofillResponseBuilder
 import dev.msfjarvis.aps.util.autofill.DirectoryStructure
 import dev.msfjarvis.aps.util.extensions.OPENPGP_PROVIDER
+import dev.msfjarvis.aps.util.extensions.asLog
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.InputStream
@@ -43,6 +42,9 @@ import kotlin.coroutines.suspendCoroutine
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import logcat.LogPriority.ERROR
+import logcat.asLog
+import logcat.logcat
 import me.msfjarvis.openpgpktx.util.OpenPgpApi
 import me.msfjarvis.openpgpktx.util.OpenPgpServiceConnection
 import org.openintents.openpgp.IOpenPgpService2
@@ -108,21 +110,21 @@ class AutofillDecryptActivity : AppCompatActivity() {
     val filePath =
       intent?.getStringExtra(EXTRA_FILE_PATH)
         ?: run {
-          e { "AutofillDecryptActivity started without EXTRA_FILE_PATH" }
+          logcat(ERROR) { "AutofillDecryptActivity started without EXTRA_FILE_PATH" }
           finish()
           return
         }
     val clientState =
       intent?.getBundleExtra(AutofillManager.EXTRA_CLIENT_STATE)
         ?: run {
-          e { "AutofillDecryptActivity started without EXTRA_CLIENT_STATE" }
+          logcat(ERROR) { "AutofillDecryptActivity started without EXTRA_CLIENT_STATE" }
           finish()
           return
         }
     val isSearchAction = intent?.getBooleanExtra(EXTRA_SEARCH_ACTION, true)!!
     val action = if (isSearchAction) AutofillAction.Search else AutofillAction.Match
     directoryStructure = AutofillPreferences.directoryStructure(this)
-    d { action.toString() }
+    logcat { action.toString() }
     lifecycleScope.launch {
       val credentials = decryptCredential(File(filePath))
       if (credentials == null) {
@@ -183,14 +185,14 @@ class AutofillDecryptActivity : AppCompatActivity() {
     val command = resumeIntent ?: Intent().apply { action = OpenPgpApi.ACTION_DECRYPT_VERIFY }
     runCatching { file.inputStream() }
       .onFailure { e ->
-        e(e) { "File to decrypt not found" }
+        logcat(ERROR) { e.asLog("File to decrypt not found") }
         return null
       }
       .onSuccess { encryptedInput ->
         val decryptedOutput = ByteArrayOutputStream()
         runCatching { executeOpenPgpApi(command, encryptedInput, decryptedOutput) }
           .onFailure { e ->
-            e(e) { "OpenPgpApi ACTION_DECRYPT_VERIFY failed" }
+            logcat(ERROR) { e.asLog("OpenPgpApi ACTION_DECRYPT_VERIFY failed") }
             return null
           }
           .onSuccess { result ->
@@ -212,7 +214,7 @@ class AutofillDecryptActivity : AppCompatActivity() {
                   )
                 }
                   .getOrElse { e ->
-                    e(e) { "Failed to parse password entry" }
+                    logcat(ERROR) { e.asLog("Failed to parse password entry") }
                     return null
                   }
               }
@@ -232,7 +234,9 @@ class AutofillDecryptActivity : AppCompatActivity() {
                   decryptCredential(file, intentToResume)
                 }
                   .getOrElse { e ->
-                    e(e) { "OpenPgpApi ACTION_DECRYPT_VERIFY failed with user interaction" }
+                    logcat(ERROR) {
+                      e.asLog("OpenPgpApi ACTION_DECRYPT_VERIFY failed with user interaction")
+                    }
                     return null
                   }
               }
@@ -247,14 +251,14 @@ class AutofillDecryptActivity : AppCompatActivity() {
                       )
                       .show()
                   }
-                  e {
+                  logcat(ERROR) {
                     "OpenPgpApi ACTION_DECRYPT_VERIFY failed (${error.errorId}): ${error.message}"
                   }
                 }
                 null
               }
               else -> {
-                e { "Unrecognized OpenPgpApi result: $resultCode" }
+                logcat(ERROR) { "Unrecognized OpenPgpApi result: $resultCode" }
                 null
               }
             }
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillDecryptActivityV2.kt b/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillDecryptActivityV2.kt
index 27a12867..bb2e6492 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillDecryptActivityV2.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillDecryptActivityV2.kt
@@ -14,8 +14,6 @@ import android.view.autofill.AutofillManager
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
-import com.github.ajalt.timberkt.d
-import com.github.ajalt.timberkt.e
 import com.github.androidpasswordstore.autofillparser.AutofillAction
 import com.github.androidpasswordstore.autofillparser.Credentials
 import com.github.michaelbull.result.getOrElse
@@ -29,11 +27,15 @@ import dev.msfjarvis.aps.ui.crypto.DecryptActivityV2
 import dev.msfjarvis.aps.util.autofill.AutofillPreferences
 import dev.msfjarvis.aps.util.autofill.AutofillResponseBuilder
 import dev.msfjarvis.aps.util.autofill.DirectoryStructure
+import dev.msfjarvis.aps.util.extensions.asLog
 import java.io.File
 import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import logcat.LogPriority.ERROR
+import logcat.asLog
+import logcat.logcat
 
 @RequiresApi(Build.VERSION_CODES.O)
 @AndroidEntryPoint
@@ -80,21 +82,21 @@ class AutofillDecryptActivityV2 : AppCompatActivity() {
     val filePath =
       intent?.getStringExtra(EXTRA_FILE_PATH)
         ?: run {
-          e { "AutofillDecryptActivityV2 started without EXTRA_FILE_PATH" }
+          logcat(ERROR) { "AutofillDecryptActivityV2 started without EXTRA_FILE_PATH" }
           finish()
           return
         }
     val clientState =
       intent?.getBundleExtra(AutofillManager.EXTRA_CLIENT_STATE)
         ?: run {
-          e { "AutofillDecryptActivityV2 started without EXTRA_CLIENT_STATE" }
+          logcat(ERROR) { "AutofillDecryptActivityV2 started without EXTRA_CLIENT_STATE" }
           finish()
           return
         }
     val isSearchAction = intent?.getBooleanExtra(EXTRA_SEARCH_ACTION, true)!!
     val action = if (isSearchAction) AutofillAction.Search else AutofillAction.Match
     directoryStructure = AutofillPreferences.directoryStructure(this)
-    d { action.toString() }
+    logcat { action.toString() }
     lifecycleScope.launch {
       val credentials = decryptCredential(File(filePath))
       if (credentials == null) {
@@ -121,7 +123,7 @@ class AutofillDecryptActivityV2 : AppCompatActivity() {
   private suspend fun decryptCredential(file: File): Credentials? {
     runCatching { file.inputStream() }
       .onFailure { e ->
-        e(e) { "File to decrypt not found" }
+        logcat(ERROR) { e.asLog("File to decrypt not found") }
         return null
       }
       .onSuccess { encryptedInput ->
@@ -136,7 +138,7 @@ class AutofillDecryptActivityV2 : AppCompatActivity() {
           }
         }
           .onFailure { e ->
-            e(e) { "Decryption failed" }
+            logcat(ERROR) { e.asLog("Decryption failed") }
             return null
           }
           .onSuccess { result ->
@@ -145,7 +147,7 @@ class AutofillDecryptActivityV2 : AppCompatActivity() {
               AutofillPreferences.credentialsFromStoreEntry(this, file, entry, directoryStructure)
             }
               .getOrElse { e ->
-                e(e) { "Failed to parse password entry" }
+                logcat(ERROR) { e.asLog("Failed to parse password entry") }
                 return null
               }
           }
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillFilterActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillFilterActivity.kt
index 04fb83d5..bb6d1056 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillFilterActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillFilterActivity.kt
@@ -24,7 +24,6 @@ import androidx.core.widget.addTextChangedListener
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.github.ajalt.timberkt.e
 import com.github.androidpasswordstore.autofillparser.FormOrigin
 import dev.msfjarvis.aps.R
 import dev.msfjarvis.aps.data.password.PasswordItem
@@ -39,6 +38,8 @@ import dev.msfjarvis.aps.util.viewmodel.ListMode
 import dev.msfjarvis.aps.util.viewmodel.SearchMode
 import dev.msfjarvis.aps.util.viewmodel.SearchableRepositoryAdapter
 import dev.msfjarvis.aps.util.viewmodel.SearchableRepositoryViewModel
+import logcat.LogPriority.ERROR
+import logcat.logcat
 
 @TargetApi(Build.VERSION_CODES.O)
 class AutofillFilterView : AppCompatActivity() {
@@ -102,7 +103,7 @@ class AutofillFilterView : AppCompatActivity() {
     window.attributes = params
 
     if (intent?.hasExtra(AutofillManager.EXTRA_CLIENT_STATE) != true) {
-      e { "AutofillFilterActivity started without EXTRA_CLIENT_STATE" }
+      logcat(ERROR) { "AutofillFilterActivity started without EXTRA_CLIENT_STATE" }
       finish()
       return
     }
@@ -115,7 +116,7 @@ class AutofillFilterView : AppCompatActivity() {
           FormOrigin.App(intent!!.getStringExtra(EXTRA_FORM_ORIGIN_APP)!!)
         }
         else -> {
-          e {
+          logcat(ERROR) {
             "AutofillFilterActivity started without EXTRA_FORM_ORIGIN_WEB or EXTRA_FORM_ORIGIN_APP"
           }
           finish()
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillPublisherChangedActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillPublisherChangedActivity.kt
index 6ea47ea1..e37ebf5e 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillPublisherChangedActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillPublisherChangedActivity.kt
@@ -17,7 +17,6 @@ import android.text.format.DateUtils
 import android.view.View
 import android.view.autofill.AutofillManager
 import androidx.appcompat.app.AppCompatActivity
-import com.github.ajalt.timberkt.e
 import com.github.androidpasswordstore.autofillparser.FormOrigin
 import com.github.androidpasswordstore.autofillparser.computeCertificatesHash
 import com.github.michaelbull.result.onFailure
@@ -26,7 +25,10 @@ import dev.msfjarvis.aps.R
 import dev.msfjarvis.aps.databinding.ActivityOreoAutofillPublisherChangedBinding
 import dev.msfjarvis.aps.util.autofill.AutofillMatcher
 import dev.msfjarvis.aps.util.autofill.AutofillPublisherChangedException
+import dev.msfjarvis.aps.util.extensions.asLog
 import dev.msfjarvis.aps.util.extensions.viewBinding
+import logcat.LogPriority.ERROR
+import logcat.logcat
 
 @TargetApi(Build.VERSION_CODES.O)
 class AutofillPublisherChangedActivity : AppCompatActivity() {
@@ -69,7 +71,7 @@ class AutofillPublisherChangedActivity : AppCompatActivity() {
     appPackage =
       intent.getStringExtra(EXTRA_APP_PACKAGE)
         ?: run {
-          e { "AutofillPublisherChangedActivity started without EXTRA_PACKAGE_NAME" }
+          logcat(ERROR) { "AutofillPublisherChangedActivity started without EXTRA_PACKAGE_NAME" }
           finish()
           return
         }
@@ -117,7 +119,7 @@ class AutofillPublisherChangedActivity : AppCompatActivity() {
       }
     }
       .onFailure { e ->
-        e(e) { "Failed to retrieve package info for $appPackage" }
+        logcat(ERROR) { e.asLog("Failed to retrieve package info for $appPackage") }
         finish()
       }
   }
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillSaveActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillSaveActivity.kt
index a2ed02fd..c6feec1e 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillSaveActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillSaveActivity.kt
@@ -15,7 +15,6 @@ import androidx.activity.result.contract.ActivityResultContracts.StartActivityFo
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.os.bundleOf
-import com.github.ajalt.timberkt.e
 import com.github.androidpasswordstore.autofillparser.AutofillAction
 import com.github.androidpasswordstore.autofillparser.Credentials
 import com.github.androidpasswordstore.autofillparser.FormOrigin
@@ -26,6 +25,8 @@ import dev.msfjarvis.aps.util.autofill.AutofillPreferences
 import dev.msfjarvis.aps.util.autofill.AutofillResponseBuilder
 import dev.msfjarvis.aps.util.extensions.unsafeLazy
 import java.io.File
+import logcat.LogPriority.ERROR
+import logcat.logcat
 
 @RequiresApi(Build.VERSION_CODES.O)
 class AutofillSaveActivity : AppCompatActivity() {
@@ -131,7 +132,7 @@ class AutofillSaveActivity : AppCompatActivity() {
               val clientState =
                 intent?.getBundleExtra(AutofillManager.EXTRA_CLIENT_STATE)
                   ?: run {
-                    e { "AutofillDecryptActivity started without EXTRA_CLIENT_STATE" }
+                    logcat(ERROR) { "AutofillDecryptActivity started without EXTRA_CLIENT_STATE" }
                     finish()
                     return@registerForActivityResult
                   }