From 29a740a902fa11874dbaec16545cd68db447f6ae Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Mon, 22 Jan 2018 01:35:09 +0100 Subject: [PATCH] suppress AutoValue mutable byte array warnings --- .../keychain/keyimport/ParcelableKeyRing.java | 2 ++ .../java/org/sufficientlysecure/keychain/network/SktUri.java | 1 + .../sufficientlysecure/keychain/securitytoken/CommandApdu.java | 1 + .../keychain/securitytoken/OpenPgpCapabilities.java | 3 +++ .../keychain/securitytoken/ResponseApdu.java | 1 + .../keychain/securitytoken/SecurityTokenInfo.java | 1 + .../keychain/securitytoken/usb/CcidTransceiver.java | 1 + .../keychain/ui/token/PublicKeyRetrievalLoader.java | 1 + 8 files changed, 11 insertions(+) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableKeyRing.java index ee2d799c7..37dd6cb98 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableKeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ParcelableKeyRing.java @@ -31,10 +31,12 @@ import com.google.auto.value.AutoValue; @AutoValue public abstract class ParcelableKeyRing implements Parcelable { @Nullable + @SuppressWarnings("mutable") public abstract byte[] getBytes(); // dual role! @Nullable + @SuppressWarnings("mutable") public abstract byte[] getExpectedFingerprint(); @Nullable public abstract String getKeyIdHex(); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/SktUri.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/SktUri.java index 8b2ec9a48..bd64403b7 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/SktUri.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/SktUri.java @@ -38,6 +38,7 @@ abstract class SktUri { public abstract String getHost(); public abstract int getPort(); + @SuppressWarnings("mutable") public abstract byte[] getPresharedKey(); @Nullable diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/CommandApdu.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/CommandApdu.java index 59e60473a..5efdd2ee6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/CommandApdu.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/CommandApdu.java @@ -33,6 +33,7 @@ public abstract class CommandApdu { public abstract int getINS(); public abstract int getP1(); public abstract int getP2(); + @SuppressWarnings("mutable") public abstract byte[] getData(); public abstract int getNe(); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/OpenPgpCapabilities.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/OpenPgpCapabilities.java index 362e8bc55..008ebf6ef 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/OpenPgpCapabilities.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/OpenPgpCapabilities.java @@ -36,7 +36,9 @@ public abstract class OpenPgpCapabilities { private static final int MAX_PW1_LENGTH_INDEX = 1; private static final int MAX_PW3_LENGTH_INDEX = 3; + @SuppressWarnings("mutable") public abstract byte[] getAid(); + @SuppressWarnings("mutable") abstract byte[] getHistoricalBytes(); @Nullable @@ -48,6 +50,7 @@ public abstract class OpenPgpCapabilities { @Nullable @SuppressWarnings("mutable") public abstract byte[] getFingerprintAuth(); + @SuppressWarnings("mutable") public abstract byte[] getPwStatusBytes(); public abstract KeyFormat getSignKeyFormat(); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/ResponseApdu.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/ResponseApdu.java index b00a11d5e..782dd1e46 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/ResponseApdu.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/ResponseApdu.java @@ -28,6 +28,7 @@ import com.google.auto.value.AutoValue; public abstract class ResponseApdu { private static final int APDU_SW_SUCCESS = 0x9000; + @SuppressWarnings("mutable") public abstract byte[] getData(); public abstract int getSw1(); public abstract int getSw2(); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenInfo.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenInfo.java index d8945dad6..abb15fd5c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenInfo.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenInfo.java @@ -47,6 +47,7 @@ public abstract class SecurityTokenInfo implements Parcelable { public abstract List getFingerprints(); @Nullable + @SuppressWarnings("mutable") public abstract byte[] getAid(); @Nullable public abstract String getUserId(); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/usb/CcidTransceiver.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/usb/CcidTransceiver.java index ce5b8cab4..595209596 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/usb/CcidTransceiver.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/usb/CcidTransceiver.java @@ -269,6 +269,7 @@ public class CcidTransceiver { public abstract byte getError(); public abstract byte getChainParameter(); @Nullable + @SuppressWarnings("mutable") public abstract byte[] getData(); static CcidDataBlock parseHeaderFromBytes(byte[] headerBytes) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/PublicKeyRetrievalLoader.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/PublicKeyRetrievalLoader.java index ac9e36405..549b6611c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/PublicKeyRetrievalLoader.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/token/PublicKeyRetrievalLoader.java @@ -325,6 +325,7 @@ public abstract class PublicKeyRetrievalLoader extends AsyncTaskLoader