diff options
| author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-08-17 03:08:42 +0530 |
|---|---|---|
| committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-08-20 21:02:29 +0530 |
| commit | 3f8f70b0a99554aae52fd80d31c29f32a34df5d2 (patch) | |
| tree | 0a47be0628ad9ab81a736097af9efcd0b541e792 /OpenKeychain/src/main/res | |
| parent | 93d66d39f7b985b33538a9f5531e47571693b901 (diff) | |
| download | open-keychain-3f8f70b0a99554aae52fd80d31c29f32a34df5d2.tar.gz open-keychain-3f8f70b0a99554aae52fd80d31c29f32a34df5d2.tar.bz2 open-keychain-3f8f70b0a99554aae52fd80d31c29f32a34df5d2.zip | |
added sync preferences
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 6 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/xml/preference_headers.xml | 3 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/xml/sync_preferences.xml | 12 |
3 files changed, 21 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 495660a22..ba5be593f 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -51,6 +51,7 @@ <string name="section_passphrase_cache">"Password/PIN Handling"</string> <string name="section_proxy_settings">"Proxy Settings"</string> <string name="section_gui">"Interface"</string> + <string name="section_sync_settings">"Sync Settings"</string> <string name="section_certify">"Confirm"</string> <string name="section_actions">"Actions"</string> <string name="section_share_key">"Key"</string> @@ -175,6 +176,11 @@ <string name="pref_keybase">"keybase.io"</string> <string name="pref_keybase_summary">"Search keys on keybase.io"</string> + <string name="label_sync_settings_keyserver_title">"Automatically update keys"</string> + <string name="label_sync_settings_keyserver_summary">"Updates keys older than a week, from the preferred keyserver"</string> + <string name="label_sync_settings_contacts_title">"Sync Contacts with Keys"</string> + <string name="label_sync_settings_contacts_summary">"Associates contacts with imported keys, based on email, completely offline"</string> + <!-- Proxy Preferences --> <string name="pref_proxy_tor_title">"Enable Tor"</string> <string name="pref_proxy_tor_summary">"Requires Orbot to be installed"</string> diff --git a/OpenKeychain/src/main/res/xml/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml index b7512b062..606196c1e 100644 --- a/OpenKeychain/src/main/res/xml/preference_headers.xml +++ b/OpenKeychain/src/main/res/xml/preference_headers.xml @@ -11,4 +11,7 @@ <header android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$ProxyPrefsFragment" android:title="@string/section_proxy_settings" /> + <header + android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$SyncSettingsFragment" + android:title="@string/section_sync_settings" /> </preference-headers> diff --git a/OpenKeychain/src/main/res/xml/sync_preferences.xml b/OpenKeychain/src/main/res/xml/sync_preferences.xml new file mode 100644 index 000000000..d4ea81591 --- /dev/null +++ b/OpenKeychain/src/main/res/xml/sync_preferences.xml @@ -0,0 +1,12 @@ +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> + <CheckBoxPreference + android:key="syncKeyserver" + android:persistent="false" + android:title="@string/label_sync_settings_keyserver_title" + android:summary="@string/label_sync_settings_keyserver_summary" /> + <CheckBoxPreference + android:key="syncContacts" + android:persistent="false" + android:title="@string/label_sync_settings_contacts_title" + android:summary="@string/label_sync_settings_contacts_summary" /> +</PreferenceScreen> |