moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-30 12:32:17 -05:00
Code Issues Releases Wiki Activity

Use ArrayList instead of LinkedList

Browse Source
This commit is contained in:
Dominik Schürmann 2015-03-05 17:59:53 +01:00
parent 02084ba14a
commit e50eda4e29
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
View File

@ -45,6 +45,7 @@ import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
import org.sufficientlysecure.keychain.util.IterableIterator; import org.sufficientlysecure.keychain.util.IterableIterator;
import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.Log;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList; import java.util.LinkedList;
@ -179,7 +180,7 @@ public class CanonicalizedSecretKey extends CanonicalizedPublicKey {
/** /**
* Returns a list of all supported hash algorithms. * Returns a list of all supported hash algorithms.
*/ */
public LinkedList<Integer> getSupportedHashAlgorithms() { public ArrayList<Integer> getSupportedHashAlgorithms() {
// TODO: intersection between preferred hash algos of this key and PgpConstants.PREFERRED_HASH_ALGORITHMS // TODO: intersection between preferred hash algos of this key and PgpConstants.PREFERRED_HASH_ALGORITHMS
// choose best algo // choose best algo

10
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConstants.java
View File

@ -21,13 +21,13 @@ import org.spongycastle.bcpg.CompressionAlgorithmTags;
import org.spongycastle.bcpg.HashAlgorithmTags; import org.spongycastle.bcpg.HashAlgorithmTags;
import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags; import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags;
import java.util.LinkedList; import java.util.ArrayList;
public class PgpConstants { public class PgpConstants {
public static LinkedList<Integer> sPreferredSymmetricAlgorithms = new LinkedList<>(); public static ArrayList<Integer> sPreferredSymmetricAlgorithms = new ArrayList<>();
public static LinkedList<Integer> sPreferredHashAlgorithms = new LinkedList<>(); public static ArrayList<Integer> sPreferredHashAlgorithms = new ArrayList<>();
public static LinkedList<Integer> sPreferredCompressionAlgorithms = new LinkedList<>(); public static ArrayList<Integer> sPreferredCompressionAlgorithms = new ArrayList<>();
/* /*
* Most preferred is first * Most preferred is first
@ -94,7 +94,7 @@ public class PgpConstants {
public static final int USE_PREFERRED = -1; public static final int USE_PREFERRED = -1;
} }
public static int[] getAsArray(LinkedList<Integer> list) { public static int[] getAsArray(ArrayList<Integer> list) {
int[] array = new int[list.size()]; int[] array = new int[list.size()];
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
array[i] = list.get(i); array[i] = list.get(i);

7
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
View File

@ -57,6 +57,7 @@ import java.io.InputStreamReader;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.security.SignatureException; import java.security.SignatureException;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.LinkedList; import java.util.LinkedList;
@ -207,10 +208,10 @@ public class PgpSignEncryptOperation extends BaseOperation {
// Use preferred hash algo // Use preferred hash algo
int requestedAlgorithm = input.getSignatureHashAlgorithm(); int requestedAlgorithm = input.getSignatureHashAlgorithm();
LinkedList<Integer> supported = signingKey.getSupportedHashAlgorithms(); ArrayList<Integer> supported = signingKey.getSupportedHashAlgorithms();
if (requestedAlgorithm == PgpConstants.OpenKeychainHashAlgorithmTags.USE_PREFERRED) { if (requestedAlgorithm == PgpConstants.OpenKeychainHashAlgorithmTags.USE_PREFERRED) {
// get most preferred // get most preferred
input.setSignatureHashAlgorithm(supported.getFirst()); input.setSignatureHashAlgorithm(supported.get(0));
} else if (!supported.contains(requestedAlgorithm)) { } else if (!supported.contains(requestedAlgorithm)) {
log.add(LogType.MSG_PSE_ERROR_HASH_ALGO, indent); log.add(LogType.MSG_PSE_ERROR_HASH_ALGO, indent);
return new PgpSignEncryptResult(PgpSignEncryptResult.RESULT_ERROR, log); return new PgpSignEncryptResult(PgpSignEncryptResult.RESULT_ERROR, log);
@ -227,7 +228,7 @@ public class PgpSignEncryptOperation extends BaseOperation {
if (algo == PgpConstants.OpenKeychainSymmetricKeyAlgorithmTags.USE_PREFERRED) { if (algo == PgpConstants.OpenKeychainSymmetricKeyAlgorithmTags.USE_PREFERRED) {
// get most preferred // get most preferred
// TODO: get from recipients // TODO: get from recipients
algo = PgpConstants.sPreferredSymmetricAlgorithms.getFirst(); algo = PgpConstants.sPreferredSymmetricAlgorithms.get(0);
} }
// has Integrity packet enabled! // has Integrity packet enabled!
JcePGPDataEncryptorBuilder encryptorBuilder = JcePGPDataEncryptorBuilder encryptorBuilder =

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java
View File

@ -205,7 +205,7 @@ public class EncryptFilesActivity extends EncryptActivity implements EncryptActi
data.addOutputUris(mOutputUris); data.addOutputUris(mOutputUris);
if (mUseCompression) { if (mUseCompression) {
data.setCompressionId(PgpConstants.sPreferredCompressionAlgorithms.getFirst()); data.setCompressionId(PgpConstants.sPreferredCompressionAlgorithms.get(0));
} else { } else {
data.setCompressionId(CompressionAlgorithmTags.UNCOMPRESSED); data.setCompressionId(CompressionAlgorithmTags.UNCOMPRESSED);
} }

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
View File

@ -198,7 +198,7 @@ public class EncryptTextActivity extends EncryptActivity implements EncryptActiv
data.setCleartextSignature(true); data.setCleartextSignature(true);
if (mUseCompression) { if (mUseCompression) {
data.setCompressionId(PgpConstants.sPreferredCompressionAlgorithms.getFirst()); data.setCompressionId(PgpConstants.sPreferredCompressionAlgorithms.get(0));
} else { } else {
data.setCompressionId(CompressionAlgorithmTags.UNCOMPRESSED); data.setCompressionId(CompressionAlgorithmTags.UNCOMPRESSED);
} }