diff options
| author | Harsh Shandilya <me@msfjarvis.dev> | 2021-01-12 21:42:53 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-12 21:42:53 +0530 |
| commit | 1e9e5686afc2a6515f871c5f2ad4dc2ddc4731c4 (patch) | |
| tree | 3cce3972dd01f6c5cc4884e5c7b99c5e2db7eae5 /app/src/main/java/dev/msfjarvis/aps/ui/settings | |
| parent | 8bd156dea6e87eb667f76f4738fde992323ce0cf (diff) | |
| download | HardenedPass-1e9e5686afc2a6515f871c5f2ad4dc2ddc4731c4.tar.gz HardenedPass-1e9e5686afc2a6515f871c5f2ad4dc2ddc4731c4.zip | |
Allow configuring pull behaviour (#1276)
Diffstat (limited to 'app/src/main/java/dev/msfjarvis/aps/ui/settings')
| -rw-r--r-- | app/src/main/java/dev/msfjarvis/aps/ui/settings/RepositorySettings.kt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/settings/RepositorySettings.kt b/app/src/main/java/dev/msfjarvis/aps/ui/settings/RepositorySettings.kt index 32d04c9b..22ac899a 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/settings/RepositorySettings.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/settings/RepositorySettings.kt @@ -56,6 +56,12 @@ class RepositorySettings(private val activity: FragmentActivity) : SettingsProvi override fun provideSettings(builder: PreferenceScreen.Builder) { builder.apply { + checkBox(PreferenceKeys.REBASE_ON_PULL) { + titleRes = R.string.pref_rebase_on_pull_title + summaryRes = R.string.pref_rebase_on_pull_summary + summaryOnRes = R.string.pref_rebase_on_pull_summary_on + defaultValue = true + } pref(PreferenceKeys.GIT_SERVER_INFO) { titleRes = R.string.pref_edit_git_server_settings visible = PasswordRepository.isGitRepo() |