From 6b05f7905ba3299fdc097854b3017c620b9bbfa3 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Fri, 12 Dec 2014 16:07:02 -0800 Subject: [PATCH] Use betterpicker for HMS timeout. // FREEBIE Closes #1890 --- build.gradle | 4 ++ res/xml/preferences_app_protection.xml | 10 ++--- .../AppProtectionPreferenceFragment.java | 42 ++++++++++++++++++- .../securesms/service/KeyCachingService.java | 4 +- .../securesms/util/TextSecurePreferences.java | 2 +- 5 files changed, 51 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index c8bd355652..af179f75b6 100644 --- a/build.gradle +++ b/build.gradle @@ -47,6 +47,10 @@ 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' + } provided 'com.squareup.dagger:dagger-compiler:1.2.2' compile 'org.whispersystems:jobmanager:0.9.0' diff --git a/res/xml/preferences_app_protection.xml b/res/xml/preferences_app_protection.xml index a527c98d65..93451d7fb2 100644 --- a/res/xml/preferences_app_protection.xml +++ b/res/xml/preferences_app_protection.xml @@ -17,13 +17,9 @@ android:summary="@string/preferences__forget_passphrase_from_memory_after_some_interval" android:dependency="pref_enable_passphrase_temporary"/> - +