TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-26 05:20:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use betterpicker for HMS timeout.

Browse Source 
// FREEBIE

Closes #1890
This commit is contained in:
Moxie Marlinspike
2014-12-12 16:07:02 -08:00
parent 9beb51bd77
commit 6b05f7905b
5 changed files with 51 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,8 +10,12 @@ import android.preference.CheckBoxPreference;
import android.preference.Preference;
import android.preference.PreferenceScreen;
import android.support.v4.preference.PreferenceFragment;
import android.util.Log;
import android.widget.Toast;
import com.doomonafireball.betterpickers.hmspicker.HmsPickerBuilder;
import com.doomonafireball.betterpickers.hmspicker.HmsPickerDialogFragment;
import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
import org.thoughtcrime.securesms.PassphraseChangeActivity;
import org.thoughtcrime.securesms.R;
@@ -21,6 +25,8 @@ import org.thoughtcrime.securesms.service.KeyCachingService;
import org.thoughtcrime.securesms.util.Dialogs;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import java.util.concurrent.TimeUnit;
public class AppProtectionPreferenceFragment extends PreferenceFragment {
private CheckBoxPreference disablePassphrase;
@@ -32,16 +38,20 @@ public class AppProtectionPreferenceFragment extends PreferenceFragment {
disablePassphrase = (CheckBoxPreference) this.findPreference("pref_enable_passphrase_temporary");
this.findPreference(TextSecurePreferences.CHANGE_PASSPHRASE_PREF)
.setOnPreferenceClickListener(new ChangePassphraseClickListener());
.setOnPreferenceClickListener(new ChangePassphraseClickListener());
this.findPreference(TextSecurePreferences.PASSPHRASE_TIMEOUT_INTERVAL_PREF)
.setOnPreferenceClickListener(new PassphraseIntervalClickListener());
disablePassphrase
.setOnPreferenceChangeListener(new DisablePassphraseClickListener());
.setOnPreferenceChangeListener(new DisablePassphraseClickListener());
}
@Override
public void onResume() {
super.onResume();
((ApplicationPreferencesActivity) getActivity()).getSupportActionBar().setTitle(R.string.preferences__app_protection);
initializePlatformSpecificOptions();
initializeTimeoutSummary();
disablePassphrase.setChecked(!TextSecurePreferences.isPasswordDisabled(getActivity()));
}
@@ -56,6 +66,12 @@ 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));
}
private class ChangePassphraseClickListener implements Preference.OnPreferenceClickListener {
@Override
public boolean onPreferenceClick(Preference preference) {
@@ -71,6 +87,28 @@ public class AppProtectionPreferenceFragment extends PreferenceFragment {
}
}
private class PassphraseIntervalClickListener implements Preference.OnPreferenceClickListener, HmsPickerDialogFragment.HmsPickerDialogHandler {
@Override
public boolean onPreferenceClick(Preference preference) {
new HmsPickerBuilder().setFragmentManager(getFragmentManager())
.setStyleResId(R.style.BetterPickersDialogFragment_Light)
.addHmsPickerDialogHandler(this)
.show();
return true;
}
@Override
public void onDialogHmsSet(int reference, int hours, int minutes, int seconds) {
int timeoutMinutes = Math.max((int)TimeUnit.HOURS.toMinutes(hours) +
minutes +
(int)TimeUnit.SECONDS.toMinutes(seconds), 1);
TextSecurePreferences.setPassphraseTimeoutInterval(getActivity(), timeoutMinutes);
initializeTimeoutSummary();
}
}
private class DisablePassphraseClickListener implements Preference.OnPreferenceChangeListener {
@Override