filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5296 from vector-im/feature/adm/crash-when-reading-qr

Browse Source 
Fixing crash adding room by QR code
This commit is contained in:
Benoit Marty 2022-02-22 14:04:37 +01:00 committed by GitHub
commit 77c48f2c48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/5295.bugfix Normal file
View File

@ -0,0 +1 @@
Fixing crash when adding room by QR code after accepting the camera permission for the first time

3
vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt
View File

@ -152,7 +152,8 @@ class CreateDirectRoomActivity : SimpleFragmentActivity() {
private val permissionCameraLauncher = registerForPermissionsResult { allGranted, deniedPermanently -> private val permissionCameraLauncher = registerForPermissionsResult { allGranted, deniedPermanently ->
if (allGranted) { if (allGranted) {
addFragment(views.container, QrCodeScannerFragment::class.java) val args = QrScannerArgs(showExtraButtons = false, R.string.add_by_qr_code)
addFragment(views.container, QrCodeScannerFragment::class.java, args)
} else if (deniedPermanently) { } else if (deniedPermanently) {
onPermissionDeniedSnackbar(R.string.permissions_denied_qr_code) onPermissionDeniedSnackbar(R.string.permissions_denied_qr_code)
} }

8
vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerFragment.kt
View File

@ -53,10 +53,10 @@ data class QrScannerArgs(
@StringRes val titleRes: Int @StringRes val titleRes: Int
) : Parcelable ) : Parcelable
open class QrCodeScannerFragment @Inject constructor() : VectorBaseFragment<FragmentQrCodeScannerBinding>(), ZXingScannerView.ResultHandler { class QrCodeScannerFragment @Inject constructor() : VectorBaseFragment<FragmentQrCodeScannerBinding>(), ZXingScannerView.ResultHandler {
private val qrViewModel: QrCodeScannerViewModel by activityViewModel() private val qrViewModel: QrCodeScannerViewModel by activityViewModel()
private val scannerArgs: QrScannerArgs? by args() private val scannerArgs: QrScannerArgs by args()
override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentQrCodeScannerBinding { override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentQrCodeScannerBinding {
return FragmentQrCodeScannerBinding.inflate(inflater, container, false) return FragmentQrCodeScannerBinding.inflate(inflater, container, false)
@ -93,13 +93,13 @@ open class QrCodeScannerFragment @Inject constructor() : VectorBaseFragment<Frag
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
val title = scannerArgs?.titleRes?.let { getString(it) } val title = scannerArgs.titleRes.let { getString(it) }
setupToolbar(views.qrScannerToolbar) setupToolbar(views.qrScannerToolbar)
.setTitle(title) .setTitle(title)
.allowBack(useCross = true) .allowBack(useCross = true)
scannerArgs?.showExtraButtons?.let { showButtons -> scannerArgs.showExtraButtons.let { showButtons ->
views.userCodeMyCodeButton.isVisible = showButtons views.userCodeMyCodeButton.isVisible = showButtons
views.userCodeOpenGalleryButton.isVisible = showButtons views.userCodeOpenGalleryButton.isVisible = showButtons