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

PasswordRepository: 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:29:55 +05:30
parent 5951a983b1
commit 83654896b6
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt
View file

@ -9,6 +9,9 @@ import android.content.SharedPreferences
import android.os.Build
import androidx.annotation.RequiresApi
import androidx.core.content.edit
import com.github.michaelbull.result.runCatching
import com.github.michaelbull.result.getOrElse
import com.github.michaelbull.result.onFailure
import com.zeapo.pwdstore.Application
import java.io.File
import java.io.FileFilter
@ -105,14 +108,14 @@ open class PasswordRepository protected constructor() {
fun getRepository(localDir: File?): Repository? {
if (repository == null && localDir != null) {
val builder = FileRepositoryBuilder()
try {
repository = builder.setGitDir(localDir)
repository = runCatching {
builder.setGitDir(localDir)
.setFS(Java7FSFactory().detect(null))
.readEnvironment()
.build()
} catch (e: Exception) {
}.getOrElse { e ->
e.printStackTrace()
return null
null
}
}
return repository
@ -146,7 +149,7 @@ open class PasswordRepository protected constructor() {
val remotes = storedConfig.getSubsections("remote")
if (!remotes.contains(name)) {
try {
runCatching {
val uri = URIish(url)
val refSpec = RefSpec("+refs/head/*:refs/remotes/$name/*")
@ -159,11 +162,11 @@ open class PasswordRepository protected constructor() {
remoteConfig.update(storedConfig)
storedConfig.save()
} catch (e: Exception) {
}.onFailure { e ->
e.printStackTrace()
}
} else if (replace) {
try {
runCatching {
val uri = URIish(url)
val remoteConfig = RemoteConfig(storedConfig, name)
@ -181,7 +184,7 @@ open class PasswordRepository protected constructor() {
remoteConfig.update(storedConfig)
storedConfig.save()
} catch (e: Exception) {
}.onFailure { e ->
e.printStackTrace()
}
}