Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Tweak native QR code scanner to only react on AliasVault prefixes (#1405)

Leendert de Borst3da99ed4b18c
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/nativevaultmanager/NativeVaultManager.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/nativevaultmanager/NativeVaultManager.kt
index d8532d8bc..f93aa8724 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/nativevaultmanager/NativeVaultManager.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/nativevaultmanager/NativeVaultManager.kt
@@ -1443,7 +1443,7 @@ class NativeVaultManager(reactContext: ReactApplicationContext) :
* @param promise The promise to resolve with authentication result.
*/
@ReactMethod
- override fun scanQRCode(promise: Promise) {
+ override fun scanQRCode(prefixes: ReadableArray?, statusText: String?, promise: Promise) {
CoroutineScope(Dispatchers.Main).launch {
try {
val activity = currentActivity
@@ -1455,8 +1455,21 @@ class NativeVaultManager(reactContext: ReactApplicationContext) :
// Store promise for later resolution by MainActivity
pendingActivityResultPromise = promise
- // Launch QR scanner activity
+ // Launch QR scanner activity with optional prefixes and status text
val intent = Intent(activity, QRScannerActivity::class.java)
+ if (prefixes != null && prefixes.size() > 0) {
+ val prefixList = ArrayList<String>()
+ for (i in 0 until prefixes.size()) {
+ val prefix = prefixes.getString(i)
+ if (prefix != null) {
+ prefixList.add(prefix)
+ }
+ }
+ intent.putStringArrayListExtra(QRScannerActivity.EXTRA_PREFIXES, prefixList)
+ }
+ if (statusText != null && statusText.isNotEmpty()) {
+ intent.putExtra(QRScannerActivity.EXTRA_STATUS_TEXT, statusText)
+ }
activity.startActivityForResult(intent, QR_SCANNER_REQUEST_CODE)
} catch (e: Exception) {
Log.e(TAG, "Failed to launch QR scanner", e)
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/qrscanner/QRScannerActivity.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/qrscanner/QRScannerActivity.kt
index c4e711111..efa88b29d 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/qrscanner/QRScannerActivity.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/qrscanner/QRScannerActivity.kt
@@ -18,13 +18,28 @@ class QRScannerActivity : Activity() {
private lateinit var barcodeView: DecoratedBarcodeView
private lateinit var capture: CaptureManager
private var hasScanned = false
+ private var prefixes: List<String>? = null
+
+ companion object {
+ /** Intent extra key for prefixes. */
+ const val EXTRA_PREFIXES = "EXTRA_PREFIXES"
+
+ /** Intent extra key for status text. */
+ const val EXTRA_STATUS_TEXT = "EXTRA_STATUS_TEXT"
+ }
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
+ // Get prefixes from intent if provided
+ prefixes = intent.getStringArrayListExtra(EXTRA_PREFIXES)
+
+ // Get status text from intent, default to "Scan QR code" if not provided
+ val statusText = intent.getStringExtra(EXTRA_STATUS_TEXT)?.takeIf { it.isNotEmpty() } ?: "Scan QR code"
+
// Create and configure barcode view
barcodeView = DecoratedBarcodeView(this)
- barcodeView.setStatusText("Scan AliasVault QR Code")
+ barcodeView.setStatusText(statusText)
setContentView(barcodeView)
// Initialize capture manager
@@ -35,6 +50,23 @@ class QRScannerActivity : Activity() {
barcodeView.decodeContinuous(object : BarcodeCallback {
override fun barcodeResult(result: BarcodeResult?) {
if (result != null && !hasScanned) {
+ val scannedText = result.text
+
+ // Check if prefixes filter is enabled
+ if (prefixes != null && prefixes!!.isNotEmpty()) {
+ // Check if the scanned code starts with any of the accepted prefixes
+ val hasValidPrefix = prefixes!!.any { prefix ->
+ scannedText.startsWith(prefix)
+ }
+
+ if (!hasValidPrefix) {
+ // Invalid QR code - continue scanning without setting hasScanned
+ // Note: ZXing library continues scanning automatically
+ return
+ }
+ }
+
+ // Valid QR code
hasScanned = true
// Show success animation
@@ -45,7 +77,7 @@ class QRScannerActivity : Activity() {
// Set result and finish after animation
val resultIntent = Intent()
- resultIntent.putExtra("SCAN_RESULT", result.text)
+ resultIntent.putExtra("SCAN_RESULT", scannedText)
setResult(RESULT_OK, resultIntent)
// Delay finish to allow animation to complete
diff --git a/apps/mobile-app/app/(tabs)/settings/qr-scanner.tsx b/apps/mobile-app/app/(tabs)/settings/qr-scanner.tsx
index 273022ee1..278139892 100644
--- a/apps/mobile-app/app/(tabs)/settings/qr-scanner.tsx
+++ b/apps/mobile-app/app/(tabs)/settings/qr-scanner.tsx
@@ -60,7 +60,7 @@ export default function QRScannerScreen() : React.ReactNode {
/*
* Handle barcode scanned - parse and navigate to appropriate page.
- * Only processes AliasVault QR codes, silently ignores others.
+ * Native scanner already filters by prefix, so we only get AliasVault QR codes here.
* Validation is handled by the destination page.
*/
const handleQRCodeScanned = useCallback((data: string) : void => {
@@ -69,25 +69,19 @@ export default function QRScannerScreen() : React.ReactNode {
return;
}
- // Parse the QR code to determine its type
- const parsedData = parseQRCode(data);
-
- // Silently ignore non-AliasVault QR codes
- if (!parsedData.type) {
- // Go back if not an AliasVault QR code
- router.back();
- return;
- }
-
// Mark this URL as processed
processedUrls.current.add(data);
+ // Parse the QR code to determine its type
+ const parsedData = parseQRCode(data);
+
/*
* Navigate to the appropriate page based on QR code type
- * Validation will be handled by the destination page
+ * Use push instead of replace to navigate while scanner is still dismissing
+ * This creates a smoother transition without returning to settings first
*/
if (parsedData.type === 'MOBILE_UNLOCK') {
- router.replace(`/(tabs)/settings/mobile-unlock/${parsedData.payload}` as Href);
+ router.push(`/(tabs)/settings/mobile-unlock/${parsedData.payload}` as Href);
}
}, []);
@@ -102,7 +96,10 @@ export default function QRScannerScreen() : React.ReactNode {
hasLaunchedScanner.current = true;
try {
- const scannedData = await NativeVaultManager.scanQRCode();
+ // Pass prefixes to native scanner for filtering and translated status text
+ const prefixes = Object.values(QR_CODE_PREFIXES);
+ const statusText = t('settings.qrScanner.scanningMessage');
+ const scannedData = await NativeVaultManager.scanQRCode(prefixes, statusText);
if (scannedData) {
handleQRCodeScanned(scannedData);
diff --git a/apps/mobile-app/ios/NativeVaultManager/RCTNativeVaultManager.mm b/apps/mobile-app/ios/NativeVaultManager/RCTNativeVaultManager.mm
index 0eb04043f..7152e3128 100644
--- a/apps/mobile-app/ios/NativeVaultManager/RCTNativeVaultManager.mm
+++ b/apps/mobile-app/ios/NativeVaultManager/RCTNativeVaultManager.mm
@@ -293,8 +293,8 @@
// MARK: - QR Code Scanner
-- (void)scanQRCode:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
- [vaultManager scanQRCode:resolve rejecter:reject];
+- (void)scanQRCode:(NSArray<NSString *> *)prefixes statusText:(NSString *)statusText resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
+ [vaultManager scanQRCode:prefixes statusText:statusText resolver:resolve rejecter:reject];
}
@end
diff --git a/apps/mobile-app/ios/NativeVaultManager/VaultManager.swift b/apps/mobile-app/ios/NativeVaultManager/VaultManager.swift
index e3a6c789f..535b7a4c7 100644
--- a/apps/mobile-app/ios/NativeVaultManager/VaultManager.swift
+++ b/apps/mobile-app/ios/NativeVaultManager/VaultManager.swift
@@ -915,7 +915,9 @@ public class VaultManager: NSObject {
}
@objc
- func scanQRCode(_ resolve: @escaping RCTPromiseResolveBlock,
+ func scanQRCode(_ prefixes: [String]?,
+ statusText: String?,
+ resolver resolve: @escaping RCTPromiseResolveBlock,
rejecter reject: @escaping RCTPromiseRejectBlock) {
DispatchQueue.main.async {
// Get the root view controller from React Native
@@ -924,19 +926,19 @@ public class VaultManager: NSObject {
return
}
- // Create QR scanner view
+ // Create QR scanner view with optional prefix filtering and custom status text
let scannerView = QRScannerView(
+ prefixes: prefixes,
+ statusText: statusText,
onCodeScanned: { code in
- // Dismiss and return scanned code
- rootVC.dismiss(animated: true) {
- resolve(code)
- }
+ // Resolve immediately and dismiss without waiting (matches Android behavior)
+ resolve(code)
+ rootVC.dismiss(animated: true)
},
onCancel: {
- // Dismiss and return nil
- rootVC.dismiss(animated: true) {
- resolve(nil)
- }
+ // Cancel resolves nil and dismisses
+ resolve(nil)
+ rootVC.dismiss(animated: true)
}
)
diff --git a/apps/mobile-app/ios/VaultUI/QRScanner/QRScannerView.swift b/apps/mobile-app/ios/VaultUI/QRScanner/QRScannerView.swift
index e8c4fe1f8..7afa66548 100644
--- a/apps/mobile-app/ios/VaultUI/QRScanner/QRScannerView.swift
+++ b/apps/mobile-app/ios/VaultUI/QRScanner/QRScannerView.swift
@@ -1,15 +1,26 @@
import SwiftUI
import AVFoundation
+private let locBundle = Bundle.vaultUI
+
/// SwiftUI view for scanning QR codes using AVFoundation
public struct QRScannerView: View {
let onCodeScanned: (String) -> Void
let onCancel: () -> Void
+ let prefixes: [String]?
+ let statusText: String
@State private var hasScanned = false
@State private var showFlash = false
- public init(onCodeScanned: @escaping (String) -> Void, onCancel: @escaping () -> Void) {
+ public init(
+ prefixes: [String]? = nil,
+ statusText: String? = nil,
+ onCodeScanned: @escaping (String) -> Void,
+ onCancel: @escaping () -> Void
+ ) {
+ self.prefixes = prefixes
+ self.statusText = statusText?.isEmpty == false ? statusText! : "Scan QR code"
self.onCodeScanned = onCodeScanned
self.onCancel = onCancel
}
@@ -18,6 +29,7 @@ public struct QRScannerView: View {
ZStack {
// Camera preview
QRScannerRepresentable(
+ prefixes: prefixes,
onCodeScanned: { code in
if !hasScanned {
hasScanned = true
@@ -28,6 +40,10 @@ public struct QRScannerView: View {
onCodeScanned(code)
}
}
+ },
+ onCodeRejected: {
+ // Reset hasScanned to allow scanning again
+ hasScanned = false
}
)
.edgesIgnoringSafeArea(.all)
@@ -51,7 +67,7 @@ public struct QRScannerView: View {
Spacer()
// Status text
- Text("Scan AliasVault QR Code")
+ Text(statusText)
.foregroundColor(.white)
.padding()
.background(Color.black.opacity(0.7))
@@ -79,11 +95,15 @@ public struct QRScannerView: View {
/// UIViewControllerRepresentable wrapper for AVFoundation camera
struct QRScannerRepresentable: UIViewControllerRepresentable {
+ let prefixes: [String]?
let onCodeScanned: (String) -> Void
+ let onCodeRejected: () -> Void
func makeUIViewController(context: Context) -> QRScannerViewController {
let controller = QRScannerViewController()
+ controller.prefixes = prefixes
controller.onCodeScanned = onCodeScanned
+ controller.onCodeRejected = onCodeRejected
return controller
}
@@ -96,7 +116,10 @@ struct QRScannerRepresentable: UIViewControllerRepresentable {
class QRScannerViewController: UIViewController, AVCaptureMetadataOutputObjectsDelegate {
var captureSession: AVCaptureSession?
var previewLayer: AVCaptureVideoPreviewLayer?
+ var prefixes: [String]?
var onCodeScanned: ((String) -> Void)?
+ var onCodeRejected: (() -> Void)?
+ private var rejectedQRCodes = Set<String>() // Track rejected QR codes to avoid repeated haptic feedback
override func viewDidLoad() {
super.viewDidLoad()
@@ -182,10 +205,31 @@ class QRScannerViewController: UIViewController, AVCaptureMetadataOutputObjectsD
let readableObject = metadataObject as? AVMetadataMachineReadableCodeObject,
let stringValue = readableObject.stringValue {
- // Stop scanning
+ // Check if prefixes filter is enabled
+ if let prefixes = prefixes, !prefixes.isEmpty {
+ // Check if the scanned code starts with any of the accepted prefixes
+ let hasValidPrefix = prefixes.contains { prefix in
+ stringValue.hasPrefix(prefix)
+ }
+
+ if !hasValidPrefix {
+ // Invalid QR code - only give haptic feedback once per unique code
+ if !rejectedQRCodes.contains(stringValue) {
+ let generator = UINotificationFeedbackGenerator()
+ generator.notificationOccurred(.warning)
+ rejectedQRCodes.insert(stringValue)
+ }
+
+ // Notify that code was rejected (to reset UI state if needed)
+ onCodeRejected?()
+ return
+ }
+ }
+
+ // Valid QR code - stop scanning
captureSession?.stopRunning()
- // Haptic feedback
+ // Success haptic feedback
let generator = UINotificationFeedbackGenerator()
generator.notificationOccurred(.success)
diff --git a/apps/mobile-app/specs/NativeVaultManager.ts b/apps/mobile-app/specs/NativeVaultManager.ts
index f0dd023fb..86fa6d072 100644
--- a/apps/mobile-app/specs/NativeVaultManager.ts
+++ b/apps/mobile-app/specs/NativeVaultManager.ts
@@ -108,7 +108,10 @@ export interface Spec extends TurboModule {
// QR code scanner
// Scan a QR code and return the scanned data. Returns null if cancelled or failed.
- scanQRCode(): Promise<string | null>;
+ // If prefixes is provided, only QR codes starting with one of these prefixes will be accepted.
+ // Scanner will keep scanning until a matching code is found or user cancels.
+ // statusText is the message to display on the scanner screen (defaults to "Scan QR code" if null/empty).
+ scanQRCode(prefixes: string[] | null, statusText: string | null): Promise<string | null>;
}
export default TurboModuleRegistry.getEnforcing<Spec>('NativeVaultManager');