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

AND-4628 Moved NFC enable check #333

Merged
merged 6 commits into from
Jan 11, 2024

Conversation

Sateetas
Copy link
Contributor

No description provided.

Mama1emon
Mama1emon previously approved these changes Oct 24, 2023
@@ -32,7 +32,7 @@ fun TangemSdk.Companion.init(activity: ComponentActivity, config: Config = Confi
val secureStorage = SecureStorage.create(activity)
val nfcManager = TangemSdk.initNfcManager(activity)

val viewDelegate = DefaultSessionViewDelegate(nfcManager, nfcManager.reader, activity)
val viewDelegate = DefaultSessionViewDelegate(nfcManager, activity)
Copy link
Contributor

Choose a reason for hiding this comment

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

Ты не подлил изменения конструктора DefaultSessionViewDelegate, на тесты не собирается с ошибкой

Copy link
Contributor Author

Choose a reason for hiding this comment

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

готово

# Conflicts:
#	tangem-sdk-android/src/main/java/com/tangem/sdk/DefaultSessionViewDelegate.kt
roman-pv
roman-pv previously approved these changes Nov 17, 2023
@@ -46,6 +46,17 @@ class DefaultSessionViewDelegate(
) {
Log.view { "session started" }
createAndShowState(SessionViewDelegateState.Ready(formatCardId(cardId)), enableHowTo, message, iconScanRes)
checkNfcEnabled()
Copy link
Collaborator

Choose a reason for hiding this comment

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

а если не дал разрешение на nfc то диалог скана так и останется подвешенный?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ага, помню обсуждали что так ок будет,
иначе много изменений будет в механизме обработки сессии, и в чистоте он потеряет

можно будет сделать отдельной задачей, если сильно понадобится

@kozarezvlad kozarezvlad merged commit a89cfbe into develop Jan 11, 2024
3 checks passed
@kozarezvlad kozarezvlad deleted the bugfix/AND-4628_move_nfc_enabled_check branch January 11, 2024 08:12
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.

4 participants