Merge pull request #8288 from cketti/fix_exception_during_qr_code_scanning (2049cd9d) · Commits · e / os / Mail

feature/migration/qrcode/src/main/kotlin/app/k9mail/feature/migration/qrcode/domain/usecase/QrCodeAnalyzer.kt

+4 −1

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ import androidx.camera.core.ImageProxy
		import com.google.zxing.BinaryBitmap
		import com.google.zxing.DecodeHintType
		import com.google.zxing.LuminanceSource
		import com.google.zxing.NotFoundException
		import com.google.zxing.PlanarYUVLuminanceSource
		import com.google.zxing.common.HybridBinarizer
		import com.google.zxing.multi.qrcode.QRCodeMultiReader
		@@ -36,13 +37,15 @@ internal class QrCodeAnalyzer(
		image.close()
		}

		@Suppress("TooGenericExceptionCaught")
		@Suppress("TooGenericExceptionCaught", "SwallowedException")
		private fun decodeSource(source: LuminanceSource): List<String> {
		return try {
		val bitmap = createBinaryBitmap(source)
		val results = qrCodeReader.decodeMultiple(bitmap, DECODER_HINTS)

		results.map { it.text }
		} catch (e: NotFoundException) {
		emptyList()
		} catch (e: Exception) {
		Timber.e(e, "Error while trying to read QR code")
		emptyList()