Skip to content
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.

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

Events Refactoring #13

Merged
merged 2 commits into from
Oct 18, 2019
Merged

Events Refactoring #13

merged 2 commits into from
Oct 18, 2019

Conversation

fventola-ipzs
Copy link
Contributor

Conflicts:

cieidsdk/src/main/java/it/ipzs/cieidsdk/common/CieIDSdk.kt

cieidsdk/src/main/java/it/ipzs/cieidsdk/network/NetworkClient.kt

cieidsdk/src/main/java/it/ipzs/cieidsdk/nfc/ApduResponse.kt

cieidsdk/src/main/java/it/ipzs/cieidsdk/nfc/AppUtil.kt

cieidsdk/src/main/java/it/ipzs/cieidsdk/nfc/Asn1Tag.kt

cieidsdk/src/main/java/it/ipzs/cieidsdk/nfc/Ias.kt

refactor enum from enum to class

…android-sdk into ipzs-rebase

# Conflicts:
#	cieidsdk/src/main/java/it/ipzs/cieidsdk/common/CieIDSdk.kt
#	cieidsdk/src/main/java/it/ipzs/cieidsdk/network/NetworkClient.kt
#	cieidsdk/src/main/java/it/ipzs/cieidsdk/nfc/ApduResponse.kt
#	cieidsdk/src/main/java/it/ipzs/cieidsdk/nfc/AppUtil.kt
#	cieidsdk/src/main/java/it/ipzs/cieidsdk/nfc/Asn1Tag.kt
#	cieidsdk/src/main/java/it/ipzs/cieidsdk/nfc/Ias.kt

refactor enum from enum to class
@Undermaken Undermaken changed the title Merge branch 'ipzs-rebase' of https://github.com/teamdigitale/io-cie-android-sdk into ipzs-rebase Events Refactoring Oct 17, 2019
@@ -41,7 +39,7 @@ class CieModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
* onEvent is called if an event occurs
*/
override fun onEvent(event: Event) {
cieInvalidPinAttempts = event.attempts;
cieInvalidPinAttempts = event.attempts!!
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
cieInvalidPinAttempts = event.attempts!!
cieInvalidPinAttempts = event.attempts ?: cieInvalidPinAttempts

event.attempts is always null except for ON_PIN_ERROR (isn't it?)
So I guess to update cieInvalidPinAttempts only when attempts has a value

@fventola-ipzs fventola-ipzs merged commit 72ce38d into ipzs_review Oct 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants