aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/dev/msfjarvis/aps/util/git
diff options
context:
space:
mode:
authorAditya Wasan <adityawasan55@gmail.com>2021-05-22 17:51:02 +0530
committerHarsh Shandilya <me@msfjarvis.dev>2021-05-22 20:05:54 +0530
commit521f4772d797ca424dcb076359382d7a336b8de7 (patch)
tree23b610fe90a7fbba2902328b0ab0271fbb9780e2 /app/src/main/java/dev/msfjarvis/aps/util/git
parentd45bb753cfeb5300ac563135b01872a9058ce1ca (diff)
downloadHardenedPass-521f4772d797ca424dcb076359382d7a336b8de7.tar.gz
HardenedPass-521f4772d797ca424dcb076359382d7a336b8de7.zip
spotless: fix formatting
Signed-off-by: Aditya Wasan <adityawasan55@gmail.com>
Diffstat (limited to 'app/src/main/java/dev/msfjarvis/aps/util/git')
-rw-r--r--app/src/main/java/dev/msfjarvis/aps/util/git/GitCommandExecutor.kt6
-rw-r--r--app/src/main/java/dev/msfjarvis/aps/util/git/operation/GitOperation.kt10
2 files changed, 10 insertions, 6 deletions
diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/GitCommandExecutor.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/GitCommandExecutor.kt
index 5d507dc8..be0527a2 100644
--- a/app/src/main/java/dev/msfjarvis/aps/util/git/GitCommandExecutor.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/git/GitCommandExecutor.kt
@@ -34,7 +34,11 @@ class GitCommandExecutor(
private val operation: GitOperation,
) {
- private val hiltEntryPoint = EntryPointAccessors.fromApplication(activity.applicationContext, GitCommandExecutorEntryPoint::class.java)
+ private val hiltEntryPoint =
+ EntryPointAccessors.fromApplication(
+ activity.applicationContext,
+ GitCommandExecutorEntryPoint::class.java
+ )
private val gitSettings = hiltEntryPoint.gitSettings()
suspend fun execute(): Result<Unit, Throwable> {
diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/operation/GitOperation.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/operation/GitOperation.kt
index 5a9da290..9d296353 100644
--- a/app/src/main/java/dev/msfjarvis/aps/util/git/operation/GitOperation.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/git/operation/GitOperation.kt
@@ -16,7 +16,6 @@ import com.github.michaelbull.result.runCatching
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import dagger.hilt.EntryPoint
import dagger.hilt.InstallIn
-import dagger.hilt.android.AndroidEntryPoint
import dagger.hilt.android.EntryPointAccessors
import dagger.hilt.components.SingletonComponent
import dev.msfjarvis.aps.R
@@ -31,8 +30,6 @@ import dev.msfjarvis.aps.util.git.sshj.SshKey
import dev.msfjarvis.aps.util.git.sshj.SshjSessionFactory
import dev.msfjarvis.aps.util.settings.AuthMode
import dev.msfjarvis.aps.util.settings.GitSettings
-import javax.inject.Inject
-import javax.inject.Singleton
import kotlin.coroutines.resume
import kotlin.coroutines.suspendCoroutine
import kotlinx.coroutines.Dispatchers
@@ -60,7 +57,11 @@ abstract class GitOperation(protected val callingActivity: FragmentActivity) {
abstract val commands: Array<GitCommand<out Any>>
private val hostKeyFile = callingActivity.filesDir.resolve(".host_key")
private var sshSessionFactory: SshjSessionFactory? = null
- private val hiltEntryPoint = EntryPointAccessors.fromApplication(callingActivity.applicationContext, GitOperationEntryPoint::class.java)
+ private val hiltEntryPoint =
+ EntryPointAccessors.fromApplication(
+ callingActivity.applicationContext,
+ GitOperationEntryPoint::class.java
+ )
protected val repository = PasswordRepository.getRepository(null)!!
protected val git = Git(repository)
@@ -229,7 +230,6 @@ abstract class GitOperation(protected val callingActivity: FragmentActivity) {
private const val CONNECT_TIMEOUT = 10
}
- // Using @EntryPoint seems to be our best option here, changing this to constructor injection would require a larger refactor.
@EntryPoint
@InstallIn(SingletonComponent::class)
interface GitOperationEntryPoint {