2 files changed, 13 insertions, 14 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 faaf426f..8ca719eb 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
@@ -25,7 +25,6 @@ import dev.msfjarvis.aps.databinding.ActivityGitConfigBinding
 import dev.msfjarvis.aps.ui.git.base.BaseGitActivity
 import dev.msfjarvis.aps.ui.git.log.GitLogActivity
 import dev.msfjarvis.aps.util.extensions.viewBinding
-import dev.msfjarvis.aps.util.settings.GitSettings
 import kotlinx.coroutines.launch
 import org.eclipse.jgit.lib.Constants
 import org.eclipse.jgit.lib.Repository
@@ -40,9 +39,9 @@ class GitConfigActivity : BaseGitActivity() {
     setContentView(binding.root)
     supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
-    if (GitSettings.authorName.isEmpty()) binding.gitUserName.requestFocus()
-    else binding.gitUserName.setText(GitSettings.authorName)
-    binding.gitUserEmail.setText(GitSettings.authorEmail)
+    if (gitSettings.authorName.isEmpty()) binding.gitUserName.requestFocus()
+    else binding.gitUserName.setText(gitSettings.authorName)
+    binding.gitUserEmail.setText(gitSettings.authorEmail)
     setupTools()
     binding.saveButton.setOnClickListener {
       val email = binding.gitUserEmail.text.toString().trim()
@@ -53,8 +52,8 @@ class GitConfigActivity : BaseGitActivity() {
           .setPositiveButton(getString(R.string.dialog_ok), null)
           .show()
       } else {
-        GitSettings.authorEmail = email
-        GitSettings.authorName = name
+        gitSettings.authorEmail = email
+        gitSettings.authorName = name
         Snackbar.make(
             binding.root,
             getString(R.string.git_server_config_save_success),
@@ -102,8 +101,8 @@ class GitConfigActivity : BaseGitActivity() {
                 setMessage(
                   resources.getString(
                     R.string.git_break_out_of_detached_success,
-                    GitSettings.branch,
-                    "conflicting-${GitSettings.branch}-...",
+                    gitSettings.branch,
+                    "conflicting-${gitSettings.branch}-...",
                   )
                 )
                 setOnDismissListener { finish() }
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 cab8d3ae..5265131b 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
@@ -54,7 +54,7 @@ class GitServerConfigActivity : BaseGitActivity() {
     setContentView(binding.root)
     supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
-    newAuthMode = GitSettings.authMode
+    newAuthMode = gitSettings.authMode
 
     binding.authModeGroup.apply {
       when (newAuthMode) {
@@ -74,21 +74,21 @@ class GitServerConfigActivity : BaseGitActivity() {
     }
 
     binding.serverUrl.setText(
-      GitSettings.url.also {
+      gitSettings.url.also {
         if (it.isNullOrEmpty()) return@also
         setAuthModes(it.startsWith("http://") || it.startsWith("https://"))
       }
     )
-    binding.serverBranch.setText(GitSettings.branch)
+    binding.serverBranch.setText(gitSettings.branch)
 
     binding.serverUrl.doOnTextChanged { text, _, _, _ ->
       if (text.isNullOrEmpty()) return@doOnTextChanged
       setAuthModes(text.startsWith("http://") || text.startsWith("https://"))
     }
 
-    binding.clearHostKeyButton.isVisible = GitSettings.hasSavedHostKey()
+    binding.clearHostKeyButton.isVisible = gitSettings.hasSavedHostKey()
     binding.clearHostKeyButton.setOnClickListener {
-      GitSettings.clearSavedHostKey()
+      gitSettings.clearSavedHostKey()
       Snackbar.make(
           binding.root,
           getString(R.string.clear_saved_host_key_success),
@@ -135,7 +135,7 @@ class GitServerConfigActivity : BaseGitActivity() {
         return@setOnClickListener
       }
       when (val updateResult =
-          GitSettings.updateConnectionSettingsIfValid(
+          gitSettings.updateConnectionSettingsIfValid(
             newAuthMode = newAuthMode,
             newUrl = binding.serverUrl.text.toString().trim(),
             newBranch = binding.serverBranch.text.toString().trim()