Skip to content

Is connected #1

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
pjunni wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Is connected #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfc9f70
isConnected
May 2, 2024
50dd02f
isConnected
May 2, 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
140 changes: 94 additions & 46 deletions android/src/main/kotlin/im/nfc/flutter_nfc_kit/FlutterNfcKitPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ class FlutterNfcKitPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
try {
val timeoutMethod = this.javaClass.getMethod("setTimeout", Int::class.java)
timeoutMethod.invoke(this, timeout)
} catch (_: Throwable) {}
} catch (_: Throwable) {
}
}
val transceiveMethod = this.javaClass.getMethod("transceive", ByteArray::class.java)
return transceiveMethod.invoke(this, data) as ByteArray
Expand Down Expand Up @@ -118,6 +119,25 @@ class FlutterNfcKitPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
}
}

"isConnected" -> {
try {
val tagTech = tagTechnology
if (tagTech != null && tagTech.isConnected) {
result.success(true)
return
}
val ndefTech = ndefTechnology
if (ndefTech != null && ndefTech.isConnected) {
result.success(true)
return
}
result.success(false) // Neither technology is connected
} catch (ex: Exception) {
Log.e(TAG, "isConnected error: ", ex)
result.error("ERROR", "Failed to check connection status", null)
}
}

"finish" -> {
pollingTimeoutTask?.cancel()
thread {
Expand Down Expand Up @@ -199,7 +219,8 @@ class FlutterNfcKitPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
val parsedMessages = mutableListOf<Map<String, String>>()
if (message != null) {
for (record in message.records) {
parsedMessages.add(mapOf(
parsedMessages.add(
mapOf(
"identifier" to record.id.toHexString(),
"payload" to record.payload.toHexString(),
"type" to record.type.toHexString(),
Expand All @@ -212,7 +233,8 @@ class FlutterNfcKitPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
NdefRecord.TNF_UNCHANGED -> "unchanged"
else -> "unknown"
}
))
)
)
}
}
result.success(JSONArray(parsedMessages).toString())
Expand Down Expand Up @@ -245,18 +267,18 @@ class FlutterNfcKitPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
val records = Array(recordData.length(), init = { i: Int ->
val record: JSONObject = recordData.get(i) as JSONObject
NdefRecord(
when (record.getString("typeNameFormat")) {
"absoluteURI" -> NdefRecord.TNF_ABSOLUTE_URI
"empty" -> NdefRecord.TNF_EMPTY
"nfcExternal" -> NdefRecord.TNF_EXTERNAL_TYPE
"nfcWellKnown" -> NdefRecord.TNF_WELL_KNOWN
"media" -> NdefRecord.TNF_MIME_MEDIA
"unchanged" -> NdefRecord.TNF_UNCHANGED
else -> NdefRecord.TNF_UNKNOWN
},
record.getString("type").hexToBytes(),
record.getString("identifier").hexToBytes(),
record.getString("payload").hexToBytes()
when (record.getString("typeNameFormat")) {
"absoluteURI" -> NdefRecord.TNF_ABSOLUTE_URI
"empty" -> NdefRecord.TNF_EMPTY
"nfcExternal" -> NdefRecord.TNF_EXTERNAL_TYPE
"nfcWellKnown" -> NdefRecord.TNF_WELL_KNOWN
"media" -> NdefRecord.TNF_MIME_MEDIA
"unchanged" -> NdefRecord.TNF_UNCHANGED
else -> NdefRecord.TNF_UNKNOWN
},
record.getString("type").hexToBytes(),
record.getString("identifier").hexToBytes(),
record.getString("payload").hexToBytes()
)
})
// write NDEF message
Expand Down Expand Up @@ -346,7 +368,11 @@ class FlutterNfcKitPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
val index = call.argument<Int>("index")!!
val maxBlock = mifareInfo!!.blockCount
if (index !in 0 until maxBlock) {
result.error("400", "Invalid block/page index $index, should be in (0, $maxBlock)", null)
result.error(
"400",
"Invalid block/page index $index, should be in (0, $maxBlock)",
null
)
return
}
thread {
Expand All @@ -369,7 +395,11 @@ class FlutterNfcKitPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
val index = call.argument<Int>("index")!!
val maxSector = mifareInfo!!.sectorCount!!
if (index !in 0 until maxSector) {
result.error("400", "Invalid sector index $index, should be in (0, $maxSector)", null)
result.error(
"400",
"Invalid sector index $index, should be in (0, $maxSector)",
null
)
return
}
thread {
Expand All @@ -379,7 +409,8 @@ class FlutterNfcKitPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
result.success(tag.readSector(index))
} catch (ex: IOException) {
Log.e(TAG, "Read sector error", ex)
result.error("500", "Communication error", ex.localizedMessage) }
result.error("500", "Communication error", ex.localizedMessage)
}
}
}

Expand All @@ -392,7 +423,11 @@ class FlutterNfcKitPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
val index = call.argument<Int>("index")!!
val maxBlock = mifareInfo!!.blockCount
if (index !in 0 until maxBlock) {
result.error("400", "Invalid block/page index $index, should be in (0, $maxBlock)", null)
result.error(
"400",
"Invalid block/page index $index, should be in (0, $maxBlock)",
null
)
return
}
val data = call.argument<Any>("data")
Expand All @@ -402,7 +437,11 @@ class FlutterNfcKitPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
}
val (bytes, _) = canonicalizeData(data)
if (bytes.size != mifareInfo!!.blockSize) {
result.error("400", "Invalid data size ${bytes.size}, should be ${mifareInfo!!.blockSize}", null)
result.error(
"400",
"Invalid data size ${bytes.size}, should be ${mifareInfo!!.blockSize}",
null
)
return
}
thread {
Expand Down Expand Up @@ -492,6 +531,7 @@ class FlutterNfcKitPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
tagTechnology = isoDep
historicalBytes = isoDep.historicalBytes.toHexString()
}

tag.techList.contains(MifareClassic::class.java.name) -> {
standard = "ISO 14443-3 (Type A)"
type = "mifare_classic"
Expand All @@ -506,6 +546,7 @@ class FlutterNfcKitPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
)
}
}

tag.techList.contains(MifareUltralight::class.java.name) -> {
standard = "ISO 14443-3 (Type A)"
type = "mifare_ultralight"
Expand All @@ -514,6 +555,7 @@ class FlutterNfcKitPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
mifareInfo = MifareInfo.fromUltralight(this.type)
}
}

else -> {
standard = "ISO 14443-3 (Type A)"
type = "unknown"
Expand Down Expand Up @@ -563,35 +605,41 @@ class FlutterNfcKitPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
ndefCapacity = ndefTag.maxSize
}

val jsonResult = JSONObject(mapOf(
"type" to type,
"id" to id,
"standard" to standard,
"atqa" to atqa,
"sak" to sak,
"historicalBytes" to historicalBytes,
"protocolInfo" to protocolInfo,
"applicationData" to applicationData,
"hiLayerResponse" to hiLayerResponse,
"manufacturer" to manufacturer,
"systemCode" to systemCode,
"dsfId" to dsfId,
"ndefAvailable" to ndefAvailable,
"ndefType" to ndefType,
"ndefWritable" to ndefWritable,
"ndefCanMakeReadOnly" to ndefCanMakeReadOnly,
"ndefCapacity" to ndefCapacity,
))
val jsonResult = JSONObject(
mapOf(
"type" to type,
"id" to id,
"standard" to standard,
"atqa" to atqa,
"sak" to sak,
"historicalBytes" to historicalBytes,
"protocolInfo" to protocolInfo,
"applicationData" to applicationData,
"hiLayerResponse" to hiLayerResponse,
"manufacturer" to manufacturer,
"systemCode" to systemCode,
"dsfId" to dsfId,
"ndefAvailable" to ndefAvailable,
"ndefType" to ndefType,
"ndefWritable" to ndefWritable,
"ndefCanMakeReadOnly" to ndefCanMakeReadOnly,
"ndefCapacity" to ndefCapacity,
)
)

if (mifareInfo != null) {
with(mifareInfo!!) {
jsonResult.put("mifareInfo", JSONObject(mapOf(
"type" to typeStr,
"size" to size,
"blockSize" to blockSize,
"blockCount" to blockCount,
"sectorCount" to sectorCount
)))
jsonResult.put(
"mifareInfo", JSONObject(
mapOf(
"type" to typeStr,
"size" to size,
"blockSize" to blockSize,
"blockCount" to blockCount,
"sectorCount" to sectorCount
)
)
)
}
}

Expand Down
4 changes: 4 additions & 0 deletions lib/flutter_nfc_kit.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,4 +513,8 @@ class FlutterNfcKit {
static Future<Uint8List> readSector(int index) async {
return await _channel.invokeMethod('readSector', {'index': index});
}

static Future<bool> isConnected() async {
return await _channel.invokeMethod('isConnected');
}
}