diff --git a/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/MainActivity.java b/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/MainActivity.java
index 11e4238..b6f5c54 100644
--- a/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/MainActivity.java
+++ b/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/MainActivity.java
@@ -105,7 +105,6 @@ public class MainActivity extends Activity {
private EditText editTextVPCDHost;
private EditText editTextVPCDPort;
private TextView textViewVPCDStatus;
- private TextView textViewInfo;
private Button button;
private ProgressBar spinner;
private VPCDHandler handler;
@@ -119,7 +118,6 @@ public class MainActivity extends Activity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
- textViewInfo = (TextView) findViewById(R.id.textViewInfo);
editTextVPCDHost = (EditText) findViewById(R.id.editTextHostname);
editTextVPCDPort = (EditText) findViewById(R.id.editTextPort);
textViewVPCDStatus = (TextView) findViewById(R.id.textViewLog);
@@ -169,7 +167,6 @@ public class MainActivity extends Activity {
vpcdDisconnect();
}
-
public void buttonOnClickDisConnect(View view) {
if (testing) {
testing = false;
diff --git a/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/VPCDWorker.java b/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/VPCDWorker.java
index aa41a8e..7665232 100644
--- a/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/VPCDWorker.java
+++ b/remote-reader/app/src/main/java/com/vsmartcard/remotesmartcardreader/app/VPCDWorker.java
@@ -89,6 +89,7 @@ public class VPCDWorker implements Runnable, Closeable {
case VPCD_CTRL_ON:
reader.powerOn();
messageSender.sendOn();
+ messageSender.sendATR(Hex.getHexString(reader.getATR()));
break;
case VPCD_CTRL_RESET:
reader.reset();
@@ -96,7 +97,6 @@ public class VPCDWorker implements Runnable, Closeable {
break;
case VPCD_CTRL_ATR:
out = reader.getATR();
- //messageSender.sendATR(Hex.getHexString(out));
break;
default:
throw new IOException("Unhandled command from VPCD.");
@@ -114,8 +114,6 @@ public class VPCDWorker implements Runnable, Closeable {
if (doRun) {
e.printStackTrace();
messageSender.sendError(e.getMessage());
- } else {
- messageSender.sendDisconnected("");
}
}
}
@@ -167,8 +165,12 @@ public class VPCDWorker implements Runnable, Closeable {
}
private void vpcdDisconnect() throws IOException {
+ if (reader != null) {
+ reader.eject();
+ }
if (socket != null) {
socket.close();
+ messageSender.sendDisconnected("");
}
}
}
diff --git a/remote-reader/app/src/main/res/values/strings.xml b/remote-reader/app/src/main/res/values/strings.xml
index e7245c2..81588a3 100644
--- a/remote-reader/app/src/main/res/values/strings.xml
+++ b/remote-reader/app/src/main/res/values/strings.xml
@@ -9,23 +9,21 @@
port
VPCD hostname
- Settings for remote smart card reader driver (VPCD) of the host computer.
+ Settings for remote smart card reader driver (VPCD) of the host computer. Tap a contact-less card when configured.
Error
- Disconnected
+ Disconnected from VPCD
Connected to
ATR
C-APDU
R-APDU
- On
- Off
- Reset
- Unknown Event
- Contact-less card discovered.
- Using a dummy card to test the connection.
- Using default port.
-
- Copy
+ Powered up the card
+ Powered down the card (cold reset)
+ Resetted the card (warm reset)
+ Unable to perform unknown Event
+ Contact-less card discovered
+ Using a dummy card to test the connection
+ Using default port
Settings
Verbose logging