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

fix bug where key ids were not shown in settings

Browse source 
fixes #95
This commit is contained in:
Mohamed Zenadi 2015-06-17 21:04:14 +02:00
parent 05cfe6f717
commit bfdccf4d92
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,6 @@ import android.widget.Toast;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.google.common.base.Strings;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.zeapo.pwdstore.crypto.PgpHandler; import com.zeapo.pwdstore.crypto.PgpHandler;
import com.zeapo.pwdstore.git.GitActivity; import com.zeapo.pwdstore.git.GitActivity;
@ -31,7 +30,8 @@ import org.openintents.openpgp.util.OpenPgpUtils;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Arrays; import java.util.HashSet;
import java.util.Set;
public class UserPreference extends AppCompatActivity { public class UserPreference extends AppCompatActivity {
private final static int IMPORT_SSH_KEY = 1; private final static int IMPORT_SSH_KEY = 1;
@ -50,13 +50,13 @@ public class UserPreference extends AppCompatActivity {
addPreferencesFromResource(R.xml.preference); addPreferencesFromResource(R.xml.preference);
Preference keyPref = findPreference("openpgp_key_id_pref"); Preference keyPref = findPreference("openpgp_key_id_pref");
String selectedKeys = sharedPreferences.getString("openpgp_key_ids", ""); Set<String> selectedKeys = sharedPreferences.getStringSet("openpgp_key_ids_set", new HashSet<String>());
if (Strings.isNullOrEmpty(selectedKeys)) { if (selectedKeys.isEmpty()) {
keyPref.setSummary("No key selected"); keyPref.setSummary("No key selected");
} else { } else {
keyPref.setSummary( keyPref.setSummary(
Joiner.on(',') Joiner.on(',')
.join(Iterables.transform(Arrays.asList(selectedKeys.split(",")), new Function<String, Object>() { .join(Iterables.transform(selectedKeys, new Function<String, Object>() {
@Override @Override
public Object apply(String input) { public Object apply(String input) {
return OpenPgpUtils.convertKeyIdToHex(Long.valueOf(input)); return OpenPgpUtils.convertKeyIdToHex(Long.valueOf(input));