diff options
author | Advaita <adipandya@gmail.com> | 2016-03-15 23:07:27 +0530 |
---|---|---|
committer | Advaita <adipandya@gmail.com> | 2016-03-23 20:54:10 +0530 |
commit | cab3fa7874f90f9aa8f5d3b9244e78ac4dd96638 (patch) | |
tree | c3fad74ed1a4b65a6d9b89b53ec3d171da0540fb /OpenKeychain/src/main/res | |
parent | 2b43ba438bd9956ceef8ccf1dc229e5dbb52a286 (diff) | |
download | open-keychain-cab3fa7874f90f9aa8f5d3b9244e78ac4dd96638.tar.gz open-keychain-cab3fa7874f90f9aa8f5d3b9244e78ac4dd96638.tar.bz2 open-keychain-cab3fa7874f90f9aa8f5d3b9244e78ac4dd96638.zip |
Final commit
All changes included
Improvements
-Reformatted code wherever required
-Only active wifi connections trigger events
-Improve sync reliability
-Removed extra permission
Minor Changes
-Refactored 2 variables for easier readbility
-Wifi-Only-Sync is now enabled by default
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" /> |