From 263799ec965669ab027db6b1ad62a26fd6af3bac Mon Sep 17 00:00:00 2001
From: Nikita Mikhailov <nikita.s.mikhailov@gmail.com>
Date: Fri, 15 Apr 2016 00:13:33 +0600
Subject: OTG: Fix connection issues

---
 .../sufficientlysecure/keychain/securitytoken/UsbTransport.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken')

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");
     }
 
-- 
cgit v1.2.3