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/ui/git/config/GitConfigActivity.kt | 2 +- .../java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'app/src/main/java/dev/msfjarvis/aps/ui/git') diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitConfigActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitConfigActivity.kt index 4fed7b99..959d9325 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitConfigActivity.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitConfigActivity.kt @@ -78,7 +78,7 @@ class GitConfigActivity : BaseGitActivity() { /** Sets up the UI components of the tools section. */ private fun setupTools() { - val repo = PasswordRepository.getRepository(null) + val repo = PasswordRepository.repository if (repo != null) { binding.gitHeadStatus.text = headStatusMsg(repo) // enable the abort button only if we're rebasing or merging diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt index 4b82ee81..6b1f30ea 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt @@ -174,8 +174,7 @@ class GitServerConfigActivity : BaseGitActivity() { } } GitSettings.UpdateConnectionSettingsResult.Valid -> { - if (isClone && PasswordRepository.getRepository(null) == null) - PasswordRepository.initialize() + if (isClone && PasswordRepository.repository == null) PasswordRepository.initialize() if (!isClone) { Snackbar.make( binding.root, -- cgit v1.2.3