kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #187

Browse source
This commit is contained in:
Matthew Wong 2016-06-12 15:46:59 -04:00
parent f739b1c564
commit b4a230d074
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/src/main/java/com/zeapo/pwdstore/UserPreference.java
View file

@ -58,22 +58,7 @@ public class UserPreference extends AppCompatActivity {
addPreferencesFromResource(R.xml.preference);
Preference keyPref = findPreference("openpgp_key_id_pref");
Set<String> selectedKeys = sharedPreferences.getStringSet("openpgp_key_ids_set", new HashSet<String>());
if (selectedKeys.isEmpty()) {
keyPref.setSummary("No key selected");
} else {
keyPref.setSummary(
Joiner.on(',')
.join(Iterables.transform(selectedKeys, new Function<String, Object>() {
@Override
public Object apply(String input) {
return OpenPgpUtils.convertKeyIdToHex(Long.valueOf(input));
}
}))
);
}
keyPref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
findPreference("openpgp_key_id_pref").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
Intent intent = new Intent(callingActivity, PgpHandler.class);
@ -235,6 +220,21 @@ public class UserPreference extends AppCompatActivity {
findPreference("pref_select_external").setSummary(getPreferenceManager().getSharedPreferences().getString("git_external_repo", "No external repository selected"));
findPreference("ssh_see_key").setEnabled(sharedPreferences.getBoolean("use_generated_key", false));
findPreference("git_delete_repo").setEnabled(!sharedPreferences.getBoolean("git_external", false));
Preference keyPref = findPreference("openpgp_key_id_pref");
Set<String> selectedKeys = sharedPreferences.getStringSet("openpgp_key_ids_set", new HashSet<String>());
if (selectedKeys.isEmpty()) {
keyPref.setSummary("No key selected");
} else {
keyPref.setSummary(
Joiner.on(',')
.join(Iterables.transform(selectedKeys, new Function<String, Object>() {
@Override
public Object apply(String input) {
return OpenPgpUtils.convertKeyIdToHex(Long.valueOf(input));
}
}))
);
}
// see if the autofill service is enabled and check the preference accordingly
((CheckBoxPreference) findPreference("autofill_enable"))