Skip to content

Commit 3379e60

Browse files
NFC-83 Unify NFC cancel methods
1 parent ff7ab77 commit 3379e60

2 files changed

Lines changed: 6 additions & 12 deletions

File tree

app/src/main/kotlin/ee/ria/DigiDoc/ui/component/signing/NFCView.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -688,15 +688,17 @@ fun NFCView(
688688
}
689689
cancelDecryptAction {
690690
nfcViewModel.handleBackButton()
691-
nfcViewModel.cancelNFCDecryptWorkRequest()
691+
nfcViewModel.cancelNfcOperation()
692692
}
693+
693694
cancelWebEidAuthenticateAction {
694695
nfcViewModel.handleBackButton()
695-
nfcViewModel.cancelWebEidAuthWorkRequest()
696+
nfcViewModel.cancelNfcOperation()
696697
}
698+
697699
cancelWebEidSignAction {
698700
nfcViewModel.handleBackButton()
699-
nfcViewModel.cancelWebEidSignWorkRequest()
701+
nfcViewModel.cancelNfcOperation()
700702
}
701703
}
702704
}

app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/NFCViewModel.kt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -211,15 +211,7 @@ class NFCViewModel
211211
nfcSmartCardReaderManager.disableNfcReaderMode()
212212
}
213213

214-
fun cancelNFCDecryptWorkRequest() {
215-
nfcSmartCardReaderManager.disableNfcReaderMode()
216-
}
217-
218-
fun cancelWebEidAuthWorkRequest() {
219-
nfcSmartCardReaderManager.disableNfcReaderMode()
220-
}
221-
222-
fun cancelWebEidSignWorkRequest() {
214+
fun cancelNfcOperation() {
223215
nfcSmartCardReaderManager.disableNfcReaderMode()
224216
}
225217

0 commit comments

Comments
 (0)