empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #262 from joeykrim/patch-4

Browse source 
Moved Preferences Disabled passphrase title and summary text into strings.xml
This commit is contained in:
Moxie Marlinspike 2013-07-13 10:58:34 -07:00
commit 0ff5056365
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/values/strings.xml
View file

@ -399,6 +399,8 @@
<string name="preferences__change_passphrase">Change passphrase</string>
<string name="preferences__change_my_passphrase">Change my passphrase</string>
<string name="preferences__complete_key_exchanges">Complete key exchanges</string>
<string name="preferences__disable_passphrase">Disable passphrase</string>
<string name="preferences__disable_local_encryption_of_messages_and_keys">Disable local encryption of messages and keys</string>
<string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Automatically complete key exchanges for new sessions or for existing sessions with the same identity key</string>
<string name="preferences__forget_passphrase_from_memory_after_some_interval">Forget passphrase from memory after some interval</string>
<string name="preferences__timeout_passphrase">Timeout passphrase</string>

8
res/xml/preferences.xml
View file

@ -122,14 +122,14 @@
<CheckBoxPreference android:key="pref_disable_passphrase"
android:defaultValue="false"
android:title="Disable Passphrase"
android:disableDependentsState="true"
android:summary="Disable local encryption of messages and keys"/>
android:title="@string/preferences__disable_passphrase"
android:summary="@string/preferences__disable_local_encryption_of_messages_and_keys"
android:disableDependentsState="true"/>
<CheckBoxPreference android:defaultValue="false"
android:key="pref_timeout_passphrase"
android:summary="@string/preferences__forget_passphrase_from_memory_after_some_interval"
android:title="@string/preferences__timeout_passphrase"
android:summary="@string/preferences__forget_passphrase_from_memory_after_some_interval"
android:dependency="pref_disable_passphrase"/>
<org.thoughtcrime.securesms.preferences.PassphraseTimeoutPreference