From 0d2cbd0654bf95f15e858e2b6ebc87564d565e41 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Fri, 12 Jan 2018 20:43:00 +0100 Subject: [PATCH] rename methods that do io to "read*" instead of "get*" --- .../SecurityTokenConnection.java | 24 +++++++++---------- .../keychain/ui/CreateKeyActivity.java | 2 +- ...curityTokenChangePinOperationActivity.java | 2 +- .../ui/SecurityTokenOperationActivity.java | 3 +-- .../ui/base/BaseSecurityTokenActivity.java | 6 ++--- .../SecurityTokenConnectionTest.java | 7 +----- 6 files changed, 18 insertions(+), 26 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnection.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnection.java index ed7c5f0b5..4471188df 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnection.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnection.java @@ -20,7 +20,6 @@ package org.sufficientlysecure.keychain.securitytoken; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.nio.ByteBuffer; import java.util.List; import android.content.Context; @@ -153,7 +152,7 @@ public class SecurityTokenConnection { } public void refreshConnectionCapabilities() throws IOException { - byte[] rawOpenPgpCapabilities = getData(0x00, 0x6E); + byte[] rawOpenPgpCapabilities = readData(0x00, 0x6E); OpenPgpCapabilities openPgpCapabilities = OpenPgpCapabilities.fromBytes(rawOpenPgpCapabilities); setConnectionCapabilities(openPgpCapabilities); @@ -360,7 +359,7 @@ public class SecurityTokenConnection { // endregion - private byte[] getData(int p1, int p2) throws IOException { + private byte[] readData(int p1, int p2) throws IOException { ResponseApdu response = communicate(commandFactory.createGetDataCommand(p1, p2)); if (!response.isSuccess()) { throw new CardException("Failed to get pw status bytes", response.getSw()); @@ -369,32 +368,31 @@ public class SecurityTokenConnection { } - public String getUrl() throws IOException { - byte[] data = getData(0x5F, 0x50); + private String readUrl() throws IOException { + byte[] data = readData(0x5F, 0x50); return new String(data).trim(); } - public byte[] getUserId() throws IOException { - return getData(0x00, 0x65); + private byte[] readUserId() throws IOException { + return readData(0x00, 0x65); } - public SecurityTokenInfo getTokenInfo() throws IOException { + public SecurityTokenInfo readTokenInfo() throws IOException { byte[][] fingerprints = new byte[3][]; fingerprints[0] = openPgpCapabilities.getFingerprintSign(); fingerprints[1] = openPgpCapabilities.getFingerprintEncrypt(); fingerprints[2] = openPgpCapabilities.getFingerprintAuth(); byte[] aid = openPgpCapabilities.getAid(); - String userId = parseHolderName(getUserId()); - String url = getUrl(); + String userId = parseHolderName(readUserId()); + String url = readUrl(); byte[] pwInfo = openPgpCapabilities.getPwStatusBytes(); boolean hasLifeCycleManagement = cardCapabilities.hasLifeCycleManagement(); TransportType transportType = transport.getTransportType(); - return SecurityTokenInfo - .create(transportType, tokenType, fingerprints, aid, userId, url, pwInfo[4], pwInfo[6], - hasLifeCycleManagement); + return SecurityTokenInfo.create(transportType, tokenType, fingerprints, aid, userId, url, pwInfo[4], pwInfo[6], + hasLifeCycleManagement); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java index 4160ab58d..90432a79c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java @@ -140,7 +140,7 @@ public class CreateKeyActivity extends BaseSecurityTokenActivity { return; } - tokenInfo = stConnection.getTokenInfo(); + tokenInfo = stConnection.readTokenInfo(); } @Override diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenChangePinOperationActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenChangePinOperationActivity.java index 6b2c427bf..aa6256185 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenChangePinOperationActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenChangePinOperationActivity.java @@ -144,7 +144,7 @@ public class SecurityTokenChangePinOperationActivity extends BaseSecurityTokenAc Passphrase adminPin = new Passphrase(changePinInput.getAdminPin()); ModifyPinTokenOp.create(stConnection, adminPin).modifyPw1Pin(changePinInput.getNewPin().getBytes()); - resultTokenInfo = stConnection.getTokenInfo(); + resultTokenInfo = stConnection.readTokenInfo(); } @Override diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java index b94ddf2be..b41e09865 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java @@ -39,7 +39,6 @@ import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey; import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKeyRing; import org.sufficientlysecure.keychain.provider.KeyRepository; import org.sufficientlysecure.keychain.provider.KeychainContract; -import org.sufficientlysecure.keychain.securitytoken.KeyType; import org.sufficientlysecure.keychain.securitytoken.operations.ModifyPinTokenOp; import org.sufficientlysecure.keychain.securitytoken.SecurityTokenConnection; import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo; @@ -305,7 +304,7 @@ public class SecurityTokenOperationActivity extends BaseSecurityTokenActivity { } case SECURITY_TOKEN_RESET_CARD: { ResetAndWipeTokenOp.create(stConnection).resetAndWipeToken(); - mResultTokenInfo = stConnection.getTokenInfo(); + mResultTokenInfo = stConnection.readTokenInfo(); break; } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenActivity.java index 53c16a72c..a13cb1a48 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenActivity.java @@ -82,7 +82,7 @@ public abstract class BaseSecurityTokenActivity extends BaseActivity * Override to implement SecurityToken operations (background thread) */ protected void doSecurityTokenInBackground(SecurityTokenConnection stConnection) throws IOException { - tokenInfo = stConnection.getTokenInfo(); + tokenInfo = stConnection.readTokenInfo(); Log.d(Constants.TAG, "Security Token: " + tokenInfo); } @@ -260,7 +260,7 @@ public abstract class BaseSecurityTokenActivity extends BaseActivity SecurityTokenInfo tokeninfo = null; try { - tokeninfo = stConnection.getTokenInfo(); + tokeninfo = stConnection.readTokenInfo(); } catch (IOException e2) { // don't care } @@ -278,7 +278,7 @@ public abstract class BaseSecurityTokenActivity extends BaseActivity case 0x6982: { SecurityTokenInfo tokeninfo = null; try { - tokeninfo = stConnection.getTokenInfo(); + tokeninfo = stConnection.readTokenInfo(); } catch (IOException e2) { // don't care } diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnectionTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnectionTest.java index 317a2c276..ba58bf00d 100644 --- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnectionTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnectionTest.java @@ -1,7 +1,6 @@ package org.sufficientlysecure.keychain.securitytoken; -import java.io.IOException; import java.util.LinkedList; import org.bouncycastle.util.encoders.Hex; @@ -13,10 +12,6 @@ import org.mockito.stubbing.Answer; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowLog; import org.sufficientlysecure.keychain.KeychainTestRunner; -import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog; -import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey; -import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKeyRing; -import org.sufficientlysecure.keychain.pgp.UncachedKeyRing; import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo.TokenType; import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo.TransportType; import org.sufficientlysecure.keychain.util.Passphrase; @@ -106,7 +101,7 @@ public class SecurityTokenConnectionTest { expect("00ca5f5000", "9000"); - securityTokenConnection.getTokenInfo(); + securityTokenConnection.readTokenInfo(); verifyDialog(); }