mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-05-17 05:09:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3132 from CatimaLoyalty/workaround/nfc_crash

Browse Source 
Work around NFC crash
This commit is contained in:
Sylvia van Os
2026-05-16 14:53:14 +02:00
committed by GitHub
parent e46da24e03
commit ed412c221a
2 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
app/src/main/java/protect/card_locker/cardview/LoyaltyCardViewActivity.java
View File

@@ -456,7 +456,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
Window window = getWindow();
applyWindowPreferences(window);
enablePausedNfcIfConfigured();
configurePausedNfc(settings.getDisableNfcWhileViewingCard());
if (!loadCurrentCardFromDatabase()) {
finish();
@@ -476,6 +476,14 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
ShortcutHelper.updateShortcuts(this);
}
@Override
protected void onPause() {
// Some devices have broken NFC, which will cause a crash if reader mode is enabled
// So ensure we disable it explicitly before letting Android "save" the NFC state
configurePausedNfc(false);
super.onPause();
}
@Override
protected void onDestroy() {
if (database != null && database.isOpen()) {
@@ -513,28 +521,36 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
window.setAttributes(attributes);
}
private void enablePausedNfcIfConfigured() {
private void configurePausedNfc(boolean pause) {
// Pause NFC to prevent NFC payments from triggering while showing a barcode
NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(this);
if (nfcAdapter == null) {
return;
}
if (settings.getDisableNfcWhileViewingCard()) {
nfcAdapter.enableReaderMode(this, tag -> {
Snackbar snackbar = Snackbar.make(binding.container, R.string.nfc_blocked_while_viewing_card, Snackbar.LENGTH_LONG)
.setAnchorView(binding.fabEdit)
.setAction(R.string.change_settings, view -> {
// Open settings activity
Intent intent = new Intent(getApplicationContext(), SettingsActivity.class);
startActivity(intent);
});
snackbar.show();
}, NfcAdapter.FLAG_READER_NFC_A | NfcAdapter.FLAG_READER_NFC_B
| NfcAdapter.FLAG_READER_NFC_F | NfcAdapter.FLAG_READER_NFC_V
| NfcAdapter.FLAG_READER_NFC_BARCODE
| NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK
| NfcAdapter.FLAG_READER_NO_PLATFORM_SOUNDS, null);
if (pause) {
try {
nfcAdapter.enableReaderMode(this, tag -> {
Snackbar snackbar = Snackbar.make(binding.container, R.string.nfc_blocked_while_viewing_card, Snackbar.LENGTH_LONG)
.setAnchorView(binding.fabEdit)
.setAction(R.string.change_settings, view -> {
// Open settings activity
Intent intent = new Intent(getApplicationContext(), SettingsActivity.class);
startActivity(intent);
});
snackbar.show();
}, NfcAdapter.FLAG_READER_NFC_A | NfcAdapter.FLAG_READER_NFC_B
| NfcAdapter.FLAG_READER_NFC_F | NfcAdapter.FLAG_READER_NFC_V
| NfcAdapter.FLAG_READER_NFC_BARCODE
| NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK
| NfcAdapter.FLAG_READER_NO_PLATFORM_SOUNDS, null);
} catch (Exception e) {
// For some unknown reason, this can throw a DeadObjectException.
// Mostly got reports from FOSS users, which implies it may be more common with custom ROMs? Uncertain.
Toast.makeText(this, R.string.nfc_block_system_error, Toast.LENGTH_SHORT).show();
Log.e(TAG, "Failed to pause NFC: " + e);
e.printStackTrace();
}
} else {
nfcAdapter.disableReaderMode(this);
}

1
app/src/main/res/values/strings.xml
View File

@@ -350,4 +350,5 @@
<string name="back">Back</string>
<string name="nfc_blocked_while_viewing_card">NFC is paused</string>
<string name="change_settings">Change settings</string>
<string name="nfc_block_system_error">Failed to pause NFC</string>
</resources>