From 318903cd8515a8c6313f8a536ea1b412852b2ab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 10 Jan 2017 13:14:23 +0100 Subject: [PATCH] Use nordpols new TagDispatcherBuilder --- .../keychain/ui/base/BaseSecurityTokenActivity.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenActivity.java index 7d9a07d9f..17fe8f395 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenActivity.java @@ -63,6 +63,7 @@ import java.io.IOException; import nordpol.android.OnDiscoveredTagListener; import nordpol.android.TagDispatcher; +import nordpol.android.TagDispatcherBuilder; public abstract class BaseSecurityTokenActivity extends BaseActivity implements OnDiscoveredTagListener, UsbConnectionDispatcher.OnDiscoveredUsbDeviceListener { @@ -202,7 +203,13 @@ public abstract class BaseSecurityTokenActivity extends BaseActivity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mNfcTagDispatcher = TagDispatcher.get(this, this, false, false, true, false); + mNfcTagDispatcher = new TagDispatcherBuilder(this, this) + .enableUnavailableNfcUserPrompt(false) + .enableSounds(true) + .enableDispatchingOnUiThread(true) + .enableBroadcomWorkaround(false) + .build(); + mUsbDispatcher = new UsbConnectionDispatcher(this, this); // Check whether we're recreating a previously destroyed instance