aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt
diff options
context:
space:
mode:
authorHarsh Shandilya <msfjarvis@gmail.com>2020-07-29 16:25:49 +0530
committerGitHub <noreply@github.com>2020-07-29 16:25:49 +0530
commit017abd0f61663889e911fdb6328cbd793de960ac (patch)
tree54b7066eed90bee1db232dbf5fa09044a81b0c57 /app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt
parent729fc80255a2b9b8a2ff669530d189a4f4ab06f8 (diff)
downloadHardenedPass-017abd0f61663889e911fdb6328cbd793de960ac.tar.gz
HardenedPass-017abd0f61663889e911fdb6328cbd793de960ac.zip
Add ability to change default branch (#977)
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt')
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt11
1 files changed, 10 insertions, 1 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt b/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt
index 283b0b89..6c87e0f6 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/GitServerConfigActivity.kt
@@ -102,6 +102,13 @@ class GitServerConfigActivity : BaseGitActivity() {
}
}
+ binding.serverBranch.apply {
+ setText(branch)
+ doOnTextChanged { text, _, _, _ ->
+ branch = text.toString().trim()
+ }
+ }
+
binding.saveButton.setOnClickListener {
if (isClone && PasswordRepository.getRepository(null) == null)
PasswordRepository.initialize(this)
@@ -114,12 +121,14 @@ class GitServerConfigActivity : BaseGitActivity() {
putString(PreferenceKeys.GIT_REMOTE_PORT, serverPort)
putString(PreferenceKeys.GIT_REMOTE_USERNAME, serverUser)
putString(PreferenceKeys.GIT_REMOTE_LOCATION, serverPath)
+ putString(PreferenceKeys.GIT_BRANCH_NAME, branch)
}
if (!isClone) {
Snackbar.make(binding.root, getString(R.string.git_server_config_save_success), Snackbar.LENGTH_SHORT).show()
Handler().postDelayed(500) { finish() }
- } else
+ } else {
cloneRepository()
+ }
}
else -> Snackbar.make(binding.root, getString(R.string.git_server_config_save_error_prefix, getString(result.textRes)), Snackbar.LENGTH_LONG).show()
}