Skip to content

Fix potential memory leak in NfcSmartCardReaderManager callback. #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ambrose40 merged 1 commit into from
Feb 19, 2026
Merged

Fix potential memory leak in NfcSmartCardReaderManager callback. #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions ...eader-lib/src/main/java/ee/ria/DigiDoc/smartcardreader/nfc/NfcSmartCardReaderManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public void disableNfcReaderMode() {
}
this.nfcAdapter = null;
this.currentActivity = null;
this.clientCallback = null;
}

/**
Expand Down Expand Up @@ -96,20 +97,14 @@ public NfcStatus detectNfcStatus(Activity activity) {
* @return - status if the NFC is available / enabled / active
*/
public NfcStatus startDiscovery(Activity activity, NfcSmartCardReaderCallback callback) {
this.currentActivity = activity;
this.nfcAdapter = NfcAdapter.getDefaultAdapter(this.currentActivity);

if (this.nfcAdapter == null) {
return NfcStatus.NFC_NOT_SUPPORTED;
}

if (!this.nfcAdapter.isEnabled()) {
return NfcStatus.NFC_NOT_ACTIVE;
}
NfcAdapter adapter = NfcAdapter.getDefaultAdapter(activity);
if (adapter == null) return NfcStatus.NFC_NOT_SUPPORTED;
if (!adapter.isEnabled()) return NfcStatus.NFC_NOT_ACTIVE;

this.currentActivity = activity;
this.nfcAdapter = adapter;
this.clientCallback = callback;
this.nfcAdapter.enableReaderMode(
this.currentActivity, this, NfcAdapter.FLAG_READER_NFC_A, null);
adapter.enableReaderMode(activity, this, NfcAdapter.FLAG_READER_NFC_A, null);
return NfcStatus.NFC_ACTIVE;
}

Expand Down