dexter has submitted this change. ( 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, 4 insertions(+), 5 deletions(-)
Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved
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..ff63928 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) { 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 +}