mirror of
https://github.com/nacabaro/vbhelper.git
synced 2026-07-30 00:31:54 +00:00
Merge pull request #56 from b13st/fix/hce-character-cloning
Fix/hce character cloning
This commit is contained in:
commit
33ad2728b8
@ -44,14 +44,8 @@ fun ScanScreen(
|
||||
|
||||
val context = LocalContext.current
|
||||
|
||||
LaunchedEffect(storageRepository) {
|
||||
LaunchedEffect(characterId) {
|
||||
withContext(Dispatchers.IO) {
|
||||
/*
|
||||
First check if there is a character sent through the navigation system
|
||||
If there is not, that means we got here through the home screen nfc button
|
||||
If we got here through the home screen, it does not hurt to check if there is
|
||||
an active character.
|
||||
*/
|
||||
if (characterId != null && nfcCharacter == null) {
|
||||
nfcCharacter = scanScreenController.characterToNfc(characterId)
|
||||
}
|
||||
|
||||
@ -231,7 +231,9 @@ class ScanScreenControllerImpl(
|
||||
val proto = VitalWearCharacterExporter(componentActivity, database).buildCharacterProto(characterId)
|
||||
val client = VitalWearHceReaderClient(isoDep)
|
||||
client.sendCharacterToWatch(proto)
|
||||
Log.i("NFC_WRITE", "Character sent to VitalWear via HCE")
|
||||
database.userCharacterDao().deleteCharacterById(characterId)
|
||||
pendingExportCharacterId = null
|
||||
Log.i("NFC_WRITE", "Character sent to VitalWear and deleted from app (id=$characterId)")
|
||||
componentActivity.runOnUiThread {
|
||||
Toast.makeText(componentActivity, componentActivity.getString(R.string.scan_sent_character_success), Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user