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>

3 files changed, 13 insertions, 13 deletions

diff --git a/app/src/main/java/dev/msfjarvis/aps/util/services/ClipboardService.kt b/app/src/main/java/dev/msfjarvis/aps/util/services/ClipboardService.kt
index de7d727c..84de5c91 100644
--- a/app/src/main/java/dev/msfjarvis/aps/util/services/ClipboardService.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/services/ClipboardService.kt
@@ -16,7 +16,6 @@ import android.os.IBinder
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 import androidx.core.content.getSystemService
-import com.github.ajalt.timberkt.d
 import dev.msfjarvis.aps.R
 import dev.msfjarvis.aps.util.extensions.clipboard
 import dev.msfjarvis.aps.util.extensions.sharedPrefs
@@ -29,6 +28,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import logcat.logcat
 
 class ClipboardService : Service() {
 
@@ -82,7 +82,7 @@ class ClipboardService : Service() {
 
     if (clipboard != null) {
       scope.launch {
-        d { "Clearing the clipboard" }
+        logcat { "Clearing the clipboard" }
         val clip = ClipData.newPlainText("pgp_handler_result_pm", "")
         clipboard.setPrimaryClip(clip)
         if (deepClear) {
@@ -95,7 +95,7 @@ class ClipboardService : Service() {
         }
       }
     } else {
-      d { "Cannot get clipboard manager service" }
+      logcat { "Cannot get clipboard manager service" }
     }
   }
 
@@ -169,7 +169,7 @@ class ClipboardService : Service() {
       if (manager != null) {
         manager.createNotificationChannel(serviceChannel)
       } else {
-        d { "Failed to create notification channel" }
+        logcat { "Failed to create notification channel" }
       }
     }
   }
diff --git a/app/src/main/java/dev/msfjarvis/aps/util/services/OreoAutofillService.kt b/app/src/main/java/dev/msfjarvis/aps/util/services/OreoAutofillService.kt
index 4c75a619..a52caff0 100644
--- a/app/src/main/java/dev/msfjarvis/aps/util/services/OreoAutofillService.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/services/OreoAutofillService.kt
@@ -14,8 +14,6 @@ import android.service.autofill.FillResponse
 import android.service.autofill.SaveCallback
 import android.service.autofill.SaveRequest
 import androidx.annotation.RequiresApi
-import com.github.ajalt.timberkt.d
-import com.github.ajalt.timberkt.e
 import com.github.androidpasswordstore.autofillparser.AutofillScenario
 import com.github.androidpasswordstore.autofillparser.Credentials
 import com.github.androidpasswordstore.autofillparser.FillableForm
@@ -34,6 +32,8 @@ import dev.msfjarvis.aps.util.extensions.getString
 import dev.msfjarvis.aps.util.extensions.hasFlag
 import dev.msfjarvis.aps.util.extensions.sharedPrefs
 import dev.msfjarvis.aps.util.settings.PreferenceKeys
+import logcat.LogPriority.ERROR
+import logcat.logcat
 
 @RequiresApi(Build.VERSION_CODES.O)
 class OreoAutofillService : AutofillService() {
@@ -92,7 +92,7 @@ class OreoAutofillService : AutofillService() {
         getCustomSuffixes(),
       )
         ?: run {
-          d { "Form cannot be filled" }
+          logcat { "Form cannot be filled" }
           callback.onSuccess(null)
           return
         }
@@ -117,21 +117,21 @@ class OreoAutofillService : AutofillService() {
     val clientState =
       request.clientState
         ?: run {
-          e { "Received save request without client state" }
+          logcat(ERROR) { "Received save request without client state" }
           callback.onFailure(getString(R.string.oreo_autofill_save_internal_error))
           return
         }
     val scenario =
       AutofillScenario.fromClientState(clientState)?.recoverNodes(structure)
         ?: run {
-          e { "Failed to recover client state or nodes from client state" }
+          logcat(ERROR) { "Failed to recover client state or nodes from client state" }
           callback.onFailure(getString(R.string.oreo_autofill_save_internal_error))
           return
         }
     val formOrigin =
       FormOrigin.fromBundle(clientState)
         ?: run {
-          e { "Failed to recover form origin from client state" }
+          logcat(ERROR) { "Failed to recover form origin from client state" }
           callback.onFailure(getString(R.string.oreo_autofill_save_internal_error))
           return
         }
diff --git a/app/src/main/java/dev/msfjarvis/aps/util/services/PasswordExportService.kt b/app/src/main/java/dev/msfjarvis/aps/util/services/PasswordExportService.kt
index 72f14144..6740fc04 100644
--- a/app/src/main/java/dev/msfjarvis/aps/util/services/PasswordExportService.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/services/PasswordExportService.kt
@@ -15,13 +15,13 @@ import android.os.IBinder
 import androidx.core.app.NotificationCompat
 import androidx.core.content.getSystemService
 import androidx.documentfile.provider.DocumentFile
-import com.github.ajalt.timberkt.d
 import dev.msfjarvis.aps.R
 import dev.msfjarvis.aps.data.repo.PasswordRepository
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import java.util.Calendar
 import java.util.TimeZone
+import logcat.logcat
 
 class PasswordExportService : Service() {
 
@@ -62,7 +62,7 @@ class PasswordExportService : Service() {
     val repositoryDirectory = requireNotNull(PasswordRepository.getRepositoryDirectory())
     val sourcePassDir = DocumentFile.fromFile(repositoryDirectory)
 
-    d { "Copying ${repositoryDirectory.path} to $targetDirectory" }
+    logcat { "Copying ${repositoryDirectory.path} to $targetDirectory" }
 
     val dateString =
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -146,7 +146,7 @@ class PasswordExportService : Service() {
       if (manager != null) {
         manager.createNotificationChannel(serviceChannel)
       } else {
-        d { "Failed to create notification channel" }
+        logcat { "Failed to create notification channel" }
       }
     }
   }