cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OTG: Usb device manager fixes

Browse Source
This commit is contained in:
Nikita Mikhailov
2016-04-04 01:31:14 +06:00
parent bd2906a887
commit 3d538d885e
5 changed files with 79 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenNfcActivity.java
View File

@@ -74,7 +74,7 @@ public abstract class BaseSecurityTokenNfcActivity extends BaseActivity
private static final String FIDESMO_APP_PACKAGE = "com.fidesmo.sec.android";
public JavacardDevice mJavacardDevice;
public JavacardDevice mJavacardDevice = new BaseJavacardDevice();
protected TagDispatcher mTagDispatcher;
protected UsbConnectionManager mUsbDispatcher;
private boolean mTagHandlingEnabled;
@@ -451,7 +451,7 @@ public abstract class BaseSecurityTokenNfcActivity extends BaseActivity
throw new IsoDepNotSupportedException("Tag does not support ISO-DEP (ISO 14443-4)");
}
mJavacardDevice = new BaseJavacardDevice(new NfcTransport(isoCard));
mJavacardDevice.setTransport(new NfcTransport(isoCard));
mJavacardDevice.connectToDevice();
doNfcInBackground();
@@ -459,7 +459,7 @@ public abstract class BaseSecurityTokenNfcActivity extends BaseActivity
protected void handleUsbDevice(UsbDevice device) throws IOException {
UsbManager usbManager = (UsbManager) getSystemService(USB_SERVICE);
mJavacardDevice = new BaseJavacardDevice(new UsbTransport(device, usbManager));
mJavacardDevice.setTransport(new UsbTransport(device, usbManager));
mJavacardDevice.connectToDevice();
doNfcInBackground();
@@ -567,4 +567,10 @@ public abstract class BaseSecurityTokenNfcActivity extends BaseActivity
}
return mAppInstalled;
}
@Override
protected void onDestroy() {
super.onDestroy();
mUsbDispatcher.onDestroy();
}
}