From 2cef6a5bb4cb4afb1b1f1b704f83c1565e441825 Mon Sep 17 00:00:00 2001 From: "(´⌣`ʃƪ)" 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 --- app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt | 5 +++-- .../main/java/dev/msfjarvis/aps/ui/git/config/GitConfigActivity.kt | 7 ++++--- .../dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt | 6 ++++-- app/src/main/java/dev/msfjarvis/aps/ui/git/log/GitLogAdapter.kt | 5 +++-- 4 files changed, 14 insertions(+), 9 deletions(-) (limited to 'app/src/main/java/dev/msfjarvis/aps/ui/git') diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt index b3155264..a008f6c7 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt @@ -7,7 +7,6 @@ package dev.msfjarvis.aps.ui.git.base import android.content.SharedPreferences import androidx.appcompat.app.AppCompatActivity import androidx.core.content.edit -import com.github.ajalt.timberkt.d import com.github.michaelbull.result.Err import com.github.michaelbull.result.Result import com.github.michaelbull.result.andThen @@ -30,6 +29,8 @@ import dev.msfjarvis.aps.util.settings.PreferenceKeys import javax.inject.Inject import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext +import logcat.asLog +import logcat.logcat import net.schmizz.sshj.common.DisconnectReason import net.schmizz.sshj.common.SSHException import net.schmizz.sshj.transport.TransportException @@ -89,7 +90,7 @@ abstract class BaseGitActivity : ContinuationContainerActivity() { if (!isExplicitlyUserInitiatedError(error)) { gitPrefs.edit { remove(PreferenceKeys.HTTPS_PASSWORD) } sharedPrefs.edit { remove(PreferenceKeys.SSH_OPENKEYSTORE_KEYID) } - d(error) + logcat { error.asLog() } withContext(Dispatchers.Main) { MaterialAlertDialogBuilder(this@BaseGitActivity).run { setTitle(resources.getString(R.string.jgit_error_dialog_title)) diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitConfigActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitConfigActivity.kt index 8ca719eb..04014e17 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitConfigActivity.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitConfigActivity.kt @@ -12,7 +12,6 @@ import android.util.Patterns import android.view.MenuItem import androidx.core.os.postDelayed import androidx.lifecycle.lifecycleScope -import com.github.ajalt.timberkt.e import com.github.michaelbull.result.fold import com.github.michaelbull.result.getOrElse import com.github.michaelbull.result.onFailure @@ -26,6 +25,8 @@ import dev.msfjarvis.aps.ui.git.base.BaseGitActivity import dev.msfjarvis.aps.ui.git.log.GitLogActivity import dev.msfjarvis.aps.util.extensions.viewBinding import kotlinx.coroutines.launch +import logcat.LogPriority.ERROR +import logcat.logcat import org.eclipse.jgit.lib.Constants import org.eclipse.jgit.lib.Repository import org.eclipse.jgit.lib.RepositoryState @@ -88,7 +89,7 @@ class GitConfigActivity : BaseGitActivity() { } binding.gitLog.setOnClickListener { runCatching { startActivity(Intent(this, GitLogActivity::class.java)) }.onFailure { ex -> - e(ex) { "Failed to start GitLogActivity" } + logcat(ERROR) { "Failed to start GitLogActivity\n${ex}" } } } binding.gitAbortRebase.setOnClickListener { @@ -143,7 +144,7 @@ class GitConfigActivity : BaseGitActivity() { } } .getOrElse { ex -> - e(ex) { "Error getting HEAD reference" } + logcat(ERROR) { "Error getting HEAD reference\n${ex}" } getString(R.string.git_head_missing) } } diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt index 5265131b..d1e84374 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt @@ -15,7 +15,6 @@ import androidx.core.os.postDelayed import androidx.core.view.isVisible import androidx.core.widget.doOnTextChanged import androidx.lifecycle.lifecycleScope -import com.github.ajalt.timberkt.e import com.github.michaelbull.result.fold import com.github.michaelbull.result.onFailure import com.github.michaelbull.result.runCatching @@ -34,6 +33,9 @@ import dev.msfjarvis.aps.util.settings.Protocol import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext +import logcat.LogPriority.ERROR +import logcat.asLog +import logcat.logcat /** * Activity that encompasses both the initial clone as well as editing the server config for future @@ -269,7 +271,7 @@ class GitServerConfigActivity : BaseGitActivity() { } } .onFailure { e -> - e(e) + logcat(ERROR) { e.asLog() } MaterialAlertDialogBuilder(this).setMessage(e.message).show() } lifecycleScope.launch { diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/git/log/GitLogAdapter.kt b/app/src/main/java/dev/msfjarvis/aps/ui/git/log/GitLogAdapter.kt index 1470d642..a3080fef 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/git/log/GitLogAdapter.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/git/log/GitLogAdapter.kt @@ -8,12 +8,13 @@ package dev.msfjarvis.aps.ui.git.log import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.github.ajalt.timberkt.e import dev.msfjarvis.aps.databinding.GitLogRowLayoutBinding import dev.msfjarvis.aps.util.git.GitCommit import dev.msfjarvis.aps.util.git.GitLogModel import java.text.DateFormat import java.util.Date +import logcat.LogPriority.ERROR +import logcat.logcat private fun shortHash(hash: String): String { return hash.substring(0 until 8) @@ -37,7 +38,7 @@ class GitLogAdapter : RecyclerView.Adapter() { override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) { val commit = model.get(position) if (commit == null) { - e { "There is no git commit for view holder at position $position." } + logcat(ERROR) { "There is no git commit for view holder at position $position." } return } viewHolder.bind(commit) -- cgit v1.2.3