Skip to content

MS-259 Do not open serial entry when finishing NFC connection #615

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.

Sign up for GitHub

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

Merged
luhmirin-s merged 1 commit into from
Mar 12, 2024
Merged

MS-259 Do not open serial entry when finishing NFC connection #615

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions ...src/main/java/com/simprints/fingerprint/connect/screens/issues/nfcpair/NfcPairFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import androidx.fragment.app.activityViewModels
import androidx.fragment.app.viewModels
import androidx.lifecycle.lifecycleScope
import androidx.navigation.fragment.findNavController
import androidx.navigation.navOptions
import com.simprints.core.livedata.LiveDataEventWithContentObserver
import com.simprints.fingerprint.connect.R
import com.simprints.fingerprint.connect.databinding.FragmentNfcPairBinding
Expand Down Expand Up @@ -192,17 +191,14 @@ internal class NfcPairFragment : Fragment(R.layout.fragment_nfc_pair) {
private fun retryConnectAndFinishFragment() {
determineWhetherPairingWasSuccessfulJob?.cancel()
connectViewModel.connect()
findNavController().navigate(
NfcPairFragmentDirections.actionNfcPairFragmentToSerialEntryPairFragment(),
navOptions { popUpTo(R.id.connectProgressFragment) }
)
}

private fun goToSerialEntryPair() {
findNavController().navigate(NfcPairFragmentDirections.actionNfcPairFragmentToSerialEntryPairFragment())
}

companion object {

private const val PAIRING_WAIT_TIMEOUT = 6000L
}
}