fix: cancelTechnology might cause exception if there's a connected tag

session
revtel · Aug 18, 2019 · af2f1f9 · af2f1f9
1 parent 907960a
commit af2f1f9
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/android/src/main/java/community/revteltech/nfc/NfcManager.java b/android/src/main/java/community/revteltech/nfc/NfcManager.java
@@ -103,7 +103,12 @@ public void cancelTechnologyRequest(Callback callback) {
  synchronized(this) {
  if (techRequest != null) {
  techRequest.close();
- techRequest.getPendingCallback().invoke("cancelled");
+ try {
+ techRequest.getPendingCallback().invoke("cancelled");
+ } catch (RuntimeException ex) {
+ // the pending callback might already been invoked when there is an ongoing
+ // connected tag, bypass this case explicitly
+ }
  techRequest = null;
  callback.invoke();
  } else {