aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-06-06 17:29:39 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-06-06 17:29:39 +0200
commitc36b311d5f5c2b43ec3f1549d9a059fb0de3bde2 (patch)
tree2fb6d4c8948c768bf81ef0c876c0c2ca0b8460db /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
parent118225d7d2b6401006352897386a40131c6cd854 (diff)
downloadopen-keychain-c36b311d5f5c2b43ec3f1549d9a059fb0de3bde2.tar.gz
open-keychain-c36b311d5f5c2b43ec3f1549d9a059fb0de3bde2.tar.bz2
open-keychain-c36b311d5f5c2b43ec3f1549d9a059fb0de3bde2.zip
import-log: better stripped key logging
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
index 02e5411ca..1264c8c36 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
@@ -19,6 +19,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Vector;
@@ -149,13 +150,13 @@ public class UncachedKeyRing {
aos.close();
}
- public ArrayList<Long> getAvailableSubkeys() {
+ public HashSet<Long> getAvailableSubkeys() {
if(!isSecret()) {
throw new RuntimeException("Tried to find available subkeys from non-secret keys. " +
"This is a programming error and should never happen!");
}
- ArrayList<Long> result = new ArrayList<Long>();
+ HashSet<Long> result = new HashSet<Long>();
// then, mark exactly the keys we have available
for (PGPSecretKey sub : new IterableIterator<PGPSecretKey>(
((PGPSecretKeyRing) mRing).getSecretKeys())) {