Skip to content

Update NfcPlugin.m #510

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

Open
faizulMyori wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Update NfcPlugin.m #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
214fc8e
Update NfcPlugin.m
faizulMyori May 27, 2024
6327f73
Update package.json
faizulMyori May 27, 2024
de41e26
Update package.json
faizulMyori May 27, 2024
a26f8c1
update android
faizulMyori May 29, 2024
401caee
Update NfcPlugin.java
faizulMyori May 30, 2024
1d074fb
Update Util.java
faizulMyori May 30, 2024
db52981
Update package.json
faizulMyori May 30, 2024
7980c18
Update NfcPlugin.java
faizulMyori May 30, 2024
9c2a1f2
Update Util.java
faizulMyori May 30, 2024
6670876
Update package.json
faizulMyori May 30, 2024
d7e04d0
Update NfcPlugin.java
faizulMyori May 30, 2024
3e53f0e
Update package.json
faizulMyori May 30, 2024
e6aeeb5
Update NfcPlugin.java
faizulMyori May 30, 2024
01dec42
Update package.json
faizulMyori May 30, 2024
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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "phonegap-nfc",
"version": "1.2.0",
"name": "@faizulramir/nfc",
"version": "1.0.5",
"description": "Near Field Communication (NFC) Plugin. Read and write NDEF messages to NFC tags and share NDEF messages with peers.",
"cordova": {
"id": "phonegap-nfc",
Expand Down
37 changes: 24 additions & 13 deletions src/android/src/com/chariotsolutions/nfc/plugin/NfcPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import android.os.Bundle;
import android.os.Parcelable;
import android.util.Log;
import android.os.Build;

public class NfcPlugin extends CordovaPlugin implements NfcAdapter.OnNdefPushCompleteCallback {
private static final String REGISTER_MIME_TYPE = "registerMimeType";
Expand Down Expand Up @@ -482,8 +483,18 @@ private void createPendingIntent() {
if (pendingIntent == null) {
Activity activity = getActivity();
Intent intent = new Intent(activity, activity.getClass());
intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP);
pendingIntent = PendingIntent.getActivity(activity, 0, intent, 0);
// intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP);
// pendingIntent = PendingIntent.getActivity(activity, 0, intent, 0);

//--add-on
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { //--change Build.VERSION_CODES.M to .S
intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP);
pendingIntent = PendingIntent.getActivity(activity, 0, intent, PendingIntent.FLAG_IMMUTABLE);
} else {
intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP);
pendingIntent = PendingIntent.getActivity(activity, 0, intent, 0);
}
//--add-on
}
}

Expand Down Expand Up @@ -547,7 +558,7 @@ private void startNfc() {
}

if (p2pMessage != null) {
nfcAdapter.setNdefPushMessage(p2pMessage, getActivity());
// nfcAdapter.setNdefPushMessage(p2pMessage, getActivity()); //--fuad:20240528
}
} catch (IllegalStateException e) {
// issue 110 - user exits app with home button while nfc is initializing
Expand Down Expand Up @@ -582,12 +593,12 @@ private void startNdefBeam(final CallbackContext callbackContext, final Uri[] ur

if (nfcAdapter == null) {
callbackContext.error(STATUS_NO_NFC);
} else if (!nfcAdapter.isNdefPushEnabled()) {
callbackContext.error(STATUS_NDEF_PUSH_DISABLED);
// } else if (!nfcAdapter.isNdefPushEnabled()) { //--fuad:20240528
// callbackContext.error(STATUS_NDEF_PUSH_DISABLED);
} else {
nfcAdapter.setOnNdefPushCompleteCallback(NfcPlugin.this, getActivity());
// nfcAdapter.setOnNdefPushCompleteCallback(NfcPlugin.this, getActivity()); //--fuad:20240528
try {
nfcAdapter.setBeamPushUris(uris, getActivity());
// nfcAdapter.setBeamPushUris(uris, getActivity());//--fuad:20240528

PluginResult result = new PluginResult(PluginResult.Status.NO_RESULT);
result.setKeepCallback(true);
Expand All @@ -608,11 +619,11 @@ private void startNdefPush(final CallbackContext callbackContext) {

if (nfcAdapter == null) {
callbackContext.error(STATUS_NO_NFC);
} else if (!nfcAdapter.isNdefPushEnabled()) {
callbackContext.error(STATUS_NDEF_PUSH_DISABLED);
// } else if (!nfcAdapter.isNdefPushEnabled()) { //--fuad:20240528
// callbackContext.error(STATUS_NDEF_PUSH_DISABLED);
} else {
nfcAdapter.setNdefPushMessage(p2pMessage, getActivity());
nfcAdapter.setOnNdefPushCompleteCallback(NfcPlugin.this, getActivity());
// nfcAdapter.setNdefPushMessage(p2pMessage, getActivity()); //--fuad:20240528
// nfcAdapter.setOnNdefPushCompleteCallback(NfcPlugin.this, getActivity()); //--fuad:20240528

PluginResult result = new PluginResult(PluginResult.Status.NO_RESULT);
result.setKeepCallback(true);
Expand All @@ -628,7 +639,7 @@ private void stopNdefPush() {
NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());

if (nfcAdapter != null) {
nfcAdapter.setNdefPushMessage(null, getActivity());
// nfcAdapter.setNdefPushMessage(null, getActivity());//--fuad:20240528
}

});
Expand All @@ -640,7 +651,7 @@ private void stopNdefBeam() {
NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());

if (nfcAdapter != null) {
nfcAdapter.setBeamPushUris(null, getActivity());
// nfcAdapter.setBeamPushUris(null, getActivity()); //--fuad:20240528
}

});
Expand Down
10 changes: 5 additions & 5 deletions src/ios/NfcPlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,13 @@ - (void)writeTag:(CDVInvokedUrlCommand*)command API_AVAILABLE(ios(13.0)){
if (self.shouldUseTagReaderSession) {
NSLog(@"Using NFCTagReaderSession");

self.nfcSession = [[NFCTagReaderSession new]
self.nfcSession = [[NFCTagReaderSession alloc]
initWithPollingOption:(NFCPollingISO14443 | NFCPollingISO15693)
delegate:self queue:dispatch_get_main_queue()];

} else {
NSLog(@"Using NFCTagReaderSession");
self.nfcSession = [[NFCNDEFReaderSession new]initWithDelegate:self queue:nil invalidateAfterFirstRead:FALSE];
self.nfcSession = [[NFCNDEFReaderSession alloc]initWithDelegate:self queue:nil invalidateAfterFirstRead:FALSE];
}
}

Expand Down Expand Up @@ -306,20 +306,20 @@ - (void)startScanSession:(CDVInvokedUrlCommand*)command {

if (self.shouldUseTagReaderSession) {
NSLog(@"Using NFCTagReaderSession");
self.nfcSession = [[NFCTagReaderSession new]
self.nfcSession = [[NFCTagReaderSession alloc]
initWithPollingOption:(NFCPollingISO14443 | NFCPollingISO15693)
delegate:self queue:dispatch_get_main_queue()];
} else {
NSLog(@"Using NFCNDEFReaderSession");
self.nfcSession = [[NFCNDEFReaderSession new]initWithDelegate:self queue:nil invalidateAfterFirstRead:TRUE];
self.nfcSession = [[NFCNDEFReaderSession alloc]initWithDelegate:self queue:nil invalidateAfterFirstRead:TRUE];
}
sessionCallbackId = [command.callbackId copy];
self.nfcSession.alertMessage = @"Hold near NFC tag to scan.";
[self.nfcSession beginSession];

} else if (@available(iOS 11.0, *)) {
NSLog(@"iOS < 13, using NFCNDEFReaderSession");
self.nfcSession = [[NFCNDEFReaderSession new]initWithDelegate:self queue:nil invalidateAfterFirstRead:TRUE];
self.nfcSession = [[NFCNDEFReaderSession alloc]initWithDelegate:self queue:nil invalidateAfterFirstRead:TRUE];
sessionCallbackId = [command.callbackId copy];
self.nfcSession.alertMessage = @"Hold near NFC tag to scan.";
[self.nfcSession beginSession];
Expand Down