kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GitConfigActivity: use runCatching to replace exception handling

Browse source 
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya 2020-09-05 20:27:20 +05:30
parent 361a801e47
commit 5951a983b1
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/com/zeapo/pwdstore/git/GitConfigActivity.kt
View file

@ -12,6 +12,9 @@ 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
import com.github.michaelbull.result.runCatching
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.snackbar.Snackbar
import com.zeapo.pwdstore.R
@ -69,10 +72,9 @@ class GitConfigActivity : BaseGitActivity() {
binding.gitAbortRebase.alpha = if (isRebasing) 1.0f else 0.5f
}
binding.gitLog.setOnClickListener {
try {
intent = Intent(this, GitLogActivity::class.java)
startActivity(intent)
} catch (ex: Exception) {
runCatching {
startActivity(Intent(this, GitLogActivity::class.java))
}.onFailure { ex ->
e(ex) { "Failed to start GitLogActivity" }
}
}
@ -112,7 +114,7 @@ class GitConfigActivity : BaseGitActivity() {
* The state is recognized to be either pointing to a branch or detached.
*/
private fun headStatusMsg(repo: Repository): String {
return try {
return runCatching {
val headRef = repo.getRef(Constants.HEAD)
if (headRef.isSymbolic) {
val branchName = headRef.target.name
@ -122,7 +124,7 @@ class GitConfigActivity : BaseGitActivity() {
val commitHash = headRef.objectId.abbreviate(8).name()
getString(R.string.git_head_detached, commitHash)
}
} catch (ex: Exception) {
}.getOrElse { ex ->
e(ex) { "Error getting HEAD reference" }
getString(R.string.git_head_missing)
}