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

GitOperation: 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:35:24 +05:30
parent 58f28727c1
commit ee6fd10ea6
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt
View file

@ -7,9 +7,12 @@ package com.zeapo.pwdstore.git.operation
import android.content.Intent
import android.widget.Toast
import androidx.fragment.app.FragmentActivity
import com.github.ajalt.timberkt.e
import com.github.michaelbull.result.Err
import com.github.michaelbull.result.Ok
import com.github.michaelbull.result.Result
import com.github.michaelbull.result.onFailure
import com.github.michaelbull.result.runCatching
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.zeapo.pwdstore.R
import com.zeapo.pwdstore.UserPreference
@ -86,15 +89,13 @@ abstract class GitOperation(protected val callingActivity: FragmentActivity) {
}
private fun getSshKey(make: Boolean) {
try {
runCatching {
// Ask the UserPreference to provide us with the ssh-key
// onResult has to be handled by the callingActivity
val intent = Intent(callingActivity.applicationContext, UserPreference::class.java)
intent.putExtra("operation", if (make) "make_ssh_key" else "get_ssh_key")
callingActivity.startActivityForResult(intent, GET_SSH_KEY_FROM_CLONE)
} catch (e: Exception) {
println("Exception caught :(")
e.printStackTrace()
callingActivity.startActivity(intent)
}.onFailure { e ->
e(e)
}
}