aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/com/zeapo/pwdstore/git/BaseGitActivity.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/BaseGitActivity.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/BaseGitActivity.kt')
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/git/BaseGitActivity.kt9
1 files changed, 5 insertions, 4 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/BaseGitActivity.kt b/app/src/main/java/com/zeapo/pwdstore/git/BaseGitActivity.kt
index a8f4c5b3..7a818bcf 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/BaseGitActivity.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/git/BaseGitActivity.kt
@@ -41,6 +41,7 @@ abstract class BaseGitActivity : AppCompatActivity() {
lateinit var serverPath: String
lateinit var username: String
lateinit var email: String
+ lateinit var branch: String
private var identityBuilder: SshApiSessionFactory.IdentityBuilder? = null
private var identity: SshApiSessionFactory.ApiIdentity? = null
lateinit var settings: SharedPreferences
@@ -61,6 +62,7 @@ abstract class BaseGitActivity : AppCompatActivity() {
serverPath = settings.getString(PreferenceKeys.GIT_REMOTE_LOCATION, null) ?: ""
username = settings.getString(PreferenceKeys.GIT_CONFIG_USER_NAME, null) ?: ""
email = settings.getString(PreferenceKeys.GIT_CONFIG_USER_EMAIL, null) ?: ""
+ branch = settings.getString(PreferenceKeys.GIT_BRANCH_NAME, null) ?: "master"
updateUrl()
}
@@ -248,10 +250,9 @@ abstract class BaseGitActivity : AppCompatActivity() {
const val REQUEST_PULL = 101
const val REQUEST_PUSH = 102
const val REQUEST_CLONE = 103
- const val REQUEST_INIT = 104
- const val REQUEST_SYNC = 105
- const val BREAK_OUT_OF_DETACHED = 106
- const val REQUEST_RESET = 107
+ const val REQUEST_SYNC = 104
+ const val BREAK_OUT_OF_DETACHED = 105
+ const val REQUEST_RESET = 106
const val TAG = "AbstractGitActivity"
}
}