From 2d607c78e79fb42eb10803fd5ed412cb74442807 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 27 Jan 2022 09:22:15 +0530 Subject: Unwind PasswordRepository's confusing control flow (#1686) * Cleanup PasswordRepository * Tear out nonsensical logic for getRepository --- app/src/main/java/dev/msfjarvis/aps/util/git/GitLogModel.kt | 2 +- app/src/main/java/dev/msfjarvis/aps/util/git/operation/GitOperation.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app/src/main/java/dev/msfjarvis/aps/util') diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/GitLogModel.kt b/app/src/main/java/dev/msfjarvis/aps/util/git/GitLogModel.kt index 4753bcd6..444a9fee 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/git/GitLogModel.kt +++ b/app/src/main/java/dev/msfjarvis/aps/util/git/GitLogModel.kt @@ -20,7 +20,7 @@ import org.eclipse.jgit.revwalk.RevCommit private val TAG = GitLogModel::class.java.simpleName private fun commits(): Iterable { - val repo = PasswordRepository.getRepository(null) + val repo = PasswordRepository.repository if (repo == null) { logcat(TAG, ERROR) { "Could not access git repository" } return listOf() 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 fe464069..f487b195 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 @@ -70,7 +70,7 @@ abstract class GitOperation(protected val callingActivity: FragmentActivity) { GitOperationEntryPoint::class.java ) - protected val repository = PasswordRepository.getRepository(null)!! + protected val repository = PasswordRepository.repository!! protected val git = Git(repository) protected val remoteBranch = hiltEntryPoint.gitSettings().branch private val authActivity -- cgit v1.2.3