Skip to content
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

Jump to bottom

Fix NFC presence timeout in Android 13+ #52

Open
wants to merge 1 commit into
base: community
Choose a base branch
from
Open

Fix NFC presence timeout in Android 13+ #52

Show file tree
Hide file tree
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
6 changes: 5 additions & 1 deletion docs/sdk/android.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,7 @@ by way of example.
import android.nfc.NfcAdapter;
import android.nfc.tech.IsoDep;
import java.util.Arrays;
import android.os.Bundle;

import com.governikus.ausweisapp2.IAusweisApp2Sdk;

Expand All @@ -646,13 +647,16 @@ by way of example.
private final Activity mActivity;
private final NfcAdapter mAdapter;
private final int mFlags;
private final Bundle mBundle;
private final NfcAdapter.ReaderCallback mReaderCallback;

ForegroundDispatcher(Activity pActivity, final IAusweisApp2Sdk pSdk, final String pSdkSessionID)
{
mActivity = pActivity;
mAdapter = NfcAdapter.getDefaultAdapter(mActivity);
mFlags = NfcAdapter.FLAG_READER_NFC_A | NfcAdapter.FLAG_READER_NFC_B | NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK;
mBundle = new Bundle();
mBundle.putInt(NfcAdapter.EXTRA_READER_PRESENCE_CHECK_DELAY, 1000);
mReaderCallback = new NfcAdapter.ReaderCallback()
{
public void onTagDiscovered(Tag pTag)
Expand All @@ -669,7 +673,7 @@ by way of example.
{
if (mAdapter != null)
{
mAdapter.enableReaderMode(mActivity, mReaderCallback, mFlags, null);
mAdapter.enableReaderMode(mActivity, mReaderCallback, mFlags, mBundle);
}
}

Expand Down
5 changes: 4 additions & 1 deletion src/android/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ void disable()
private class NfcReaderMode
{
private final int mFlags;
private final Bundle mBundle;
private final NfcAdapter.ReaderCallback mCallback;
private boolean mEnabled;

Expand All @@ -108,6 +109,8 @@ private class NfcReaderMode
| NfcAdapter.FLAG_READER_NFC_B
| NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK
| NfcAdapter.FLAG_READER_NO_PLATFORM_SOUNDS;
mBundle = new Bundle();
mBundle.putInt(NfcAdapter.EXTRA_READER_PRESENCE_CHECK_DELAY, 1000);
mCallback = pTag ->
{
if (Arrays.asList(pTag.getTechList()).contains(IsoDep.class.getName()))
Expand All @@ -134,7 +137,7 @@ void enable()
if (adapter != null && !mEnabled)
{
mEnabled = true;
adapter.enableReaderMode(MainActivity.this, mCallback, mFlags, null);
adapter.enableReaderMode(MainActivity.this, mCallback, mFlags, mBundle);
}

}
Expand Down