diff --git a/app/src/main/java/org/thoughtcrime/securesms/DeviceAddFragment.java b/app/src/main/java/org/thoughtcrime/securesms/DeviceAddFragment.java index 4ddd386bd7..1a60f18883 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/DeviceAddFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/DeviceAddFragment.java @@ -18,6 +18,7 @@ import androidx.core.view.ViewCompat; import org.signal.qr.QrScannerView; import org.signal.qr.kitkat.ScanListener; +import org.thoughtcrime.securesms.mediasend.camerax.CameraXModelBlocklist; import org.thoughtcrime.securesms.util.FeatureFlags; import org.thoughtcrime.securesms.util.LifecycleDisposable; import org.thoughtcrime.securesms.util.ViewUtil; @@ -57,7 +58,7 @@ public class DeviceAddFragment extends LoggingFragment { }); } - scannerView.start(getViewLifecycleOwner()); + scannerView.start(getViewLifecycleOwner(), CameraXModelBlocklist.isBlocklisted()); lifecycleDisposable.bindTo(getViewLifecycleOwner()); diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/transfer/PaymentsTransferQrScanFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/transfer/PaymentsTransferQrScanFragment.java index 8d226e1e01..6a1e3f7e3b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/transfer/PaymentsTransferQrScanFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/transfer/PaymentsTransferQrScanFragment.java @@ -15,6 +15,7 @@ import org.signal.core.util.logging.Log; import org.signal.qr.QrScannerView; import org.thoughtcrime.securesms.LoggingFragment; import org.thoughtcrime.securesms.R; +import org.thoughtcrime.securesms.mediasend.camerax.CameraXModelBlocklist; import org.thoughtcrime.securesms.payments.MobileCoinPublicAddress; import org.thoughtcrime.securesms.util.LifecycleDisposable; import org.thoughtcrime.securesms.util.navigation.SafeNavigation; @@ -52,7 +53,7 @@ public final class PaymentsTransferQrScanFragment extends LoggingFragment { Toolbar toolbar = view.findViewById(R.id.payments_transfer_scan_qr); toolbar.setNavigationOnClickListener(v -> Navigation.findNavController(v).popBackStack()); - scannerView.start(getViewLifecycleOwner()); + scannerView.start(getViewLifecycleOwner(), CameraXModelBlocklist.isBlocklisted()); lifecycleDisposable.bindTo(getViewLifecycleOwner()); diff --git a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyScanFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyScanFragment.kt index d13a46c84c..023d71a1d8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyScanFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyScanFragment.kt @@ -12,6 +12,7 @@ import org.signal.qr.QrScannerView import org.signal.qr.kitkat.ScanListener import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.ShapeScrim +import org.thoughtcrime.securesms.mediasend.camerax.CameraXModelBlocklist import org.thoughtcrime.securesms.util.LifecycleDisposable import org.thoughtcrime.securesms.util.ViewUtil import org.thoughtcrime.securesms.util.fragments.findListener @@ -40,7 +41,7 @@ class VerifyScanFragment : Fragment() { ViewUtil.updateLayoutParams(cameraMarks, width, height) } - cameraView.start(viewLifecycleOwner) + cameraView.start(viewLifecycleOwner, CameraXModelBlocklist.isBlocklisted()) lifecycleDisposable.bindTo(viewLifecycleOwner)