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

Ensure correct NFC state on onResume

Browse Source 
This fixes going to settings from the view activity and disabling NFC,
followed by a press of the back button from not disabling reader mode
This commit is contained in:
Sylvia van Os
2026-05-02 16:14:50 +02:00
parent dfa1c29fa0
commit cd2eb2e0d9
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -515,29 +515,29 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
private void enablePausedNfcIfConfigured() {
// Pause NFC to prevent NFC payments from triggering while showing a barcode
if (!settings.getDisableNfcWhileViewingCard()) {
return;
}
NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(this);
if (nfcAdapter == null) {
return;
}
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 (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);
} else {
nfcAdapter.disableReaderMode(this);
}
}
private boolean loadCurrentCardFromDatabase() {