From 2cef6a5bb4cb4afb1b1f1b704f83c1565e441825 Mon Sep 17 00:00:00 2001
From: "(´⌣`ʃƪ)" <pt2121@users.noreply.github.com>
Date: Sun, 3 Oct 2021 01:32:15 -0700
Subject: 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>
---
 .../java/dev/msfjarvis/aps/ui/crypto/BasePgpActivity.kt  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'app/src/main/java/dev/msfjarvis/aps/ui/crypto/BasePgpActivity.kt')

diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/BasePgpActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/BasePgpActivity.kt
index 0a114827..6920bba2 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/BasePgpActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/BasePgpActivity.kt
@@ -17,9 +17,6 @@ import android.view.WindowManager
 import androidx.annotation.CallSuper
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
-import com.github.ajalt.timberkt.Timber.tag
-import com.github.ajalt.timberkt.e
-import com.github.ajalt.timberkt.i
 import com.github.michaelbull.result.getOr
 import com.github.michaelbull.result.runCatching
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -29,6 +26,7 @@ import dev.msfjarvis.aps.R
 import dev.msfjarvis.aps.injection.prefs.SettingsPreferences
 import dev.msfjarvis.aps.util.FeatureFlags
 import dev.msfjarvis.aps.util.extensions.OPENPGP_PROVIDER
+import dev.msfjarvis.aps.util.extensions.asLog
 import dev.msfjarvis.aps.util.extensions.clipboard
 import dev.msfjarvis.aps.util.extensions.getString
 import dev.msfjarvis.aps.util.extensions.snackbar
@@ -37,6 +35,9 @@ import dev.msfjarvis.aps.util.services.ClipboardService
 import dev.msfjarvis.aps.util.settings.PreferenceKeys
 import java.io.File
 import javax.inject.Inject
+import logcat.LogPriority.ERROR
+import logcat.LogPriority.INFO
+import logcat.logcat
 import me.msfjarvis.openpgpktx.util.OpenPgpApi
 import me.msfjarvis.openpgpktx.util.OpenPgpServiceConnection
 import org.openintents.openpgp.IOpenPgpService2
@@ -82,7 +83,6 @@ open class BasePgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBou
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
-    tag(TAG)
   }
 
   /**
@@ -121,7 +121,7 @@ open class BasePgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBou
    * super.
    */
   override fun onError(e: Exception) {
-    e(e) { "Callers must handle their own exceptions" }
+    logcat(ERROR) { e.asLog("Callers must handle their own exceptions") }
     throw e
   }
 
@@ -176,7 +176,7 @@ open class BasePgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBou
    * @param result The intent returned by OpenKeychain
    */
   fun getUserInteractionRequestIntent(result: Intent): IntentSender {
-    i { "RESULT_CODE_USER_INTERACTION_REQUIRED" }
+    logcat(INFO) { "RESULT_CODE_USER_INTERACTION_REQUIRED" }
     return result.getParcelableExtra<PendingIntent>(OpenPgpApi.RESULT_INTENT)!!.intentSender
   }
 
@@ -196,8 +196,8 @@ open class BasePgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBou
         }
         else -> {
           snackbar(message = getString(R.string.openpgp_error_unknown, error.message))
-          e { "onError getErrorId: ${error.errorId}" }
-          e { "onError getMessage: ${error.message}" }
+          logcat(ERROR) { "onError getErrorId: ${error.errorId}" }
+          logcat(ERROR) { "onError getMessage: ${error.message}" }
         }
       }
     }
-- 
cgit v1.2.3