NFC: catch exceptions, add background enable

NightscoutFoundation · Sep 16, 2024 · c5f69a4 · c5f69a4
1 parent e116f6a
commit c5f69a4
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/nfc/NFControl.java b/app/src/main/java/com/eveningoutpost/dexdrip/nfc/NFControl.java
@@ -40,9 +40,9 @@ private static int getReaderFlags() { // if 0 then nothing enabled
  }
 
  if (GlucoMen.isEnabled()) {
-  flags |= NfcAdapter.FLAG_READER_NFC_V
-  | NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK
-  | NfcAdapter.FLAG_READER_NO_PLATFORM_SOUNDS;
+ flags |= NfcAdapter.FLAG_READER_NFC_V
+ | NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK
+ | NfcAdapter.FLAG_READER_NO_PLATFORM_SOUNDS;
  }
 
  return flags;
@@ -58,7 +58,11 @@ private static Bundle getOptionsBundle() {
  }
  }
 
- public static void initNFC(final Activity context, final boolean disable) {
+ public static void initNFCbackground(final Activity context, final boolean disable) {
+ new Thread(() -> NFControl.initNFC(context, disable)).start();
+ }
+
+ public static synchronized void initNFC(final Activity context, final boolean disable) {
  UserError.Log.d(TAG, "InitNFC start");
  val mNfcAdapter = NfcAdapter.getDefaultAdapter(context);
  val flags = disable ? 0 : getReaderFlags();
@@ -93,11 +97,19 @@ public static void initNFC(final Activity context, final boolean disable) {
  }
 
  UserError.Log.d(TAG, "Enabling reader mode with flags: " + flags);
- mNfcAdapter.enableReaderMode(context, new TagMultiplexer(context), flags, getOptionsBundle());
+ try {
+ mNfcAdapter.enableReaderMode(context, new TagMultiplexer(context), flags, getOptionsBundle());
+ } catch (Exception e) {
+ UserError.Log.e(TAG, "Got exception enabling reader mode: " + e);
+ }
  } else {
  if (mNfcAdapter != null) {
  UserError.Log.d(TAG, "Disabling reader mode");
- mNfcAdapter.disableReaderMode(context);
+ try {
+ mNfcAdapter.disableReaderMode(context);
+ } catch (Exception e) {
+ UserError.Log.e(TAG, "Got exception disabling reader mode: " + e);
+ }
  }
  }
  }