TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 16:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2212 from agrajaghh/betterpicker_translateable

Browse Source 
make summary of passphrase timeout translatable
This commit is contained in:
Moxie Marlinspike 2014-12-12 17:04:29 -08:00
commit 642334da1f
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@ -47,7 +47,6 @@ dependencies {
exclude module: 'support-v4' exclude module: 'support-v4'
} }
compile 'com.squareup.dagger:dagger:1.2.2' compile 'com.squareup.dagger:dagger:1.2.2'
compile 'com.doomonafireball.betterpickers:library:1.5.2'
compile ("com.doomonafireball.betterpickers:library:1.5.2") { compile ("com.doomonafireball.betterpickers:library:1.5.2") {
exclude group: 'com.android.support', module: 'support-v4' exclude group: 'com.android.support', module: 'support-v4'
} }

3
res/values/strings.xml
View File

@ -42,6 +42,9 @@
<string name="ApplicationPreferencesActivity_incoming_sms">Incoming</string> <string name="ApplicationPreferencesActivity_incoming_sms">Incoming</string>
<string name="ApplicationPreferencesActivity_outgoing_sms">outgoing</string> <string name="ApplicationPreferencesActivity_outgoing_sms">outgoing</string>
<!-- AppProtectionPreferenceFragment -->
<string name="AppProtectionPreferenceFragment_minutes">%d minutes</string>
<!-- DraftDatabase --> <!-- DraftDatabase -->
<string name="DraftDatabase_Draft_image_snippet">(image)</string> <string name="DraftDatabase_Draft_image_snippet">(image)</string>
<string name="DraftDatabase_Draft_audio_snippet">(audio)</string> <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>

2
src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
View File

@ -69,7 +69,7 @@ public class AppProtectionPreferenceFragment extends PreferenceFragment {
private void initializeTimeoutSummary() { private void initializeTimeoutSummary() {
int timeoutMinutes = TextSecurePreferences.getPassphraseTimeoutInterval(getActivity()); int timeoutMinutes = TextSecurePreferences.getPassphraseTimeoutInterval(getActivity());
this.findPreference(TextSecurePreferences.PASSPHRASE_TIMEOUT_INTERVAL_PREF) this.findPreference(TextSecurePreferences.PASSPHRASE_TIMEOUT_INTERVAL_PREF)
.setSummary(String.format("%d minutes", timeoutMinutes)); .setSummary(getString(R.string.AppProtectionPreferenceFragment_minutes, timeoutMinutes));
} }
private class ChangePassphraseClickListener implements Preference.OnPreferenceClickListener { private class ChangePassphraseClickListener implements Preference.OnPreferenceClickListener {