cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Experimental features settings reworked

Browse Source
This commit is contained in:
Dominik Schürmann
2015-08-27 13:59:26 +02:00
parent 7a98ffc90a
commit c292b8d9c3
6 changed files with 71 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -52,7 +52,7 @@
<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_other_settings">"Other Settings"</string>
<string name="section_experimental_features">"Experimental Features"</string>
<string name="section_certify">"Confirm"</string>
<string name="section_actions">"Actions"</string>
<string name="section_share_key">"Key"</string>
@@ -186,8 +186,12 @@
<!-- label shown in Android settings under the OpenKeychain account -->
<string name="keyserver_sync_settings_title">"Automatically update keys"</string>
<string name="label_other_settings_experimental_title">"Enable experimental features"</string>
<string name="label_other_settings_experimental_summary">"Enable experimental features, mostly results of security/UX research. Don't rely on their security!"</string>
<string name="label_experimental_settings_desc_summary">"These features are mostly results of security/UX research. Don't rely on their security!"</string>
<string name="label_experimental_settings_word_confirm_title">"Word Confirm"</string>
<string name="label_experimental_settings_word_confirm_summary">"Allows to compare fingerprints with words instead of hexadecimal representation."</string>
<string name="label_experimental_settings_linked_identities_title">"Linked Identities"</string>
<string name="label_experimental_settings_linked_identities_summary">"Linked Identities"</string>
<!-- Proxy Preferences -->
<string name="pref_proxy_tor_title">"Enable Tor"</string>

20
OpenKeychain/src/main/res/xml/experimental_preferences.xml Normal file
View File

@@ -0,0 +1,20 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<Preference
android:persistent="false"
android:selectable="false"
android:summary="@string/label_experimental_settings_desc_summary" />
<SwitchPreference
android:defaultValue="false"
android:key="experimentalEnableWordConfirm"
android:persistent="false"
android:summary="@string/label_experimental_settings_word_confirm_summary"
android:title="@string/label_experimental_settings_word_confirm_title" />
<SwitchPreference
android:defaultValue="false"
android:key="experimentalEnableLinkedIdentities"
android:persistent="false"
android:summary="@string/label_experimental_settings_linked_identities_summary"
android:title="@string/label_experimental_settings_linked_identities_title" />
</PreferenceScreen>

4
OpenKeychain/src/main/res/xml/preference_headers.xml
View File

@@ -15,6 +15,6 @@
android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$SyncPrefsFragment"
android:title="@string/section_sync_settings" />
<header
android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$OtherPrefsFragment"
android:title="@string/section_other_settings" />
android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$ExperimentalPrefsFragment"
android:title="@string/section_experimental_features" />
</preference-headers>