Skip to content

[MS-416] Move Bluetooth permissions check in onResume() to reflect ch… #681

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
BurningAXE merged 1 commit into from
Apr 17, 2024
Merged

[MS-416] Move Bluetooth permissions check in onResume() to reflect ch… #681

Show file tree
Hide file tree
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
4 changes: 1 addition & 3 deletions ...onnect/src/main/java/com/simprints/fingerprint/connect/screens/ConnectScannerViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,7 @@ internal class ConnectScannerViewModel @Inject constructor(

fun handleBackPress() {
when (backButtonBehaviour.value) {
BackButtonBehaviour.DISABLED, null -> { /* Do nothing */
}

BackButtonBehaviour.DISABLED, null -> { /* Do nothing */ }
BackButtonBehaviour.EXIT_WITH_ERROR -> _finish.send(false)
BackButtonBehaviour.EXIT_FORM -> {
_scannerConnected.send(false)
Expand Down
18 changes: 8 additions & 10 deletions .../com/simprints/fingerprint/connect/screens/controller/ConnectScannerControllerFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ internal class ConnectScannerControllerFragment : Fragment(R.layout.fragment_con
}

private val hostFragment: Fragment?
get() = childFragmentManager
.findFragmentById(R.id.connect_scanner_host_fragment)
get() = childFragmentManager.findFragmentById(R.id.connect_scanner_host_fragment)

private val internalNavController: NavController?
get() = hostFragment?.findNavController()
Expand Down Expand Up @@ -157,13 +156,6 @@ internal class ConnectScannerControllerFragment : Fragment(R.layout.fragment_con
}

internalNavController?.setGraph(R.navigation.graph_connect_internal)

if (shouldRequestPermissions) {
shouldRequestPermissions = false
checkBluetoothPermissions()
} else {
alertHelper.handleResume { shouldRequestPermissions = true }
}
}

private fun showKnownScannerDialog(scannerId: String) {
Expand All @@ -187,7 +179,13 @@ internal class ConnectScannerControllerFragment : Fragment(R.layout.fragment_con

override fun onResume() {
super.onResume()
alertHelper.handleResume { shouldRequestPermissions = true }

if (shouldRequestPermissions) {
shouldRequestPermissions = false
checkBluetoothPermissions()
} else {
alertHelper.handleResume { shouldRequestPermissions = true }
}
}

override fun onPause() {
Expand Down