diff options
author | Nikita Mikhailov <nikita.s.mikhailov@gmail.com> | 2016-04-15 00:13:33 +0600 |
---|---|---|
committer | Nikita Mikhailov <nikita.s.mikhailov@gmail.com> | 2016-04-15 01:54:09 +0600 |
commit | 263799ec965669ab027db6b1ad62a26fd6af3bac (patch) | |
tree | 22597cb0cc153940eb4d1a160ea433db1a28da8b /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken | |
parent | 784bf2322cc37befb4857f0c440f889d43f89a48 (diff) | |
download | open-keychain-263799ec965669ab027db6b1ad62a26fd6af3bac.tar.gz open-keychain-263799ec965669ab027db6b1ad62a26fd6af3bac.tar.bz2 open-keychain-263799ec965669ab027db6b1ad62a26fd6af3bac.zip |
OTG: Fix connection issues
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/UsbTransport.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/UsbTransport.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/UsbTransport.java index 10043e675..dfe91427e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/UsbTransport.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/UsbTransport.java @@ -66,7 +66,7 @@ public class UsbTransport implements Transport { * @param on true to turn ICC on, false to turn it off * @throws UsbTransportException */ - private void iccPowerSet(boolean on) throws UsbTransportException { + private void setIccPower(boolean on) throws UsbTransportException { final byte[] iccPowerCommand = { (byte) (on ? 0x62 : 0x63), 0x00, 0x00, 0x00, 0x00, @@ -145,7 +145,8 @@ public class UsbTransport implements Transport { */ @Override public boolean isConnected() { - return mConnection != null && mUsbManager.getDeviceList().containsValue(mUsbDevice); + return mConnection != null && mUsbManager.getDeviceList().containsValue(mUsbDevice) && + mConnection.getSerial() != null; } /** @@ -188,7 +189,7 @@ public class UsbTransport implements Transport { throw new UsbTransportException("USB error - failed to claim interface"); } - iccPowerSet(true); + setIccPower(true); Log.d(Constants.TAG, "Usb transport connected"); } |