diff options
author | Vincent <valodim@mugenguild.com> | 2016-03-24 14:26:03 +0100 |
---|---|---|
committer | Vincent <valodim@mugenguild.com> | 2016-03-24 14:26:03 +0100 |
commit | f005bbad96e257c2e9a68a274504bcfbea2a178d (patch) | |
tree | 92a20588ecfbf27435d7eafd1f1fff558e6130b6 /OpenKeychain/src/main/res | |
parent | c4de57d4f6f58c946409d2982a5bbb5627d09244 (diff) | |
parent | cab3fa7874f90f9aa8f5d3b9244e78ac4dd96638 (diff) | |
download | open-keychain-f005bbad96e257c2e9a68a274504bcfbea2a178d.tar.gz open-keychain-f005bbad96e257c2e9a68a274504bcfbea2a178d.tar.bz2 open-keychain-f005bbad96e257c2e9a68a274504bcfbea2a178d.zip |
Merge pull request #1785 from advaita13/wifi-only-fix
Sync only when unmetered internet is available #1670
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 1 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/xml/sync_preferences.xml | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 70db4029b..c8a07c8ef 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -201,6 +201,7 @@ <string name="label_sync_settings_keyserver_title">"Automatic key updates"</string> <string name="label_sync_settings_keyserver_summary_on">"Every three days, keys are updated from the preferred keyserver"</string> <string name="label_sync_settings_keyserver_summary_off">"Keys are not automatically updated"</string> + <string name="label_sync_settings_wifi_title">"Sync only on Wi-Fi"</string> <string name="label_sync_settings_contacts_title">"Link keys to contacts"</string> <string name="label_sync_settings_contacts_summary_on">"Link keys to contacts based on names and email addresses. This happens completely offline on your device."</string> <string name="label_sync_settings_contacts_summary_off">"New keys will not be linked to contacts"</string> diff --git a/OpenKeychain/src/main/res/xml/sync_preferences.xml b/OpenKeychain/src/main/res/xml/sync_preferences.xml index de41ff030..600ccc9e8 100644 --- a/OpenKeychain/src/main/res/xml/sync_preferences.xml +++ b/OpenKeychain/src/main/res/xml/sync_preferences.xml @@ -4,6 +4,12 @@ android:persistent="false" android:title="@string/label_sync_settings_keyserver_title"/> <SwitchPreference + android:key="enableWifiSyncOnly" + android:defaultValue="true" + android:persistent="true" + android:dependency="syncKeyserver" + android:title="@string/label_sync_settings_wifi_title"/> + <SwitchPreference android:key="syncContacts" android:persistent="false" android:title="@string/label_sync_settings_contacts_title" /> |