kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow disabling pull-to-sync operation (#1922)

Browse source
This commit is contained in:
Harsh Shandilya 2022-05-24 16:17:35 +05:30 committed by GitHub
parent 8550bede22
commit 5f4bc7fafd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordFragment.kt
View file

@ -29,6 +29,7 @@ import dev.msfjarvis.aps.R
import dev.msfjarvis.aps.data.password.PasswordItem import dev.msfjarvis.aps.data.password.PasswordItem
import dev.msfjarvis.aps.data.repo.PasswordRepository import dev.msfjarvis.aps.data.repo.PasswordRepository
import dev.msfjarvis.aps.databinding.PasswordRecyclerViewBinding import dev.msfjarvis.aps.databinding.PasswordRecyclerViewBinding
import dev.msfjarvis.aps.injection.prefs.SettingsPreferences
import dev.msfjarvis.aps.ui.adapters.PasswordItemRecyclerAdapter import dev.msfjarvis.aps.ui.adapters.PasswordItemRecyclerAdapter
import dev.msfjarvis.aps.ui.dialogs.BasicBottomSheet import dev.msfjarvis.aps.ui.dialogs.BasicBottomSheet
import dev.msfjarvis.aps.ui.dialogs.ItemCreationBottomSheet import dev.msfjarvis.aps.ui.dialogs.ItemCreationBottomSheet
@ -55,6 +56,7 @@ class PasswordFragment : Fragment(R.layout.password_recycler_view) {
@Inject lateinit var gitSettings: GitSettings @Inject lateinit var gitSettings: GitSettings
@Inject lateinit var shortcutHandler: ShortcutHandler @Inject lateinit var shortcutHandler: ShortcutHandler
@Inject @SettingsPreferences lateinit var prefs: SharedPreferences
private lateinit var recyclerAdapter: PasswordItemRecyclerAdapter private lateinit var recyclerAdapter: PasswordItemRecyclerAdapter
private lateinit var listener: OnFragmentInteractionListener private lateinit var listener: OnFragmentInteractionListener
private lateinit var settings: SharedPreferences private lateinit var settings: SharedPreferences
@ -290,6 +292,11 @@ class PasswordFragment : Fragment(R.layout.password_recycler_view) {
} }
} }
override fun onResume() {
super.onResume()
binding.swipeRefresher.isEnabled = !prefs.getBoolean(PreferenceKeys.DISABLE_SYNC_ACTION, false)
}
override fun onAttach(context: Context) { override fun onAttach(context: Context) {
super.onAttach(context) super.onAttach(context)
runCatching { runCatching {

6
app/src/main/java/dev/msfjarvis/aps/ui/settings/GeneralSettings.kt
View file

@ -42,6 +42,12 @@ class GeneralSettings(private val activity: FragmentActivity) : SettingsProvider
titleRes = R.string.pref_sort_order_title titleRes = R.string.pref_sort_order_title
} }
checkBox(PreferenceKeys.DISABLE_SYNC_ACTION) {
titleRes = R.string.pref_disable_sync_on_pull_title
summaryRes = R.string.pref_disable_sync_on_pull_summary
defaultValue = false
}
checkBox(PreferenceKeys.FILTER_RECURSIVELY) { checkBox(PreferenceKeys.FILTER_RECURSIVELY) {
titleRes = R.string.pref_recursive_filter_title titleRes = R.string.pref_recursive_filter_title
summaryRes = R.string.pref_recursive_filter_summary summaryRes = R.string.pref_recursive_filter_summary

1
app/src/main/java/dev/msfjarvis/aps/util/settings/PreferenceKeys.kt
View file

@ -84,4 +84,5 @@ object PreferenceKeys {
const val DICEWARE_SEPARATOR = "diceware_separator" const val DICEWARE_SEPARATOR = "diceware_separator"
const val DICEWARE_LENGTH = "diceware_length" const val DICEWARE_LENGTH = "diceware_length"
const val DISABLE_SYNC_ACTION = "disable_sync_action"
} }

2
app/src/main/res/values/strings.xml
View file

@ -132,6 +132,8 @@
<string name="pref_rebase_on_pull_title">Rebase on pull</string> <string name="pref_rebase_on_pull_title">Rebase on pull</string>
<string name="pref_rebase_on_pull_summary">When pulling or syncing, create a merge commit with upstream changes</string> <string name="pref_rebase_on_pull_summary">When pulling or syncing, create a merge commit with upstream changes</string>
<string name="pref_rebase_on_pull_summary_on">When pulling or syncing, rebase commits that are not present in the remote repository</string> <string name="pref_rebase_on_pull_summary_on">When pulling or syncing, rebase commits that are not present in the remote repository</string>
<string name="pref_disable_sync_on_pull_title">Disable pull to sync action</string>
<string name="pref_disable_sync_on_pull_summary">Prevent pulling down on the password list from triggering a Git sync</string>
<!-- PasswordGenerator fragment --> <!-- PasswordGenerator fragment -->
<string name="pwgen_title">Generate Password</string> <string name="pwgen_title">Generate Password</string>