From 3c7e3190292cdaab397a60d212bf5af942fd334c Mon Sep 17 00:00:00 2001
From: agrajaghh <agrajaghh@gmail.com>
Date: Sat, 13 Dec 2014 01:37:06 +0100
Subject: [PATCH 1/2] make summary of passphrase timeout translatable //FREEBIE

---
 res/values/strings.xml                                         | 3 +++
 .../securesms/preferences/AppProtectionPreferenceFragment.java | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 720150d715..5a88c7c690 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -42,6 +42,9 @@
     <string name="ApplicationPreferencesActivity_incoming_sms">Incoming</string>
     <string name="ApplicationPreferencesActivity_outgoing_sms">outgoing</string>
 
+    <!-- AppProtectionPreferenceFragment -->
+    <string name="AppProtectionPreferenceFragment_minutes">%d minutes</string>
+
     <!-- DraftDatabase -->
     <string name="DraftDatabase_Draft_image_snippet">(image)</string>
     <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
diff --git a/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
index b6ea439611..69f9a3b4c0 100644
--- a/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
@@ -69,7 +69,7 @@ public class AppProtectionPreferenceFragment extends PreferenceFragment {
   private void initializeTimeoutSummary() {
     int timeoutMinutes = TextSecurePreferences.getPassphraseTimeoutInterval(getActivity());
     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 {

From 62d0de2ee68bda05b9feedb0cd4c2200436c45b7 Mon Sep 17 00:00:00 2001
From: agrajaghh <agrajaghh@gmail.com>
Date: Sat, 13 Dec 2014 01:38:03 +0100
Subject: [PATCH 2/2] remove double include of betterpicker in build.gradle
 //FREEBIE

---
 build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d687fdf816..4383f99486 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,7 +47,6 @@ dependencies {
         exclude module: 'support-v4'
     }
     compile 'com.squareup.dagger:dagger:1.2.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'
     }