Skip to content

Commit 9d9ef31

Browse files
committed
refactor: cleanup useless null checks
1 parent 52b19fe commit 9d9ef31

1 file changed

Lines changed: 14 additions & 18 deletions

File tree

app/src/main/java/com/drunkenblindninja/vcoprinttag/MainActivity.kt

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -496,27 +496,23 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
496496
var decodedModel: OpenPrintTagModel? = null
497497
var auxOffset: Int? = null
498498

499-
if (data != null) {
500-
ensureMapsLoaded()
501-
val serializer = Serializer(classMap, typeMap, tagsMap, certsMap)
502-
// Use deserializeWithOffsets to get aux region location
503-
val result = serializer.deserializeWithOffsets(data)
504-
decodedModel = result?.model
505-
auxOffset = result?.auxByteOffset
506-
}
499+
ensureMapsLoaded()
500+
val serializer = Serializer(classMap, typeMap, tagsMap, certsMap)
501+
// Use deserializeWithOffsets to get aux region location
502+
val result = serializer.deserializeWithOffsets(data)
503+
decodedModel = result?.model
504+
auxOffset = result?.auxByteOffset
505+
507506

508507
withContext(Dispatchers.Main) {
509508
binding.progressBar.visibility = View.GONE
510-
if (data != null) {
511-
cachedTagData = data
512-
cachedModel = decodedModel
513-
cachedAuxOffset = auxOffset
514-
binding.tvStatus.text = getString(R.string.status_tag_read_success, data.size)
515-
displayTagData(decodedModel)
516-
checkSize(cachedTagData?.size)
517-
} else {
518-
binding.tvStatus.text = getString(R.string.status_read_failed)
519-
}
509+
cachedTagData = data
510+
cachedModel = decodedModel
511+
cachedAuxOffset = auxOffset
512+
binding.tvStatus.text = getString(R.string.status_tag_read_success, data.size)
513+
displayTagData(decodedModel)
514+
checkSize(cachedTagData?.size)
515+
520516
}
521517
} catch (e: Exception) {
522518
Log.e("NFC", "Read failed", e)

0 commit comments

Comments
 (0)