diff options
| author | Harsh Shandilya <me@msfjarvis.dev> | 2022-01-27 09:22:15 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-27 09:22:15 +0530 |
| commit | 2d607c78e79fb42eb10803fd5ed412cb74442807 (patch) | |
| tree | 60bf859ee9281e98a46162f2301b32d58611bd1d /app/src/main/java/dev/msfjarvis/aps/ui/git/config | |
| parent | d89d5003192cf11bd9701dddce63d5782b40a071 (diff) | |
| download | HardenedPass-2d607c78e79fb42eb10803fd5ed412cb74442807.tar.gz HardenedPass-2d607c78e79fb42eb10803fd5ed412cb74442807.zip | |
Unwind PasswordRepository's confusing control flow (#1686)
* Cleanup PasswordRepository
* Tear out nonsensical logic for getRepository
Diffstat (limited to 'app/src/main/java/dev/msfjarvis/aps/ui/git/config')
| -rw-r--r-- | app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitConfigActivity.kt | 2 | ||||
| -rw-r--r-- | app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt | 3 |
2 files changed, 2 insertions, 3 deletions
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, |