dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/android-apdu-proxy/+/41798?usp=email )
Change subject: cosmetic: fix sourcecode formatting
......................................................................
cosmetic: fix sourcecode formatting
Change-Id: Iab233cdff33d686d6715abe3cb2b0c4f2a74dd0d
---
M app/src/main/java/org/osmocom/androidApduProxy/Omapi.java
M app/src/main/java/org/osmocom/androidApduProxy/OmapiCallbackHandlerVpcd.java
M app/src/main/java/org/osmocom/androidApduProxy/Vpcd.java
3 files changed, 5 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/android-apdu-proxy
refs/changes/98/41798/1
diff --git a/app/src/main/java/org/osmocom/androidApduProxy/Omapi.java
b/app/src/main/java/org/osmocom/androidApduProxy/Omapi.java
index 765d888..afd4515 100644
--- a/app/src/main/java/org/osmocom/androidApduProxy/Omapi.java
+++ b/app/src/main/java/org/osmocom/androidApduProxy/Omapi.java
@@ -135,7 +135,7 @@
}
session.close();
} else {
- Log.d("OMAPI","found reader: " + reader.getName() + "
(empty)\n");
+ Log.d("OMAPI", "found reader: " + reader.getName() + "
(empty)\n");
}
}
return usable_readers;
diff --git
a/app/src/main/java/org/osmocom/androidApduProxy/OmapiCallbackHandlerVpcd.java
b/app/src/main/java/org/osmocom/androidApduProxy/OmapiCallbackHandlerVpcd.java
index d5b4043..7b2f63f 100644
---
a/app/src/main/java/org/osmocom/androidApduProxy/OmapiCallbackHandlerVpcd.java
+++
b/app/src/main/java/org/osmocom/androidApduProxy/OmapiCallbackHandlerVpcd.java
@@ -16,7 +16,6 @@
private String remoteHost = null;
private int remotePort = 0;
private Handler uiHandler = null;
-
private int omapiChannel = -1;
private byte[] omapiAid = null;
@@ -107,7 +106,7 @@
//we just use the FID 7FFF, which is an alias for the
currently selected application. In case the
//AID is different, we close the OMAPI channel and re-open it
with the new AID. If this fails, we
//we just pretend that we haven't found the file.
- if (Arrays.equals(Arrays.copyOf( tpdu,3),
Utils.h2b("00A404") ) ) {
+ if (Arrays.equals(Arrays.copyOf(tpdu, 3),
Utils.h2b("00A404"))) {
byte[] aidReq = Arrays.copyOfRange(tpdu, 5, tpdu.length -
1);
int compareLength = 0;
if (omapiAid != null) {
@@ -148,8 +147,8 @@
//Block all attempts to manage a channel, this is a feature we
do not support here.
//(OMAPI also does not support the MANAGE CHANNEL command)
- if (Arrays.equals(Arrays.copyOf( tpdu,2), Utils.h2b("0070") )
) {
return (Utils.h2b("6D00"));
+ if (Arrays.equals(Arrays.copyOf(tpdu, 2), Utils.h2b("0070") )
) {
}
//Normal APDU/TPDU exchange
diff --git a/app/src/main/java/org/osmocom/androidApduProxy/Vpcd.java
b/app/src/main/java/org/osmocom/androidApduProxy/Vpcd.java
index 002803b..d4b65d0 100644
--- a/app/src/main/java/org/osmocom/androidApduProxy/Vpcd.java
+++ b/app/src/main/java/org/osmocom/androidApduProxy/Vpcd.java
@@ -204,7 +204,7 @@
//TPDU data
byte[] reqTpdu = new byte[messageLen];
byte[] resTpdu;
- System.arraycopy(message, 0, reqTpdu,0, messageLen);
+ System.arraycopy(message, 0, reqTpdu, 0, messageLen);
Log.d("VPCD", String.format("remote end asks to send TPDU:
%s\n",
Utils.b2h(reqTpdu)));
resTpdu = callback.vpcdTransact(reqTpdu);
@@ -243,4 +243,4 @@
this.receiving = false;
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.osmocom.org/c/android-apdu-proxy/+/41798?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: android-apdu-proxy
Gerrit-Branch: master
Gerrit-Change-Id: Iab233cdff33d686d6715abe3cb2b0c4f2a74dd0d
Gerrit-Change-Number: 41798
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <[email protected]>
