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

Revert "Refactor GitCommandExecutor (#1255)" (#1267)

Browse source 
This breaks propagation of errors to the UI layer

This reverts commit c34d08b094.
This commit is contained in:
Harsh Shandilya 2021-01-01 23:03:13 +05:30 committed by GitHub
parent 360f96306b
commit fa2279791f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
app/src/main/java/dev/msfjarvis/aps/util/git/GitCommandExecutor.kt
View file

@ -5,12 +5,17 @@
package dev.msfjarvis.aps.util.git
import dev.msfjarvis.aps.util.git.GitException.PullException
import dev.msfjarvis.aps.util.git.GitException.PushException
import dev.msfjarvis.aps.util.git.operation.GitOperation
import dev.msfjarvis.aps.util.settings.GitSettings
import android.widget.Toast
import androidx.fragment.app.FragmentActivity
import com.github.michaelbull.result.Result
import com.github.michaelbull.result.runCatching
import com.google.android.material.snackbar.Snackbar
import dev.msfjarvis.aps.R
import dev.msfjarvis.aps.util.git.GitException.PullException
import dev.msfjarvis.aps.util.git.GitException.PushException
import dev.msfjarvis.aps.util.settings.GitSettings
import dev.msfjarvis.aps.util.git.operation.GitOperation
import dev.msfjarvis.aps.util.extensions.snackbar
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.eclipse.jgit.api.CommitCommand
@ -22,10 +27,15 @@ import org.eclipse.jgit.lib.PersonIdent
import org.eclipse.jgit.transport.RemoteRefUpdate
class GitCommandExecutor(
private val activity: FragmentActivity,
private val operation: GitOperation,
) {
suspend fun execute(): Result<GitResult, Throwable> {
suspend fun execute(): Result<Unit, Throwable> {
val snackbar = activity.snackbar(
message = activity.resources.getString(R.string.git_operation_running),
length = Snackbar.LENGTH_INDEFINITE,
)
// Count the number of uncommitted files
var nbChanges = 0
return runCatching {
@ -79,7 +89,13 @@ class GitCommandExecutor(
}
}
RemoteRefUpdate.Status.UP_TO_DATE -> {
return@runCatching GitResult.AlreadyUpToDate
withContext(Dispatchers.Main) {
Toast.makeText(
activity.applicationContext,
activity.applicationContext.getString(R.string.git_push_up_to_date),
Toast.LENGTH_SHORT
).show()
}
}
else -> {
}
@ -94,7 +110,8 @@ class GitCommandExecutor(
}
}
}
GitResult.OK
}.also {
snackbar.dismiss()
}
}
}

22
app/src/main/java/dev/msfjarvis/aps/util/git/GitResult.kt
View file

@ -1,22 +0,0 @@
/*
* Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
* SPDX-License-Identifier: GPL-3.0-only
*/
package dev.msfjarvis.aps.util.git
/**
* Result of a Git operation executed by [GitCommandExecutor]
*/
sealed class GitResult {
/**
* All good!
*/
object OK : GitResult()
/**
* Push operation succeeded and HEAD is already in sync with remote.
*/
object AlreadyUpToDate : GitResult()
}

30
app/src/main/java/dev/msfjarvis/aps/util/git/operation/GitOperation.kt
View file

@ -25,10 +25,6 @@ import dev.msfjarvis.aps.util.git.sshj.SshKey
import dev.msfjarvis.aps.util.git.sshj.SshjSessionFactory
import dev.msfjarvis.aps.util.auth.BiometricAuthenticator
import dev.msfjarvis.aps.data.repo.PasswordRepository
import dev.msfjarvis.aps.util.extensions.snackbar
import dev.msfjarvis.aps.util.git.GitResult
import com.github.michaelbull.result.get
import com.google.android.material.snackbar.Snackbar
import kotlin.coroutines.resume
import kotlin.coroutines.suspendCoroutine
import kotlinx.coroutines.Dispatchers
@ -123,14 +119,12 @@ abstract class GitOperation(protected val callingActivity: FragmentActivity) {
if (!preExecute()) {
return Ok(Unit)
}
val snackbar = callingActivity.snackbar(
message = callingActivity.resources.getString(R.string.git_operation_running),
length = Snackbar.LENGTH_INDEFINITE,
)
val operationResult = GitCommandExecutor(this).execute()
snackbar.dismiss()
postExecute(operationResult)
return Ok(Unit)
val operationResult = GitCommandExecutor(
callingActivity,
this,
).execute()
postExecute()
return operationResult
}
private fun onMissingSshKeyFile() {
@ -206,17 +200,7 @@ abstract class GitOperation(protected val callingActivity: FragmentActivity) {
*/
open fun preExecute() = true
private suspend fun postExecute(result: Result<GitResult, Throwable>) {
when (result.get()) {
GitResult.OK -> {}
GitResult.AlreadyUpToDate -> {
Toast.makeText(
callingActivity,
callingActivity.getString(R.string.git_push_up_to_date),
Toast.LENGTH_SHORT
).show()
}
}
private suspend fun postExecute() {
withContext(Dispatchers.IO) {
sshSessionFactory?.close()
}