Advance version number to 1.49.1

If this app was invoked via a deep link, but without a return URI,
we never want to return to the camera screen after scanning, but
to the caller.

CHANGELOG.md

@@ -1,5 +1,37 @@
 # Change Log
 
+## 1.49.1
+* Update Simplified Chinese translation
+* Return directly to caller for deep links
+* Fix metadata for deep links
+
+## 1.49.0
+* Add a setting to quickly enable/disable forwarding
+* Stop playing error beep when in silent mode
+* Improve enabling/disabling torch mode
+* Update to latest ZXing version
+* Update German translation
+* Update Russian translation
+
+## 1.48.1
+* Fix broken detection of binary content
+
+## 1.48.0
+* Add a menu item to temporarily scan a certain format only
+* Add a monochome launcher icon for Android 13
+* Show alpha numeric characters in binary data
+* Fix showing binary data label for scans from the history
+* Fix handling empty meta strings
+* Update Turkish translation
+* Update Ukrainian translation
+* Update French translation
+* Update Polish translation
+* Update Russian translation
+
+## 1.47.0
+* Add forwarding into external browser
+* Fix visibility of zoom slider when switching cameras
+
 ## 1.46.3
 * Fix cropping still images
 * Improve usability of zoom slider

PRIVACY.md

@@ -7,7 +7,7 @@ hesitate to contact me.
 
 ## Permissions
 
-### [ACCESS_FINE_LOCATION](https://developer.android.com/reference/android/Manifest.permission#ACCESS_FINE_LOCATION)
+### [ACCESS_FINE_LOCATION][ACCESS_FINE_LOCATION]
 
 Required to add a WiFi network from a barcode (usually a QR Code).
 
@@ -17,23 +17,23 @@ which requires `ACCESS_FINE_LOCATION`.
 
 On Android Q an better, this permission is not requested nor required.
 
-### [CAMERA](https://developer.android.com/reference/android/Manifest.permission#CAMERA)
+### [CAMERA][CAMERA]
 
 Required to read a barcode from the camera image.
 
-### [INTERNET](https://developer.android.com/reference/android/Manifest.permission#INTERNET)
+### [INTERNET][INTERNET]
 
 Required to send a scanned code to a custom URL you can specify in settings.
 
-### [VIBRATE](https://developer.android.com/reference/android/Manifest.permission#VIBRATE)
+### [VIBRATE][VIBRATE]
 
 Required to vibrate on detection.
 
-### [WRITE_EXTERNAL_STORAGE](https://developer.android.com/reference/android/Manifest.permission#WRITE_EXTERNAL_STORAGE)
+### [WRITE_EXTERNAL_STORAGE][WRITE_EXTERNAL_STORAGE]
 
 Required to save generated barcodes as files before Android Q.
 
-### [CHANGE_WIFI_STATE](https://developer.android.com/reference/android/Manifest.permission#CHANGE_WIFI_STATE)
+### [CHANGE_WIFI_STATE][CHANGE_WIFI_STATE]
 
 Required to add a WiFi network from a barcode (usually a QR Code).
 
@@ -41,7 +41,7 @@ On Android Q and better, this feature requires using
 [WifiManager.addNetworkSuggestions][addNetworkSuggestions]
 which requires `CHANGE_WIFI_STATE`.
 
-### [ACCESS_WIFI_STATE](https://developer.android.com/reference/android/Manifest.permission#ACCESS_FINE_LOCATION)
+### [ACCESS_WIFI_STATE][ACCESS_FINE_LOCATION]
 
 Required to add a WiFi network from a barcode (usually a QR Code).
 
@@ -49,5 +49,12 @@ Before Android Q, this feature requires using
 [WifiManager.getConfiguredNetworks][configuredNetworks]
 which requires `ACCESS_WIFI_STATE`.
 
+[ACCESS_FINE_LOCATION]: https://developer.android.com/reference/android/Manifest.permission#ACCESS_FINE_LOCATION
+[CAMERA]: https://developer.android.com/reference/android/Manifest.permission#CAMERA
+[INTERNET]: https://developer.android.com/reference/android/Manifest.permission#INTERNET
+[VIBRATE]: https://developer.android.com/reference/android/Manifest.permission#VIBRATE
+[WRITE_EXTERNAL_STORAGE]: https://developer.android.com/reference/android/Manifest.permission#WRITE_EXTERNAL_STORAGE
+[CHANGE_WIFI_STATE]: https://developer.android.com/reference/android/Manifest.permission#CHANGE_WIFI_STATE
+[ACCESS_WIFI_STATE]: https://developer.android.com/reference/android/Manifest.permission#ACCESS_FINE_LOCATION
 [configuredNetworks]: https://developer.android.com/reference/android/net/wifi/WifiManager#getConfiguredNetworks()
 [addNetworkSuggestions]: https://developer.android.com/reference/android/net/wifi/WifiManager#addNetworkSuggestions(java.util.List%3Candroid.net.wifi.WifiNetworkSuggestion%3E)

app/build.gradle

@@ -3,14 +3,16 @@ apply plugin: 'kotlin-android'
 
 android {
 	compileSdkVersion sdk_version
-	buildToolsVersion build_tools_version
 
 	defaultConfig {
 		minSdkVersion 9
 		targetSdkVersion sdk_version
 
-		versionCode 90
-		versionName '1.46.3'
+		versionCode 95
+		versionName '1.49.1'
+
+		// Required for desugaring.
+		multiDexEnabled true
 
 		// It's recommended to set this value to the lowest API level
 		// able to provide all the functionality.
@@ -22,7 +24,7 @@ android {
 	}
 
 	signingConfigs {
-		config {
+		release {
 			keyAlias System.getenv('ANDROID_KEY_ALIAS')
 			keyPassword System.getenv('ANDROID_KEY_PASSWORD')
 			storePassword System.getenv('ANDROID_STORE_PASSWORD')
@@ -46,7 +48,7 @@ android {
 			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 			minifyEnabled true
 			shrinkResources true
-			signingConfig signingConfigs.config
+			signingConfig signingConfigs.release
 		}
 	}
 
@@ -62,6 +64,13 @@ android {
 		}
 	}
 
+	compileOptions {
+		// To desugar fancy Java features in ZXing 3.4.+ that don't
+		// work on SDK < 24. See:
+		// https://github.com/zxing/zxing/issues/1170
+		coreLibraryDesugaringEnabled true
+	}
+
 	lintOptions {
 		// Because at the time of writing, even the latest version
 		// of RenderScript is raising this error no matter if
@@ -77,17 +86,16 @@ dependencies {
 	androidTestImplementation('com.android.support.test:rules:1.0.2') {
 		exclude module: 'support-annotations'
 	}
-	testImplementation 'junit:junit:4.12'
+	testImplementation 'junit:junit:4.13.2'
 
+	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 	implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-	implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.2"
+	implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2"
 	implementation "com.android.support:appcompat-v7:$support_version"
 	implementation "com.android.support:design:$support_version"
 	implementation "com.android.support:preference-v7:$support_version"
 	implementation "com.android.support:preference-v14:$support_version"
-	// Do NOT upgrade ZXing because newer versions won't work on API < 24
-	// https://github.com/zxing/zxing/issues/1170
-	implementation 'com.google.zxing:core:3.3.3'
+	implementation 'com.google.zxing:core:3.4.1'
 	implementation 'com.github.markusfisch:CameraView:1.9.1'
 	implementation 'com.github.markusfisch:ScalingImageView:1.3.0'
 }

app/lint.xml

@@ -9,4 +9,14 @@
 	<issue id="UnusedResources">
 		<ignore path="*/res/rs/debug/raw/bc*" />
 	</issue>
+	<!-- Android 12 requires apps that request ACCESS_FINE_LOCATION
+		to also request ACCESS_COARSE_LOCATION. But this app doesn't
+		request nor requires ACCESS_FINE_LOCATION above SDK 28. So
+		this is a false positive. -->
+	<issue id="CoarseFineLocation" severity="ignore"/>
+	<!-- Androidx SplashScreen compat library would require minSdk 21,
+		make the app unnecessarily larger and Android 12 automatically
+		replaces our custom splash screen anyway, which is exactly what
+		we want. So there is no reason to complain. -->
+	<issue id="CustomSplashScreen" severity="ignore"/>
 </lint>

app/src/androidTest/kotlin/de/markusfisch/android/binaryeye/PreprocessorTest.kt

@@ -16,14 +16,17 @@ import java.util.regex.Pattern
 class PreprocessorTest {
 	@Test
 	fun processSamples() {
-		val zxing = Zxing()
 		val assets = InstrumentationRegistry.getInstrumentation()
 			.context.assets
+		val samples = assets.list("samples")
+		checkNotNull(samples) { "no samples found" }
 		val pattern = Pattern.compile(
 			"[0-9]+-([0-9]+)deg.jpg"
 		)
-		val samples = assets.list("samples")
-		checkNotNull(samples) { "no samples found" }
+		val rs = RenderScript.create(
+			InstrumentationRegistry.getTargetContext(),
+		)
+		val zxing = Zxing()
 		for (sample in samples) {
 			val m = pattern.matcher(sample)
 			if (!m.find() || m.groupCount() < 1) {
@@ -36,9 +39,6 @@ class PreprocessorTest {
 			val frameWidth = bitmap.width
 			val frameHeight = bitmap.height
 			val frameOrientation = m.group(1) ?: return
-			val rs = RenderScript.create(
-				InstrumentationRegistry.getTargetContext(),
-			)
 			val preprocessor = Preprocessor(
 				rs,
 				frameWidth,
@@ -59,10 +59,9 @@ class PreprocessorTest {
 			}
 			val result = zxing.decode(frameData, outWidth, outHeight)
 			preprocessor.destroy()
-			rs.destroy()
-
 			checkNotNull(result) { "no barcode found in $sample" }
 		}
+		rs.destroy()
 	}
 }
 
@@ -81,21 +80,21 @@ private fun encodeYUV420SP(argb: IntArray, width: Int, height: Int): ByteArray {
 	var r: Int
 	var g: Int
 	var b: Int
-	var Y: Int
+	var y: Int
 	var u: Int
 	var v: Int
 	var index = 0
-	for (y in 0 until height) {
-		for (x in 0 until width) {
+	for (t in 0 until height) {
+		for (s in 0 until width) {
 			val pixel = argb[index]
 			r = pixel and 0xff0000 shr 16
 			g = pixel and 0xff00 shr 8
 			b = pixel and 0xff
-			Y = (66 * r + 129 * g + 25 * b + 128 shr 8) + 16
+			y = (66 * r + 129 * g + 25 * b + 128 shr 8) + 16
 			u = (-38 * r - 74 * g + 112 * b + 128 shr 8) + 128
 			v = (112 * r - 94 * g - 18 * b + 128 shr 8) + 128
-			yuv[yIndex++] = (if (Y < 0) 0 else if (Y > 255) 255 else Y).toByte()
-			if (y % 2 == 0 && index % 2 == 0) {
+			yuv[yIndex++] = (if (y < 0) 0 else if (y > 255) 255 else y).toByte()
+			if (t % 2 == 0 && index % 2 == 0) {
 				yuv[uvIndex++] = (if (v < 0) 0 else if (v > 255) 255 else v).toByte()
 				yuv[uvIndex++] = (if (u < 0) 0 else if (u > 255) 255 else u).toByte()
 			}

app/src/main/AndroidManifest.xml

@@ -34,6 +34,7 @@
 		android:usesCleartextTraffic="true"
 		android:allowBackup="true"
 		android:fullBackupContent="@xml/backup_rules"
+		android:dataExtractionRules="@xml/extraction_rules"
 		android:supportsRtl="true"
 		android:resizeableActivity="true"
 		android:label="@string/app_name"
@@ -41,8 +42,8 @@
 		android:theme="@style/AppTheme">
 		<activity
 			android:name=".activity.SplashActivity"
-			android:label="@string/app_name"
-			android:theme="@style/SplashTheme">
+			android:theme="@style/SplashTheme"
+			android:exported="true">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
 				<category android:name="android.intent.category.LAUNCHER"/>
@@ -53,7 +54,8 @@
 		</activity>
 		<activity
 			android:name=".activity.CameraActivity"
-			android:label="@string/scan_code">
+			android:label="@string/scan_code"
+			android:exported="true">
 			<intent-filter android:label="@string/compose_barcode">
 				<action android:name="android.intent.action.SEND"/>
 				<category android:name="android.intent.category.DEFAULT"/>
@@ -67,10 +69,10 @@
 				<action android:name="android.intent.action.VIEW"/>
 				<category android:name="android.intent.category.DEFAULT"/>
 				<category android:name="android.intent.category.BROWSABLE"/>
-				<data android:scheme="http"
-					android:host="markusfisch.de"
-					android:pathPrefix="/BinaryEye"/>
-				<data android:scheme="https" />
+				<data android:host="markusfisch.de"/>
+				<data android:pathPrefix="/BinaryEye"/>
+				<data android:scheme="http"/>
+				<data android:scheme="https"/>
 			</intent-filter>
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW"/>
@@ -82,6 +84,7 @@
 		<activity
 			android:name=".activity.PickActivity"
 			android:label="@string/pick_code_to_scan"
+			android:exported="true"
 			tools:ignore="AppLinkUrlError">
 			<intent-filter android:label="@string/decode_barcode">
 				<action android:name="android.intent.action.SEND"/>
@@ -96,12 +99,12 @@
 		</activity>
 		<activity
 			android:name=".activity.MainActivity"
-			android:label="@string/app_name"
 			android:exported="true"/>
 		<service
 			android:name=".service.ScanTileService"
 			android:icon="@drawable/ic_action_scan"
 			android:label="@string/scan_code"
+			android:exported="true"
 			android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
 			<intent-filter>
 				<action android:name="android.service.quicksettings.action.QS_TILE"/>

app/src/main/kotlin/de/markusfisch/android/binaryeye/actions/IAction.kt

@@ -2,8 +2,8 @@ package de.markusfisch.android.binaryeye.actions
 
 import android.content.Context
 import android.content.Intent
-import de.markusfisch.android.binaryeye.app.parseAndNormalizeUri
 import de.markusfisch.android.binaryeye.content.execShareIntent
+import de.markusfisch.android.binaryeye.content.openUrl
 import de.markusfisch.android.binaryeye.widget.toast
 
 interface IAction {
@@ -18,31 +18,36 @@ abstract class IntentAction : IAction {
 	abstract val errorMsg: Int
 
 	final override suspend fun execute(context: Context, data: ByteArray) {
-		val intent = createIntent(context, data) ?: return context.toast(
-			errorMsg
-		)
-		context.execShareIntent(intent)
+		val intent = createIntent(context, data)
+		if (intent == null) {
+			context.toast(errorMsg)
+		} else {
+			context.execShareIntent(intent)
+		}
 	}
 
-	abstract suspend fun createIntent(context: Context, data: ByteArray): Intent?
+	abstract suspend fun createIntent(
+		context: Context,
+		data: ByteArray
+	): Intent?
 }
 
 abstract class SchemeAction : IAction {
 	abstract val scheme: String
-	open val intentAction: String = Intent.ACTION_VIEW
 	open val buildRegex: Boolean = false
 
 	final override fun canExecuteOn(data: ByteArray): Boolean {
 		val content = String(data)
 		return if (buildRegex) {
-			content.matches("""^$scheme://[\w\W]+$""".toRegex(RegexOption.IGNORE_CASE))
+			content.matches("""^$scheme://[\w\W]+$""".toRegex(
+				RegexOption.IGNORE_CASE)
+			)
 		} else {
 			content.startsWith("$scheme://", ignoreCase = true)
 		}
 	}
 
 	final override suspend fun execute(context: Context, data: ByteArray) {
-		val uri = parseAndNormalizeUri(String(data))
-		context.execShareIntent(Intent(intentAction, uri))
+		context.openUrl(String(data))
 	}
 }

app/src/main/kotlin/de/markusfisch/android/binaryeye/actions/search/OpenOrSearchAction.kt

@@ -1,14 +1,12 @@
 package de.markusfisch.android.binaryeye.actions.search
 
 import android.content.Context
-import android.content.Intent
 import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.actions.IAction
 import de.markusfisch.android.binaryeye.app.alertDialog
-import de.markusfisch.android.binaryeye.app.parseAndNormalizeUri
+import de.markusfisch.android.binaryeye.app.urlEncode
 import de.markusfisch.android.binaryeye.app.prefs
-import de.markusfisch.android.binaryeye.content.startIntent
-import java.net.URLEncoder
+import de.markusfisch.android.binaryeye.content.openUrl
 
 object OpenOrSearchAction : IAction {
 	override val iconResId: Int = R.drawable.ic_action_search
@@ -20,10 +18,13 @@ object OpenOrSearchAction : IAction {
 		view(context, String(data), true)
 	}
 
-	private suspend fun view(context: Context, s: String, search: Boolean) {
-		val intent = Intent(Intent.ACTION_VIEW, parseAndNormalizeUri(s))
-		if (!context.startIntent(intent) && search) {
-			openSearch(context, s)
+	private suspend fun view(
+		context: Context,
+		url: String,
+		search: Boolean
+	) {
+		if (!context.openUrl(url) && search) {
+			openSearch(context, url)
 		}
 	}
 
@@ -32,7 +33,7 @@ object OpenOrSearchAction : IAction {
 		if (defaultSearchUrl.isNotEmpty()) {
 			view(
 				context,
-				defaultSearchUrl + URLEncoder.encode(query, "utf-8"),
+				defaultSearchUrl + query.urlEncode(),
 				false
 			)
 			return
@@ -54,7 +55,7 @@ object OpenOrSearchAction : IAction {
 		val queryUri = alertDialog<String>(context) { resume ->
 			setTitle(R.string.pick_search_engine)
 			setItems(names.toTypedArray()) { _, which ->
-				resume(urls[which] + URLEncoder.encode(query, "utf-8"))
+				resume(urls[which] + query.urlEncode())
 			}
 		} ?: return
 		view(context, queryUri, false)

app/src/main/kotlin/de/markusfisch/android/binaryeye/actions/sms/SmsAction.kt

@@ -7,8 +7,9 @@ import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.actions.IntentAction
 
 object SmsAction : IntentAction() {
-	private val smsRegex =
-		"""^sms(?:to)?:(\+?[0-9]+)(?::([\S\s]*))?$""".toRegex(RegexOption.IGNORE_CASE)
+	private val smsRegex = """^sms(?:to)?:(\+?[0-9]+)(?::([\S\s]*))?$""".toRegex(
+		RegexOption.IGNORE_CASE
+	)
 
 	override val iconResId: Int = R.drawable.ic_action_sms
 	override val titleResId: Int = R.string.sms_send
@@ -28,7 +29,9 @@ object SmsAction : IntentAction() {
 			Intent.ACTION_SENDTO,
 			Uri.parse("smsto:$number")
 		).apply {
-			if (message.isNotEmpty()) putExtra("sms_body", message)
+			if (message.isNotEmpty()) {
+				putExtra("sms_body", message)
+			}
 		}
 	}
 }

app/src/main/kotlin/de/markusfisch/android/binaryeye/actions/tel/TelAction.kt

@@ -7,7 +7,9 @@ import de.markusfisch.android.binaryeye.actions.IntentAction
 import de.markusfisch.android.binaryeye.app.parseAndNormalizeUri
 
 object TelAction : IntentAction() {
-	private val telRegex = """^tel:(\+?[0-9]+)$""".toRegex(RegexOption.IGNORE_CASE)
+	private val telRegex = """^tel:(\+?[0-9]+)$""".toRegex(
+		RegexOption.IGNORE_CASE
+	)
 
 	override val iconResId: Int = R.drawable.ic_action_tel
 	override val titleResId: Int = R.string.tel_dial
@@ -17,7 +19,11 @@ object TelAction : IntentAction() {
 		return String(data).matches(telRegex)
 	}
 
-	override suspend fun createIntent(context: Context, data: ByteArray): Intent {
-		return Intent(Intent.ACTION_DIAL, parseAndNormalizeUri(String(data)))
-	}
+	override suspend fun createIntent(
+		context: Context,
+		data: ByteArray
+	): Intent = Intent(
+		Intent.ACTION_DIAL,
+		String(data).parseAndNormalizeUri()
+	)
 }

app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/CameraActivity.kt

@@ -1,6 +1,7 @@
 package de.markusfisch.android.binaryeye.activity
 
 import android.app.Activity
+import android.app.AlertDialog
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -26,14 +27,17 @@ import android.widget.SeekBar
 import com.google.zxing.Result
 import com.google.zxing.ResultMetadataType
 import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.adapter.prettifyFormatName
 import de.markusfisch.android.binaryeye.app.*
 import de.markusfisch.android.binaryeye.content.copyToClipboard
 import de.markusfisch.android.binaryeye.content.execShareIntent
-import de.markusfisch.android.binaryeye.database.Scan
+import de.markusfisch.android.binaryeye.content.openUrl
+import de.markusfisch.android.binaryeye.database.toScan
 import de.markusfisch.android.binaryeye.graphics.getFrameToViewMatrix
 import de.markusfisch.android.binaryeye.graphics.map
 import de.markusfisch.android.binaryeye.net.sendAsync
 import de.markusfisch.android.binaryeye.os.error
+import de.markusfisch.android.binaryeye.os.getVibrator
 import de.markusfisch.android.binaryeye.os.vibrate
 import de.markusfisch.android.binaryeye.rs.Preprocessor
 import de.markusfisch.android.binaryeye.view.initSystemBars
@@ -42,7 +46,6 @@ import de.markusfisch.android.binaryeye.widget.DetectorView
 import de.markusfisch.android.binaryeye.widget.toast
 import de.markusfisch.android.binaryeye.zxing.Zxing
 import de.markusfisch.android.cameraview.widget.CameraView
-import java.net.URLEncoder
 import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.roundToInt
@@ -74,12 +77,13 @@ class CameraActivity : AppCompatActivity() {
 	private var recreatePreprocessor = false
 	private var rotate = false
 	private var invert = false
-	private var flash = false
 	private var decoding = true
 	private var returnResult = false
 	private var returnUrlTemplate: String? = null
+	private var finishAfterShowingResult = false
 	private var frontFacing = false
 	private var bulkMode = prefs.bulkMode
+	private var restrictFormat: String? = null
 	private var ignoreNext: String? = null
 	private var fallbackBuffer: IntArray? = null
 
@@ -129,7 +133,7 @@ class CameraActivity : AppCompatActivity() {
 		setTitle(R.string.scan_code)
 
 		rs = RenderScript.create(this)
-		vibrator = getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
+		vibrator = getVibrator()
 
 		initSystemBars(this)
 		setSupportActionBar(findViewById(R.id.toolbar) as Toolbar)
@@ -162,10 +166,7 @@ class CameraActivity : AppCompatActivity() {
 	override fun onResume() {
 		super.onResume()
 		System.gc()
-		zxing.updateHints(
-			prefs.tryHarder,
-			prefs.barcodeFormats
-		)
+		updateHints()
 		if (prefs.bulkMode && bulkMode != prefs.bulkMode) {
 			bulkMode = prefs.bulkMode
 			invalidateOptionsMenu()
@@ -177,13 +178,29 @@ class CameraActivity : AppCompatActivity() {
 		}
 	}
 
+	private fun updateHints() {
+		val restriction = restrictFormat
+		val formats = if (restriction != null) {
+			title = getString(
+				R.string.scan_format,
+				prettifyFormatName(restriction)
+			)
+			setOf(restriction)
+		} else {
+			setTitle(R.string.scan_code)
+			prefs.barcodeFormats
+		}
+		zxing.updateHints(prefs.tryHarder, formats)
+	}
+
 	private fun setReturnTarget(intent: Intent?) {
 		when {
 			intent?.action == "com.google.zxing.client.android.SCAN" -> {
 				returnResult = true
 			}
-			isReturnUrl(intent) -> intent?.data?.let {
-				returnUrlTemplate = it.getQueryParameter("ret")
+			intent?.dataString?.isReturnUrl() == true -> {
+				finishAfterShowingResult = true
+				returnUrlTemplate = intent.data?.getQueryParameter("ret")
 			}
 		}
 	}
@@ -213,8 +230,6 @@ class CameraActivity : AppCompatActivity() {
 
 	private fun closeCamera() {
 		cameraView.close()
-		// Closing the camera will also shut off the flash.
-		flash = false
 	}
 
 	override fun onRestoreInstanceState(savedState: Bundle) {
@@ -223,6 +238,7 @@ class CameraActivity : AppCompatActivity() {
 		zoomBar.progress = savedState.getInt(ZOOM_LEVEL)
 		frontFacing = savedState.getBoolean(FRONT_FACING)
 		bulkMode = savedState.getBoolean(BULK_MODE)
+		restrictFormat = savedState.getString(RESTRICT_FORMAT)
 	}
 
 	override fun onSaveInstanceState(outState: Bundle) {
@@ -230,6 +246,7 @@ class CameraActivity : AppCompatActivity() {
 		outState.putInt(ZOOM_LEVEL, zoomBar.progress)
 		outState.putBoolean(FRONT_FACING, frontFacing)
 		outState.putBoolean(BULK_MODE, bulkMode)
+		outState.putString(RESTRICT_FORMAT, restrictFormat)
 		super.onSaveInstanceState(outState)
 	}
 
@@ -259,11 +276,11 @@ class CameraActivity : AppCompatActivity() {
 				true
 			}
 			R.id.pick_file -> {
-				val chooseFile = Intent(Intent.ACTION_GET_CONTENT)
-				chooseFile.type = "image/*"
 				startActivityForResult(
 					Intent.createChooser(
-						chooseFile,
+						Intent(Intent.ACTION_GET_CONTENT).apply {
+							type = "image/*"
+						},
 						getString(R.string.pick_file)
 					),
 					PICK_FILE_RESULT_CODE
@@ -280,6 +297,10 @@ class CameraActivity : AppCompatActivity() {
 				ignoreNext = null
 				true
 			}
+			R.id.restrict_format -> {
+				showRestrictionDialog()
+				true
+			}
 			R.id.preferences -> {
 				startActivity(MainActivity.getPreferencesIntent(this))
 				true
@@ -302,6 +323,27 @@ class CameraActivity : AppCompatActivity() {
 		openCamera()
 	}
 
+	private fun showRestrictionDialog() {
+		val names = resources.getStringArray(
+			R.array.barcode_formats_names
+		).toMutableList()
+		val formats = resources.getStringArray(
+			R.array.barcode_formats_values
+		).toMutableList()
+		if (restrictFormat != null) {
+			names.add(0, getString(R.string.remove_restriction))
+			formats.add(0, null)
+		}
+		AlertDialog.Builder(this).apply {
+			setTitle(R.string.restrict_format)
+			setItems(names.toTypedArray()) { _, which ->
+				restrictFormat = formats[which]
+				updateHints()
+			}
+			show()
+		}
+	}
+
 	private fun openReadme() {
 		val intent = Intent(
 			Intent.ACTION_VIEW,
@@ -368,7 +410,7 @@ class CameraActivity : AppCompatActivity() {
 			override fun onConfigureParameters(
 				parameters: Camera.Parameters
 			) {
-				if (parameters.isZoomSupported) {
+				zoomBar.visibility = if (parameters.isZoomSupported) {
 					val max = parameters.maxZoom
 					if (zoomBar.max != max) {
 						zoomBar.max = max
@@ -376,8 +418,9 @@ class CameraActivity : AppCompatActivity() {
 						saveZoom()
 					}
 					parameters.zoom = zoomBar.progress
+					View.VISIBLE
 				} else {
-					zoomBar.visibility = View.GONE
+					View.GONE
 				}
 				val sceneModes = parameters.supportedSceneModes
 				sceneModes?.let {
@@ -441,7 +484,7 @@ class CameraActivity : AppCompatActivity() {
 				progress: Int,
 				fromUser: Boolean
 			) {
-				setZoom(progress)
+				cameraView.camera?.setZoom(progress)
 			}
 
 			override fun onStartTrackingTouch(seekBar: SeekBar) {}
@@ -452,16 +495,13 @@ class CameraActivity : AppCompatActivity() {
 	}
 
 	@Suppress("DEPRECATION")
-	private fun setZoom(zoom: Int) {
-		val camera: Camera? = cameraView.camera
-		camera?.let {
-			try {
-				val params = camera.parameters
-				params.zoom = zoom
-				camera.parameters = params
-			} catch (e: RuntimeException) {
-				// Ignore. There's nothing we can do.
-			}
+	private fun Camera.setZoom(zoom: Int) {
+		try {
+			val params = parameters
+			params.zoom = zoom
+			parameters = params
+		} catch (e: RuntimeException) {
+			// Ignore. There's nothing we can do.
 		}
 	}
 
@@ -504,20 +544,19 @@ class CameraActivity : AppCompatActivity() {
 
 	@Suppress("DEPRECATION")
 	private fun toggleTorchMode() {
-		val camera = cameraView.camera
-		val parameters = camera?.parameters
-		parameters?.flashMode = if (flash) {
+		val camera = cameraView.camera ?: return
+		val parameters = camera.parameters ?: return
+		parameters.flashMode = if (
+			parameters.flashMode != Camera.Parameters.FLASH_MODE_OFF
+		) {
 			Camera.Parameters.FLASH_MODE_OFF
 		} else {
 			Camera.Parameters.FLASH_MODE_TORCH
 		}
-		parameters?.let {
-			try {
-				camera.parameters = parameters
-				flash = flash xor true
-			} catch (e: RuntimeException) {
-				// Ignore. There's nothing we can do.
-			}
+		try {
+			camera.parameters = parameters
+		} catch (e: RuntimeException) {
+			toast(e.message ?: getString(R.string.error_flash))
 		}
 	}
 
@@ -695,12 +734,20 @@ class CameraActivity : AppCompatActivity() {
 				returnUri != null -> execShareIntent(
 					Intent(Intent.ACTION_VIEW, returnUri)
 				)
-				else -> showResult(
-					this@CameraActivity,
-					result,
-					vibrator,
-					bulkMode
-				)
+				else -> {
+					showResult(
+						this@CameraActivity,
+						result,
+						vibrator,
+						bulkMode
+					)
+					// If this app was invoked via a deep link but without
+					// a return URI, we probably don't want to return to
+					// the camera screen after scanning, but to the caller.
+					if (finishAfterShowingResult) {
+						finish()
+					}
+				}
 			}
 			if (bulkMode) {
 				ignoreNext = result.text
@@ -726,6 +773,7 @@ class CameraActivity : AppCompatActivity() {
 		private const val ZOOM_LEVEL = "zoom_level"
 		private const val FRONT_FACING = "front_facing"
 		private const val BULK_MODE = "bulk_mode"
+		private const val RESTRICT_FORMAT = "restrict_format"
 	}
 }
 
@@ -738,15 +786,26 @@ fun showResult(
 	if (prefs.copyImmediately) {
 		activity.copyToClipboard(result.text)
 	}
-	val scan = Scan(result)
-	if (prefs.sendScanUrl.isNotEmpty()) {
+	val scan = result.toScan()
+	if (prefs.useHistory) {
+		scan.id = db.insertScan(scan)
+	}
+	if (prefs.sendScanActive && prefs.sendScanUrl.isNotEmpty()) {
+		if (prefs.sendScanType == "4") {
+			activity.openUrl(
+				prefs.sendScanUrl + scan.content.urlEncode()
+			)
+			return
+		}
 		scan.sendAsync(
 			prefs.sendScanUrl,
 			prefs.sendScanType
 		) { code, body ->
 			if (code == null || code < 200 || code > 299) {
 				vibrator.error()
-				beepBeepBeep()
+				if (!activity.isSilent()) {
+					beepBeepBeep()
+				}
 			}
 			if (body != null && body.isNotEmpty()) {
 				activity.toast(body)
@@ -755,9 +814,6 @@ fun showResult(
 			}
 		}
 	}
-	if (prefs.useHistory) {
-		scan.id = db.insertScan(scan)
-	}
 	if (!bulkMode) {
 		activity.startActivity(
 			MainActivity.getDecodeIntent(activity, scan)
@@ -776,7 +832,7 @@ fun getReturnIntent(result: Result): Intent {
 		intent.putExtra("SCAN_RESULT_BYTES", result.rawBytes)
 	}
 	result.resultMetadata?.let { metadata ->
-		metadata[ResultMetadataType.UPC_EAN_EXTENSION]?.let {
+		metadata[ResultMetadataType.ORIENTATION]?.let {
 			intent.putExtra(
 				"SCAN_RESULT_ORIENTATION",
 				it.toString()
@@ -806,36 +862,35 @@ fun getReturnIntent(result: Result): Intent {
 	return intent
 }
 
-private fun isReturnUrl(intent: Intent?): Boolean {
-	val dataString = intent?.dataString
-	return listOf(
-		"binaryeye://scan",
-		"http://markusfisch.de/BinaryEye",
-		"https://markusfisch.de/BinaryEye"
-	).firstOrNull {
-		val result = dataString?.startsWith(it) == true
-		result
-	} != null
-}
+private fun String.isReturnUrl() = listOf(
+	"binaryeye://scan",
+	"http://markusfisch.de/BinaryEye",
+	"https://markusfisch.de/BinaryEye"
+).firstOrNull { startsWith(it) } != null
 
 private fun completeUrl(urlTemplate: String, result: Result) = Uri.parse(
 	urlTemplate
-		.replace("{RESULT}", URLEncoder.encode(result.text, "UTF-8"))
+		.replace("{RESULT}", result.text.urlEncode())
 		.replace("{RESULT_BYTES}", result.rawBytes?.toHexString() ?: "")
 		.replace(
-			"{FORMAT}", URLEncoder.encode(
-				result.barcodeFormat.toString(), "UTF-8"
-			)
+			"{FORMAT}", result.barcodeFormat.toString().urlEncode()
 		)
 		.replace(
-			"{META}", URLEncoder.encode(
-				result.resultMetadata?.toString() ?: "", "UTF-8"
-			)
+			"{META}", result.resultMetadata?.toString()?.urlEncode() ?: ""
 		)
 		// And support {CODE} from the old ZXing app, too.
-		.replace("{CODE}", URLEncoder.encode(result.text, "UTF-8"))
+		.replace("{CODE}", result.text.urlEncode())
 )
 
+private fun Context.isSilent(): Boolean {
+	val am = getSystemService(Context.AUDIO_SERVICE) as AudioManager
+	return when (am.ringerMode) {
+		AudioManager.RINGER_MODE_SILENT,
+		AudioManager.RINGER_MODE_VIBRATE -> true
+		else -> false
+	}
+}
+
 private fun beepBeepBeep() {
 	ToneGenerator(AudioManager.STREAM_ALARM, 100).startTone(
 		ToneGenerator.TONE_CDMA_CONFIRM,

app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/PickActivity.kt

@@ -16,13 +16,18 @@ import android.view.Menu
 import android.view.MenuItem
 import com.google.zxing.Result
 import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.app.*
+import de.markusfisch.android.binaryeye.app.applyLocale
+import de.markusfisch.android.binaryeye.app.prefs
 import de.markusfisch.android.binaryeye.graphics.crop
 import de.markusfisch.android.binaryeye.graphics.loadImageUri
 import de.markusfisch.android.binaryeye.graphics.mapResultToView
+import de.markusfisch.android.binaryeye.os.getVibrator
 import de.markusfisch.android.binaryeye.os.vibrate
 import de.markusfisch.android.binaryeye.rs.fixTransparency
-import de.markusfisch.android.binaryeye.view.*
+import de.markusfisch.android.binaryeye.view.colorSystemAndToolBars
+import de.markusfisch.android.binaryeye.view.initSystemBars
+import de.markusfisch.android.binaryeye.view.recordToolbarHeight
+import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
 import de.markusfisch.android.binaryeye.widget.CropImageView
 import de.markusfisch.android.binaryeye.widget.DetectorView
 import de.markusfisch.android.binaryeye.widget.toast
@@ -59,7 +64,7 @@ class PickActivity : AppCompatActivity() {
 			prefs.barcodeFormats
 		)
 		rs = RenderScript.create(this)
-		vibrator = getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
+		vibrator = getVibrator()
 
 		initSystemBars(this)
 		val toolbar = findViewById(R.id.toolbar) as Toolbar

app/src/main/kotlin/de/markusfisch/android/binaryeye/adapter/ScansAdapter.kt

@@ -58,23 +58,26 @@ class ScansAdapter(context: Context, cursor: Cursor) :
 		context: Context,
 		cursor: Cursor
 	) {
-		val holder = getViewHolder(view)
-		holder.timeView.text = formatDateTime(cursor.getString(timeIndex))
-		val name = cursor.getString(nameIndex)
-		val content = cursor.getString(contentIndex)
-		var icon = 0
-		holder.contentView.text = when {
-			name?.isNotEmpty() == true -> {
-				icon = R.drawable.ic_label
-				name
+		getViewHolder(view).apply {
+			timeView.text = formatDateTime(cursor.getString(timeIndex))
+			val name = cursor.getString(nameIndex)
+			val content = cursor.getString(contentIndex)
+			var icon = 0
+			contentView.text = when {
+				name?.isNotEmpty() == true -> {
+					icon = R.drawable.ic_label
+					name
+				}
+				content?.isEmpty() == true -> context.getString(
+					R.string.binary_data
+				)
+				else -> content
 			}
-			content?.isEmpty() == true -> context.getString(R.string.binary_data)
-			else -> content
+			contentView.setCompoundDrawablesWithIntrinsicBounds(
+				icon, 0, 0, 0
+			)
+			formatView.text = prettifyFormatName(cursor.getString(formatIndex))
 		}
-		holder.contentView.setCompoundDrawablesWithIntrinsicBounds(
-			icon, 0, 0, 0
-		)
-		holder.formatView.text = prettifyFormatName(cursor.getString(formatIndex))
 		// view.isSelected needs to be put on the queue to work.
 		val selected = cursor.getLong(idIndex) == selectedScanId
 		view.post {
@@ -82,14 +85,14 @@ class ScansAdapter(context: Context, cursor: Cursor) :
 		}
 	}
 
-	private fun getViewHolder(view: View): ViewHolder {
-		return view.tag as ViewHolder? ?: ViewHolder(
-			view.findViewById(R.id.time),
-			view.findViewById(R.id.content),
-			view.findViewById(R.id.format)
-		).also {
-			view.tag = it
-		}
+	private fun getViewHolder(
+		view: View
+	): ViewHolder = view.tag as ViewHolder? ?: ViewHolder(
+		view.findViewById(R.id.time),
+		view.findViewById(R.id.content),
+		view.findViewById(R.id.format)
+	).also {
+		view.tag = it
 	}
 
 	private data class ViewHolder(

app/src/main/kotlin/de/markusfisch/android/binaryeye/app/AlertDialog.kt

@@ -1,7 +1,7 @@
 package de.markusfisch.android.binaryeye.app
 
 import android.content.Context
-import android.support.v7.app.AlertDialog
+import android.app.AlertDialog
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlin.coroutines.resume

app/src/main/kotlin/de/markusfisch/android/binaryeye/app/BinaryEyeApp.kt

@@ -1,6 +1,6 @@
 package de.markusfisch.android.binaryeye.app
 
-import android.app.Application
+import android.support.multidex.MultiDexApplication;
 import android.support.v8.renderscript.RenderScript
 import de.markusfisch.android.binaryeye.database.Database
 import de.markusfisch.android.binaryeye.preference.Preferences
@@ -8,7 +8,7 @@ import de.markusfisch.android.binaryeye.preference.Preferences
 val db = Database()
 val prefs = Preferences()
 
-class BinaryEyeApp : Application() {
+class BinaryEyeApp : MultiDexApplication() {
 	override fun onCreate() {
 		super.onCreate()
 		db.open(this)

app/src/main/kotlin/de/markusfisch/android/binaryeye/app/Data.kt

@@ -2,13 +2,29 @@ package de.markusfisch.android.binaryeye.app
 
 import android.net.Uri
 import android.os.Build
+import java.io.UnsupportedEncodingException
+import java.net.URLEncoder
 
 private val nonPrintable = "[\\x00-\\x08\\x0e-\\x1f]".toRegex()
+fun String.hasNonPrintableCharacters() = nonPrintable.containsMatchIn(this)
 
-fun hasNonPrintableCharacters(s: String) = nonPrintable.containsMatchIn(s)
+private val nonAlNum = "[^a-zA-Z0-9]".toRegex()
+private val multipleDots = "[…]+".toRegex()
+fun String.foldNonAlNum() = replace(nonAlNum, "…")
+	.replace(multipleDots, "…")
 
-fun parseAndNormalizeUri(input: String): Uri = Uri.parse(input).let {
-	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) it.normalizeScheme() else it
+fun String.urlEncode(): String = try {
+	URLEncoder.encode(this, "UTF-8")
+} catch (e: UnsupportedEncodingException) {
+	this
+}
+
+fun String.parseAndNormalizeUri(): Uri = Uri.parse(this).let {
+	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+		it.normalizeScheme()
+	} else {
+		it
+	}
 }
 
 fun ByteArray.toHexString() = joinToString("") { "%02X".format(it) }

app/src/main/kotlin/de/markusfisch/android/binaryeye/content/Share.kt

@@ -8,16 +8,20 @@ import android.os.Build
 import android.support.v4.content.FileProvider
 import de.markusfisch.android.binaryeye.BuildConfig
 import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.app.parseAndNormalizeUri
 import de.markusfisch.android.binaryeye.widget.toast
 import java.io.File
 
-fun Context.execShareIntent(intent: Intent) {
-	if (!startIntent(intent)) {
-		toast(R.string.cannot_resolve_action)
-	}
+fun Context.execShareIntent(intent: Intent): Boolean = if (
+	!startIntent(intent)
+) {
+	toast(R.string.cannot_resolve_action)
+	false
+} else {
+	true
 }
 
-fun Context.startIntent(intent: Intent) = try {
+fun Context.startIntent(intent: Intent): Boolean = try {
 	// Avoid using `intent.resolveActivity()` at API level 30+ due
 	// to the new package visibility restrictions. In order for
 	// `resolveActivity()` to "see" another package, we would need
@@ -32,6 +36,12 @@ fun Context.startIntent(intent: Intent) = try {
 	false
 }
 
+fun Context.openUrl(url: String): Boolean = openUri(url.parseAndNormalizeUri())
+
+fun Context.openUri(uri: Uri): Boolean = execShareIntent(
+	Intent(Intent.ACTION_VIEW, uri)
+)
+
 fun Context.shareText(text: String, mimeType: String = "text/plain") {
 	execShareIntent(Intent(Intent.ACTION_SEND).apply {
 		putExtra(Intent.EXTRA_TEXT, text)

app/src/main/kotlin/de/markusfisch/android/binaryeye/database/Cursor.kt

@@ -0,0 +1,18 @@
+package de.markusfisch.android.binaryeye.database
+
+import android.database.Cursor
+
+fun Cursor.getString(name: String): String {
+	val idx = getColumnIndex(name)
+	return if (idx < 0) "" else getString(idx) ?: ""
+}
+
+fun Cursor.getBlob(name: String): ByteArray? {
+	val idx = getColumnIndex(name)
+	return if (idx < 0) null else getBlob(idx)
+}
+
+fun Cursor.getLong(name: String): Long {
+	val idx = getColumnIndex(name)
+	return if (idx < 0) 0L else getLong(idx)
+}

app/src/main/kotlin/de/markusfisch/android/binaryeye/database/Database.kt

@@ -5,7 +5,6 @@ import android.content.Context
 import android.database.Cursor
 import android.database.sqlite.SQLiteDatabase
 import android.database.sqlite.SQLiteOpenHelper
-import de.markusfisch.android.binaryeye.app.hasNonPrintableCharacters
 import de.markusfisch.android.binaryeye.app.prefs
 
 class Database {
@@ -110,39 +109,41 @@ class Database {
 		}
 	}
 
-	fun insertScan(scan: Scan): Long {
-		val cv = ContentValues()
-		cv.put(SCANS_DATETIME, scan.timestamp)
-		val isRaw = hasNonPrintableCharacters(scan.content)
-		if (isRaw) {
-			cv.put(SCANS_CONTENT, "")
-			cv.put(SCANS_RAW, scan.raw ?: scan.content.toByteArray())
-		} else {
-			cv.put(SCANS_CONTENT, scan.content)
-		}
-		cv.put(SCANS_FORMAT, scan.format)
-		scan.errorCorrectionLevel?.let {
-			cv.put(SCANS_ERROR_CORRECTION_LEVEL, it)
-		}
-		scan.issueNumber?.let { cv.put(SCANS_ISSUE_NUMBER, it) }
-		scan.orientation?.let { cv.put(SCANS_ORIENTATION, it) }
-		scan.otherMetaData?.let { cv.put(SCANS_OTHER_META_DATA, it) }
-		scan.pdf417ExtraMetaData?.let { cv.put(SCANS_PDF417_EXTRA_METADATA, it) }
-		scan.possibleCountry?.let { cv.put(SCANS_POSSIBLE_COUNTRY, it) }
-		scan.suggestedPrice?.let { cv.put(SCANS_SUGGESTED_PRICE, it) }
-		scan.upcEanExtension?.let { cv.put(SCANS_UPC_EAN_EXTENSION, it) }
-		if (prefs.ignoreConsecutiveDuplicates) {
-			val id = getIdOfLastScan(
-				cv.get(SCANS_CONTENT) as String,
-				if (isRaw) cv.get(SCANS_RAW) as ByteArray else null,
-				scan.format
-			)
-			if (id > 0L) {
-				return id
+	fun insertScan(scan: Scan): Long = db.insert(
+		SCANS,
+		null,
+		ContentValues().apply {
+			put(SCANS_DATETIME, scan.dateTime)
+			val isRaw = scan.raw != null
+			if (isRaw) {
+				put(SCANS_CONTENT, "")
+				put(SCANS_RAW, scan.raw)
+			} else {
+				put(SCANS_CONTENT, scan.content)
+			}
+			put(SCANS_FORMAT, scan.format)
+			scan.errorCorrectionLevel?.let {
+				put(SCANS_ERROR_CORRECTION_LEVEL, it)
+			}
+			scan.issueNumber?.let { put(SCANS_ISSUE_NUMBER, it) }
+			scan.orientation?.let { put(SCANS_ORIENTATION, it) }
+			scan.otherMetaData?.let { put(SCANS_OTHER_META_DATA, it) }
+			scan.pdf417ExtraMetaData?.let { put(SCANS_PDF417_EXTRA_METADATA, it) }
+			scan.possibleCountry?.let { put(SCANS_POSSIBLE_COUNTRY, it) }
+			scan.suggestedPrice?.let { put(SCANS_SUGGESTED_PRICE, it) }
+			scan.upcEanExtension?.let { put(SCANS_UPC_EAN_EXTENSION, it) }
+			if (prefs.ignoreConsecutiveDuplicates) {
+				val id = getIdOfLastScan(
+					get(SCANS_CONTENT) as String,
+					if (isRaw) get(SCANS_RAW) as ByteArray else null,
+					scan.format
+				)
+				if (id > 0L) {
+					return id
+				}
 			}
 		}
-		return db.insert(SCANS, null, cv)
-	}
+	)
 
 	private fun getIdOfLastScan(
 		content: String,
@@ -161,12 +162,12 @@ class Database {
 	)?.use {
 		if (it.count > 0 &&
 			it.moveToFirst() &&
-			it.getString(it.getColumnIndex(SCANS_CONTENT)) == content &&
-			(raw == null || it.getBlob(it.getColumnIndex(SCANS_RAW))
+			it.getString(SCANS_CONTENT) == content &&
+			(raw == null || it.getBlob(SCANS_RAW)
 				?.contentEquals(raw) == true) &&
-			it.getString(it.getColumnIndex(SCANS_FORMAT)) == format
+			it.getString(SCANS_FORMAT) == format
 		) {
-			it.getLong(it.getColumnIndex(SCANS_ID))
+			it.getLong(SCANS_ID)
 		} else {
 			0L
 		}
@@ -271,15 +272,3 @@ class Database {
 		}
 	}
 }
-
-private fun Cursor.getString(name: String) = getString(
-	getColumnIndex(name)
-)
-
-private fun Cursor.getBlob(name: String) = getBlob(
-	getColumnIndex(name)
-)
-
-private fun Cursor.getLong(name: String) = getLong(
-	getColumnIndex(name)
-)

app/src/main/kotlin/de/markusfisch/android/binaryeye/database/Scan.kt

@@ -5,6 +5,7 @@ import android.os.Parcelable
 import android.text.format.DateFormat
 import com.google.zxing.Result
 import com.google.zxing.ResultMetadataType
+import de.markusfisch.android.binaryeye.app.hasNonPrintableCharacters
 
 data class Scan(
 	val content: String,
@@ -18,23 +19,9 @@ data class Scan(
 	val possibleCountry: String?,
 	val suggestedPrice: String?,
 	val upcEanExtension: String?,
-	val timestamp: String = getDateTime(),
+	val dateTime: String = getDateTime(),
 	var id: Long = 0L
 ) : Parcelable {
-	constructor(result: Result) : this(
-		result.text,
-		getRawBytes(result),
-		result.barcodeFormat.toString(),
-		result.getMetaString(ResultMetadataType.ERROR_CORRECTION_LEVEL),
-		result.getMetaString(ResultMetadataType.ISSUE_NUMBER),
-		result.getMetaString(ResultMetadataType.ORIENTATION),
-		result.getMetaString(ResultMetadataType.OTHER),
-		result.getMetaString(ResultMetadataType.PDF417_EXTRA_METADATA),
-		result.getMetaString(ResultMetadataType.POSSIBLE_COUNTRY),
-		result.getMetaString(ResultMetadataType.SUGGESTED_PRICE),
-		result.getMetaString(ResultMetadataType.UPC_EAN_EXTENSION)
-	)
-
 	// Needs to be overwritten manually, as ByteArray is an array and
 	// this isn't handled well by Kotlin
 	override fun equals(other: Any?): Boolean {
@@ -48,7 +35,7 @@ data class Scan(
 		other as Scan
 
 		return id == other.id &&
-				timestamp == other.timestamp &&
+				dateTime == other.dateTime &&
 				content == other.content &&
 				((raw == null && other.raw == null) ||
 						(raw != null && other.raw != null && raw.contentEquals(other.raw))) &&
@@ -67,7 +54,7 @@ data class Scan(
 	// this isn't handled well by Kotlin
 	override fun hashCode(): Int {
 		var result = id.hashCode()
-		result = 31 * result + timestamp.hashCode()
+		result = 31 * result + dateTime.hashCode()
 		result = 31 * result + content.hashCode()
 		result = 31 * result + (raw?.contentHashCode() ?: 0)
 		result = 31 * result + format.hashCode()
@@ -94,7 +81,7 @@ data class Scan(
 		possibleCountry = parcel.readString(),
 		suggestedPrice = parcel.readString(),
 		upcEanExtension = parcel.readString(),
-		timestamp = parcel.readString() ?: "",
+		dateTime = parcel.readString() ?: "",
 		id = parcel.readLong()
 	)
 
@@ -111,7 +98,7 @@ data class Scan(
 			writeString(possibleCountry)
 			writeString(suggestedPrice)
 			writeString(upcEanExtension)
-			writeString(timestamp)
+			writeString(dateTime)
 			writeLong(id)
 		}
 	}
@@ -132,29 +119,6 @@ private fun getDateTime(time: Long = System.currentTimeMillis()) = DateFormat.fo
 	time
 ).toString()
 
-private fun getRawBytes(result: Result): ByteArray? {
-	val metadata = result.resultMetadata ?: return null
-	val segments = metadata[ResultMetadataType.BYTE_SEGMENTS] ?: return null
-	var bytes = ByteArray(0)
-	@Suppress("UNCHECKED_CAST")
-	for (seg in segments as Iterable<ByteArray>) {
-		bytes += seg
-	}
-	// If the byte segments are shorter than the converted string, the
-	// content of the QR Code has been encoded with different encoding
-	// modes (e.g. some parts in alphanumeric, some in byte encoding).
-	// This is because Zxing only records byte segments for byte encoded
-	// parts. Please note the byte segments can actually be longer than
-	// the string because Zxing cuts off prefixes like "WIFI:".
-	return if (bytes.size >= result.text.length) bytes else null
-}
-
-private fun Result.getMetaString(
-	key: ResultMetadataType
-): String? = this.resultMetadata?.let {
-	it[key]?.toString()
-}
-
 private fun Parcel.writeSizedByteArray(array: ByteArray?) {
 	val size = array?.size ?: 0
 	writeInt(size)
@@ -173,3 +137,51 @@ private fun Parcel.readSizedByteArray(): ByteArray? {
 		null
 	}
 }
+
+fun Result.toScan(): Scan {
+	val content: String
+	val raw: ByteArray?
+	if (text.hasNonPrintableCharacters()) {
+		content = ""
+		raw = getRawData() ?: text.toByteArray()
+	} else {
+		content = text
+		raw = null
+	}
+	return Scan(
+		content,
+		raw,
+		barcodeFormat.toString(),
+		getMetaString(ResultMetadataType.ERROR_CORRECTION_LEVEL),
+		getMetaString(ResultMetadataType.ISSUE_NUMBER),
+		getMetaString(ResultMetadataType.ORIENTATION),
+		getMetaString(ResultMetadataType.OTHER),
+		getMetaString(ResultMetadataType.PDF417_EXTRA_METADATA),
+		getMetaString(ResultMetadataType.POSSIBLE_COUNTRY),
+		getMetaString(ResultMetadataType.SUGGESTED_PRICE),
+		getMetaString(ResultMetadataType.UPC_EAN_EXTENSION)
+	)
+}
+
+private fun Result.getRawData(): ByteArray? {
+	val metadata = resultMetadata ?: return null
+	val segments = metadata[ResultMetadataType.BYTE_SEGMENTS] ?: return null
+	var bytes = ByteArray(0)
+	@Suppress("UNCHECKED_CAST")
+	for (seg in segments as Iterable<ByteArray>) {
+		bytes += seg
+	}
+	// If the byte segments are shorter than the converted string, the
+	// content of the QR Code has been encoded with different encoding
+	// modes (e.g. some parts in alphanumeric, some in byte encoding).
+	// This is because Zxing only records byte segments for byte encoded
+	// parts. Please note the byte segments can actually be longer than
+	// the string because Zxing cuts off prefixes like "WIFI:".
+	return if (bytes.size >= text.length) bytes else null
+}
+
+private fun Result.getMetaString(
+	key: ResultMetadataType
+): String? = this.resultMetadata?.let {
+	it[key]?.toString()
+}

app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/BarcodeFragment.kt

@@ -277,9 +277,8 @@ class BarcodeFragment : Fragment() {
 	}
 }
 
-private fun Bitmap.saveAsPng(outputStream: OutputStream, quality: Int = 90) {
-	this.compress(Bitmap.CompressFormat.PNG, quality, outputStream)
-}
+private fun Bitmap.saveAsPng(outputStream: OutputStream, quality: Int = 90) =
+	compress(Bitmap.CompressFormat.PNG, quality, outputStream)
 
 private val fileNameCharacters = "[^A-Za-z0-9]".toRegex()
 private fun encodeFileName(name: String): String =

app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/DecodeFragment.kt

@@ -77,9 +77,7 @@ class DecodeFragment : Fragment() {
 		id = scan.id
 
 		val inputContent = scan.content
-		isBinary = hasNonPrintableCharacters(
-			inputContent
-		) or inputContent.isEmpty()
+		isBinary = scan.raw != null
 		raw = scan.raw ?: inputContent.toByteArray()
 		format = scan.format
 
@@ -116,7 +114,7 @@ class DecodeFragment : Fragment() {
 				executeAction(content.toByteArray())
 			}
 		} else {
-			contentView.setText(R.string.binary_data)
+			contentView.setText(String(raw).foldNonAlNum())
 			contentView.isEnabled = false
 			fab.setImageResource(R.drawable.ic_action_save)
 			fab.setOnClickListener {
@@ -175,50 +173,25 @@ class DecodeFragment : Fragment() {
 		}
 	}
 
-	private fun fillDataTable(tableLayout: TableLayout, items: LinkedHashMap<Int, String?>?) {
-		val ctx = tableLayout.context
-		val spaceBetween = (16f * ctx.resources.displayMetrics.density).toInt()
-
-		var hasEntries = false
-
-		items?.forEach { item ->
-			item.value?.let {
-				val tr = TableRow(ctx)
-				val keyView = TextView(ctx)
-				keyView.setText(item.key)
-				val valueView = TextView(ctx)
-				valueView.setPadding(spaceBetween, 0, 0, 0)
-				valueView.text = it
-				tr.addView(keyView)
-				tr.addView(valueView)
-				tableLayout.addView(tr)
-				hasEntries = true
-			}
-		}
-		if (hasEntries) {
-			tableLayout.setPadding(0, 0, 0, spaceBetween)
-		}
-	}
-
 	private fun fillDataView(tableLayout: TableLayout, content: String) {
 		val items = LinkedHashMap<Int, String?>()
-
 		if (action is WifiAction) {
-			val wifiData = WifiConnector.parseMap(content)
-
-			if (wifiData != null) {
-				items[R.string.entry_type] = getString(R.string.wifi_network)
-				items[R.string.wifi_ssid] = wifiData["S"]
-				items[R.string.wifi_password] = wifiData["P"]
-				items[R.string.wifi_type] = wifiData["T"]
-				items[R.string.wifi_hidden] = wifiData["H"]
-				items[R.string.wifi_eap] = wifiData["E"]
-				items[R.string.wifi_identity] = wifiData["I"]
-				items[R.string.wifi_anonymous_identity] = wifiData["A"]
-				items[R.string.wifi_phase2] = wifiData["PH2"]
+			WifiConnector.parseMap(content)?.let { wifiData ->
+				items.putAll(
+					linkedMapOf(
+						R.string.entry_type to getString(R.string.wifi_network),
+						R.string.wifi_ssid to wifiData["S"],
+						R.string.wifi_password to wifiData["P"],
+						R.string.wifi_type to wifiData["T"],
+						R.string.wifi_hidden to wifiData["H"],
+						R.string.wifi_eap to wifiData["E"],
+						R.string.wifi_identity to wifiData["I"],
+						R.string.wifi_anonymous_identity to wifiData["A"],
+						R.string.wifi_phase2 to wifiData["PH2"]
+					)
+				)
 			}
 		}
-
 		fillDataTable(tableLayout, items)
 	}
 
@@ -237,6 +210,31 @@ class DecodeFragment : Fragment() {
 		)
 	}
 
+	private fun fillDataTable(
+		tableLayout: TableLayout,
+		items: LinkedHashMap<Int, String?>
+	) {
+		val ctx = tableLayout.context
+		val spaceBetween = (16f * ctx.resources.displayMetrics.density).toInt()
+		items.forEach { item ->
+			val text = item.value
+			if (!text.isNullOrBlank()) {
+				val tr = TableRow(ctx)
+				val keyView = TextView(ctx)
+				keyView.setText(item.key)
+				val valueView = TextView(ctx)
+				valueView.setPadding(spaceBetween, 0, 0, 0)
+				valueView.text = text
+				tr.addView(keyView)
+				tr.addView(valueView)
+				tableLayout.addView(tr)
+			}
+		}
+		if (tableLayout.childCount > 0) {
+			tableLayout.setPadding(0, 0, 0, spaceBetween)
+		}
+	}
+
 	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
 		inflater.inflate(R.menu.fragment_decode, menu)
 		if (isBinary) {

app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/HistoryFragment.kt

@@ -24,6 +24,7 @@ import de.markusfisch.android.binaryeye.app.*
 import de.markusfisch.android.binaryeye.content.copyToClipboard
 import de.markusfisch.android.binaryeye.content.shareText
 import de.markusfisch.android.binaryeye.database.Database
+import de.markusfisch.android.binaryeye.database.getString
 import de.markusfisch.android.binaryeye.database.exportCsv
 import de.markusfisch.android.binaryeye.database.exportDatabase
 import de.markusfisch.android.binaryeye.database.exportJson
@@ -301,7 +302,7 @@ class HistoryFragment : Fragment() {
 
 	private fun getScanName(position: Int): String? {
 		val cursor = scansAdapter?.getItem(position) as Cursor?
-		return cursor?.getString(cursor.getColumnIndex(Database.SCANS_NAME))
+		return cursor?.getString(Database.SCANS_NAME)
 	}
 
 	// Dialogs don't have a parent layout.
@@ -367,10 +368,10 @@ class HistoryFragment : Fragment() {
 				) {
 					return@useVisibility
 				}
-				val options = context.resources.getStringArray(
+				val options = ac.resources.getStringArray(
 					R.array.export_options_values
 				)
-				val delimiter = alertDialog<String>(context) { resume ->
+				val delimiter = alertDialog<String>(ac) { resume ->
 					setTitle(R.string.export_as)
 					setItems(R.array.export_options_names) { _, which ->
 						resume(options[which])
@@ -389,8 +390,8 @@ class HistoryFragment : Fragment() {
 					"db" -> ac.exportDatabase(name)
 					else -> db.getScansDetailed(filter)?.use {
 						when (delimiter) {
-							"json" -> context.exportJson(name, it)
-							else -> context.exportCsv(name, it, delimiter)
+							"json" -> ac.exportJson(name, it)
+							else -> ac.exportCsv(name, it, delimiter)
 						}
 					} ?: false
 				}.toSaveResult()
@@ -436,7 +437,7 @@ class HistoryFragment : Fragment() {
 private fun Cursor.exportText(separator: String): String {
 	val sb = StringBuilder()
 	val contentIndex = getColumnIndex(Database.SCANS_CONTENT)
-	if (moveToFirst()) {
+	if (contentIndex > -1 && moveToFirst()) {
 		do {
 			val content = getString(contentIndex)
 			if (content?.isNotEmpty() == true) {

app/src/main/kotlin/de/markusfisch/android/binaryeye/net/ScanSender.kt

@@ -1,6 +1,7 @@
 package de.markusfisch.android.binaryeye.net
 
 import de.markusfisch.android.binaryeye.app.toHexString
+import de.markusfisch.android.binaryeye.app.urlEncode
 import de.markusfisch.android.binaryeye.database.Scan
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -14,9 +15,12 @@ import java.io.InputStreamReader
 import java.net.HttpURLConnection
 import java.net.ProtocolException
 import java.net.URL
-import java.net.URLEncoder
 
-fun Scan.sendAsync(url: String, type: String, callback: (Int?, String?) -> Unit) {
+fun Scan.sendAsync(
+	url: String,
+	type: String,
+	callback: (Int?, String?) -> Unit
+) {
 	CoroutineScope(Dispatchers.IO).launch(Dispatchers.IO) {
 		val response = send(url, type)
 		withContext(Dispatchers.Main) {
@@ -47,21 +51,19 @@ private fun Scan.send(url: String, type: String): Response {
 			}
 		}
 		else -> request(
-			url + urlEncode(content)
+			url + content.urlEncode()
 		)
 	}
 }
 
 private fun Scan.asUrlArguments(): String = getMap().map { (k, v) ->
-	"${k}=${urlEncode(v)}"
+	"${k}=${v.urlEncode()}"
 }.joinToString("&")
 
 private fun Scan.asJson() = JSONObject().apply {
 	getMap().forEach { (k, v) -> put(k, v) }
 }
 
-private fun urlEncode(s: String) = URLEncoder.encode(s, "utf-8")
-
 private fun Scan.getMap(): Map<String, String> = mapOf(
 	"content" to content,
 	"raw" to raw?.toHexString(),
@@ -74,7 +76,7 @@ private fun Scan.getMap(): Map<String, String> = mapOf(
 	"possibleCountry" to possibleCountry,
 	"suggestedPrice" to suggestedPrice,
 	"upcEanExtension" to upcEanExtension,
-	"timestamp" to timestamp
+	"timestamp" to dateTime
 ).filterNullValues()
 
 private fun Map<String, String?>.filterNullValues() =

app/src/main/kotlin/de/markusfisch/android/binaryeye/os/Vibrator.kt

@@ -1,11 +1,15 @@
 package de.markusfisch.android.binaryeye.os
 
+import android.content.Context
 import android.os.Build
 import android.os.VibrationEffect
 import android.os.Vibrator
+import android.os.VibratorManager
 import de.markusfisch.android.binaryeye.app.prefs
 
-private const val MILLISECONDS = 100L
+private const val DURATION_IN_MS = 100L
+
+private val beforeO = Build.VERSION.SDK_INT < Build.VERSION_CODES.O
 private val errorPatternTimings = longArrayOf(
 	50L, 100L, 50L, 100L, 50L
 )
@@ -13,17 +17,27 @@ private val errorPatternAmplitudes = intArrayOf(
 	255, 0, 255, 0, 255
 )
 
+fun Context.getVibrator(): Vibrator = if (
+	Build.VERSION.SDK_INT < Build.VERSION_CODES.S
+) {
+	@Suppress("DEPRECATION")
+	getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
+} else {
+	(getSystemService(
+		Context.VIBRATOR_MANAGER_SERVICE
+	) as VibratorManager).defaultVibrator
+}
+
 fun Vibrator.vibrate() {
 	if (!prefs.vibrate) {
 		return
-	}
-	if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+	} else if (beforeO) {
 		@Suppress("DEPRECATION")
-		vibrate(MILLISECONDS)
+		vibrate(DURATION_IN_MS)
 	} else {
 		vibrate(
 			VibrationEffect.createOneShot(
-				MILLISECONDS,
+				DURATION_IN_MS,
 				VibrationEffect.DEFAULT_AMPLITUDE
 			)
 		)
@@ -33,8 +47,7 @@ fun Vibrator.vibrate() {
 fun Vibrator.error() {
 	if (!prefs.vibrate) {
 		return
-	}
-	if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+	} else if (beforeO) {
 		@Suppress("DEPRECATION")
 		vibrate(errorPatternTimings, -1)
 	} else {

app/src/main/kotlin/de/markusfisch/android/binaryeye/preference/Preferences.kt

@@ -143,6 +143,11 @@ class Preferences {
 			apply(OPEN_WITH_URL, value)
 			field = value
 		}
+	var sendScanActive = true
+		set(value) {
+			apply(SEND_SCAN_ACTIVE, value)
+			field = value
+		}
 	var sendScanUrl: String = ""
 		set(value) {
 			apply(SEND_SCAN_URL, value)
@@ -163,7 +168,7 @@ class Preferences {
 			apply(INDEX_OF_LAST_SELECTED_FORMAT, value)
 			field = value
 		}
-	var forceCompat: Boolean = false
+	var forceCompat = false
 		set(value) {
 			// Since the app may be about to crash when forceCompat is set,
 			// it's necessary to `commit()` this synchronously.
@@ -230,6 +235,10 @@ class Preferences {
 		preferences.getString(OPEN_WITH_URL, openWithUrl)?.also {
 			openWithUrl = it
 		}
+		sendScanActive = preferences.getBoolean(
+			SEND_SCAN_ACTIVE,
+			sendScanActive
+		)
 		preferences.getString(SEND_SCAN_URL, sendScanUrl)?.also {
 			sendScanUrl = it
 		}
@@ -278,31 +287,32 @@ class Preferences {
 	}
 
 	companion object {
-		const val BARCODE_FORMATS = "barcode_formats"
-		const val CROP_HANDLE_X = "crop_handle_x"
-		const val CROP_HANDLE_Y = "crop_handle_y"
-		const val CROP_HANDLE_ORIENTATION = "crop_handle_orientation"
-		const val SHOW_CROP_HANDLE = "show_crop_handle"
-		const val ZOOM_BY_SWIPING = "zoom_by_swiping"
-		const val AUTO_ROTATE = "auto_rotate"
-		const val TRY_HARDER = "try_harder"
-		const val BULK_MODE = "bulk_mode"
-		const val BULK_MODE_DELAY = "bulk_mode_delay"
-		const val SHOW_TOAST_IN_BULK_MODE = "show_toast_in_bulk_mode"
-		const val VIBRATE = "vibrate"
-		const val USE_HISTORY = "use_history"
-		const val IGNORE_CONSECUTIVE_DUPLICATES = "ignore_consecutive_duplicates"
-		const val OPEN_IMMEDIATELY = "open_immediately"
-		const val COPY_IMMEDIATELY = "copy_immediately"
-		const val SHOW_META_DATA = "show_meta_data"
-		const val SHOW_HEX_DUMP = "show_hex_dump"
-		const val CLOSE_AUTOMATICALLY = "close_automatically"
-		const val DEFAULT_SEARCH_URL = "default_search_url"
-		const val OPEN_WITH_URL = "open_with_url"
-		const val SEND_SCAN_URL = "send_scan_url"
-		const val SEND_SCAN_TYPE = "send_scan_type"
-		const val CUSTOM_LOCALE = "custom_locale"
-		const val INDEX_OF_LAST_SELECTED_FORMAT = "index_of_last_selected_format"
-		const val FORCE_COMPAT = "force_compat"
+		private const val BARCODE_FORMATS = "barcode_formats"
+		private const val CROP_HANDLE_X = "crop_handle_x"
+		private const val CROP_HANDLE_Y = "crop_handle_y"
+		private const val CROP_HANDLE_ORIENTATION = "crop_handle_orientation"
+		private const val SHOW_CROP_HANDLE = "show_crop_handle"
+		private const val ZOOM_BY_SWIPING = "zoom_by_swiping"
+		private const val AUTO_ROTATE = "auto_rotate"
+		private const val TRY_HARDER = "try_harder"
+		private const val BULK_MODE = "bulk_mode"
+		private const val BULK_MODE_DELAY = "bulk_mode_delay"
+		private const val SHOW_TOAST_IN_BULK_MODE = "show_toast_in_bulk_mode"
+		private const val VIBRATE = "vibrate"
+		private const val USE_HISTORY = "use_history"
+		private const val IGNORE_CONSECUTIVE_DUPLICATES = "ignore_consecutive_duplicates"
+		private const val OPEN_IMMEDIATELY = "open_immediately"
+		private const val COPY_IMMEDIATELY = "copy_immediately"
+		private const val SHOW_META_DATA = "show_meta_data"
+		private const val SHOW_HEX_DUMP = "show_hex_dump"
+		private const val CLOSE_AUTOMATICALLY = "close_automatically"
+		private const val DEFAULT_SEARCH_URL = "default_search_url"
+		private const val OPEN_WITH_URL = "open_with_url"
+		private const val SEND_SCAN_ACTIVE = "send_scan_active"
+		private const val SEND_SCAN_URL = "send_scan_url"
+		private const val SEND_SCAN_TYPE = "send_scan_type"
+		private const val CUSTOM_LOCALE = "custom_locale"
+		private const val INDEX_OF_LAST_SELECTED_FORMAT = "index_of_last_selected_format"
+		private const val FORCE_COMPAT = "force_compat"
 	}
 }

app/src/main/kotlin/de/markusfisch/android/binaryeye/zxing/Zxing.kt

@@ -26,15 +26,15 @@ class Zxing(possibleResultPoint: ResultPointCallback? = null) {
 	}
 
 	private fun setDecodeFormats(formats: Set<String>) {
-		val decodeFormats = EnumSet.noneOf(
+		hints[DecodeHintType.POSSIBLE_FORMATS] = EnumSet.noneOf(
 			BarcodeFormat::class.java
-		)
-		decodeFormats.addAll(
-			EnumSet.copyOf(
-				formats.map { BarcodeFormat.valueOf(it) }
+		).apply {
+			addAll(
+				EnumSet.copyOf(
+					formats.map { BarcodeFormat.valueOf(it) }
+				)
 			)
-		)
-		hints[DecodeHintType.POSSIBLE_FORMATS] = decodeFormats
+		}
 	}
 
 	fun decode(
@@ -42,8 +42,8 @@ class Zxing(possibleResultPoint: ResultPointCallback? = null) {
 		width: Int,
 		height: Int,
 		invert: Boolean = false
-	): Result? {
-		val source = PlanarYUVLuminanceSource(
+	): Result? = decodeLuminanceSource(
+		PlanarYUVLuminanceSource(
 			yuvData,
 			width,
 			height,
@@ -52,25 +52,20 @@ class Zxing(possibleResultPoint: ResultPointCallback? = null) {
 			width,
 			height,
 			false
-		)
-		return decodeLuminanceSource(source, invert)
-	}
+		),
+		invert
+	)
 
 	fun decodePositiveNegative(bitmap: Bitmap): Result? =
 		decode(bitmap, false) ?: decode(bitmap, true)
 
-	private fun decode(bitmap: Bitmap, invert: Boolean = false): Result? {
-		val pixels = IntArray(bitmap.width * bitmap.height)
-		return decode(pixels, bitmap, invert)
-	}
-
 	private fun decode(
-		pixels: IntArray,
 		bitmap: Bitmap,
 		invert: Boolean = false
 	): Result? {
 		val width = bitmap.width
 		val height = bitmap.height
+		val pixels = IntArray(width * height)
 		if (bitmap.config != Bitmap.Config.ARGB_8888) {
 			bitmap.copy(Bitmap.Config.ARGB_8888, true)
 		} else {
@@ -85,31 +80,29 @@ class Zxing(possibleResultPoint: ResultPointCallback? = null) {
 	private fun decodeLuminanceSource(
 		source: LuminanceSource,
 		invert: Boolean
-	): Result? {
-		return decodeLuminanceSource(
-			if (invert) {
-				source.invert()
-			} else {
-				source
-			}
-		)
-	}
-
-	private fun decodeLuminanceSource(source: LuminanceSource): Result? {
-		val bitmap = BinaryBitmap(HybridBinarizer(source))
-		return try {
-			multiFormatReader.decode(bitmap, hints)
-		} catch (e: Exception) {
-			// Usually it's bad practice to blindly catch *all* exceptions
-			// because this can hide problems we want to know about. But
-			// since ZXing has some errors (like all software) and I don't
-			// want this app to break in the hands of my users, which won't
-			// see the stack trace anyway, it's better to just catch all
-			// exceptions here and live on.
-			null
-		} finally {
-			multiFormatReader.reset()
+	): Result? = decodeLuminanceSource(
+		if (invert) {
+			source.invert()
+		} else {
+			source
 		}
+	)
+
+	private fun decodeLuminanceSource(source: LuminanceSource): Result? = try {
+		multiFormatReader.decode(
+			BinaryBitmap(HybridBinarizer(source)),
+			hints
+		)
+	} catch (e: Exception) {
+		// Usually it's bad practice to blindly catch *all* exceptions
+		// because this can hide problems we want to know about. But
+		// since ZXing has some errors (like all software) and I don't
+		// want this app to break in the hands of my users, which won't
+		// see the stack trace anyway, it's better to just catch all
+		// exceptions here and live on.
+		null
+	} finally {
+		multiFormatReader.reset()
 	}
 }
 

app/src/main/res/drawable/ic_action_restrict_format.xml

@@ -0,0 +1,15 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M3,11h8V3H3V11zM5,5h4v4H5V5z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M3,21h8v-8H3V21zM5,15h4v4H5V15z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M13,3v8h8V3H13zM19,9h-4V5h4V9z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M19,19h2v2h-2z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M13,13h2v2h-2z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M15,15h2v2h-2z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M13,17h2v2h-2z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M15,19h2v2h-2z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M17,17h2v2h-2z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M17,13h2v2h-2z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M19,15h2v2h-2z"/>
+</vector>

app/src/main/res/drawable/ic_launcher_monochrome.xml

@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="90dp"
+    android:height="90dp"
+    android:viewportWidth="90"
+    android:viewportHeight="90">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M45,45m-18,0a18,18 0,1 1,36 0a18,18 0,1 1,-36 0"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="4"
+      android:strokeColor="#00000000"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="M45.263,45.264m-13.262,0a13.262,13.262 0,1 1,26.524 0a13.262,13.262 0,1 1,-26.524 0"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="4"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="M44.885,45.704m-7.255,0a7.255,7.255 0,1 1,14.51 0a7.255,7.255 0,1 1,-14.51 0"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="4"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="M49.785,40.407m-4.768,0a4.768,4.768 0,1 1,9.536 0a4.768,4.768 0,1 1,-9.536 0"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="10"
+      android:fillColor="#ffffff"
+      android:strokeColor="#00000000"
+      android:strokeLineCap="butt"/>
+</vector>

app/src/main/res/menu/activity_camera.xml

@@ -27,6 +27,11 @@
 		android:icon="@drawable/ic_action_bulk_mode"
 		android:checkable="true"
 		material:showAsAction="ifRoom"/>
+	<item
+		android:id="@+id/restrict_format"
+		android:title="@string/restrict_format"
+		android:icon="@drawable/ic_action_restrict_format"
+		material:showAsAction="ifRoom"/>
 	<item
 		android:id="@+id/preferences"
 		android:title="@string/preferences"

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,4 +1,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
 	<background android:drawable="@color/accent"/>
 	<foreground android:drawable="@drawable/ic_launcher_foreground"/>
+	<monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>

app/src/main/res/values-bn/strings.xml

@@ -23,6 +23,7 @@
 	<string name="suggested_price">প্রস্তসবিত দাম</string>
 	<string name="upc_ean_extension">ইউপিসি ইএএন বর্ধিত</string>
 	<string name="toggle_flash">আলো</string>
+	<string name="error_flash">Error toggling flash</string>
 	<string name="share">ভাগ করো</string>
 	<string name="share_as">ভাগ করার মাধ্যম</string>
 	<string name="copy_to_clipboard">ক্লিপবোর্ডে অনুলিপি</string>
@@ -45,6 +46,9 @@
 	<string name="bulk_mode">ধারাবাহিকভাবে খুঁজো</string>
 	<string name="bulk_mode_summary">শুরুতে সবসময় ধারাবাহিকভাবে খুঁজো</string>
 	<string name="bulk_mode_delay">Delay between continuous scans</string>
+	<string name="restrict_format">Restrict format</string>
+	<string name="remove_restriction">Remove restriction</string>
+	<string name="scan_format">Scan %s</string>
 	<string name="quarter_second">A quarter second</string>
 	<string name="half_second">Half a second</string>
 	<string name="a_second">One second</string>
@@ -93,12 +97,15 @@
 	<string name="clear_network_suggestions_success">Network suggestions cleared</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Nothing to remove</string>
 	<string name="send_category">অন্যকে পাঠাও</string>
+	<string name="send_scan_active">Forward scans</string>
+	<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
 	<string name="send_scan_url">প্রতিটি পাঠোদ্ধার ইউআরএল-এ পাঠাও</string>
 	<string name="send_scan_type">প্রতি পাঠোদ্ধারের জন্য অনুরোধ</string>
 	<string name="send_type_get_add_content">গেট(GET) দিয়ে তথ্য যোগ করো</string>
 	<string name="send_type_get_query_string">সম্পূর্ণ কুয়েরি স্ট্রিং দিয়ে গেট(GET) করো</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
+	<string name="send_type_external_browser">Open in external browser</string>
 	<string name="test_url">পরীক্ষার জন্য ইউআরএল</string>
 	<string name="really_remove_scan">আসলেই এটা মুছবে?</string>
 	<string name="really_remove_all_scans">আসলেই সব মুছবে?</string>

app/src/main/res/values-cs/strings.xml

@@ -9,6 +9,7 @@
 	<plurals name="barcode_info">
 		<item quantity="one">%2$d znak, %1$s</item>
 		<item quantity="few">%2$d znaky, %1$s</item>
+		<item quantity="many">%2$d znaků, %1$s</item>
 		<item quantity="other">%2$d znaků, %1$s</item>
 	</plurals>
 	<string name="error_correction_level">Stupeň korekce chyb</string>
@@ -24,6 +25,7 @@
 	<string name="suggested_price">Doporučená cena</string>
 	<string name="upc_ean_extension">rozšíření UPC EAN</string>
 	<string name="toggle_flash">Zap/vyp blesk</string>
+	<string name="error_flash">Error toggling flash</string>
 	<string name="share">Sdílet</string>
 	<string name="share_as">Sdílet jako</string>
 	<string name="copy_to_clipboard">Zkopírovat do schránky</string>
@@ -46,6 +48,9 @@
 	<string name="bulk_mode">Skenovat nepřetržitě</string>
 	<string name="bulk_mode_summary">Always start scanning continuously.</string>
 	<string name="bulk_mode_delay">Delay between continuous scans</string>
+	<string name="restrict_format">Restrict format</string>
+	<string name="remove_restriction">Remove restriction</string>
+	<string name="scan_format">Scan %s</string>
 	<string name="quarter_second">A quarter second</string>
 	<string name="half_second">Half a second</string>
 	<string name="a_second">One second</string>
@@ -94,12 +99,15 @@
 	<string name="clear_network_suggestions_success">Network suggestions cleared</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Nothing to remove</string>
 	<string name="send_category">Přesměrování</string>
+	<string name="send_scan_active">Forward scans</string>
+	<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
 	<string name="send_scan_url">Posílat každý sken na URL</string>
 	<string name="send_scan_type">Typ requestu pro každý sken</string>
 	<string name="send_type_get_add_content">GET a simply add content</string>
-	<string name="send_type_get_query_string">GET with compelete query string</string>
+	<string name="send_type_get_query_string">GET with complete query string</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
+	<string name="send_type_external_browser">Open in external browser</string>
 	<string name="test_url">Otestovat URL</string>
 	<string name="really_remove_scan">Opravdu odstranit sken?</string>
 	<string name="really_remove_all_scans">Opravdu odstranit všechny skeny?</string>

app/src/main/res/values-de/strings.xml

@@ -23,6 +23,7 @@
 	<string name="suggested_price">Preisvorschlag</string>
 	<string name="upc_ean_extension">UPC EAN Erweiterung</string>
 	<string name="toggle_flash">Licht an/ausschalten</string>
+	<string name="error_flash">Fehler beim ein/ausschalten des Lichts</string>
 	<string name="share">Teilen</string>
 	<string name="share_as">Teilen als?</string>
 	<string name="copy_to_clipboard">In die Zwischenablage kopieren</string>
@@ -45,6 +46,9 @@
 	<string name="bulk_mode">Fortlaufend Scannen</string>
 	<string name="bulk_mode_summary">Immer mit fortlaufendem Scannen starten.</string>
 	<string name="bulk_mode_delay">Pause zwischen fortlaufenden Scans</string>
+	<string name="restrict_format">Format eingrenzen</string>
+	<string name="remove_restriction">Einschränkung entfernen</string>
+	<string name="scan_format">%s scannen</string>
 	<string name="quarter_second">Eine Viertelsekunde</string>
 	<string name="half_second">Eine halbe Sekunde</string>
 	<string name="a_second">Eine Sekunde</string>
@@ -67,7 +71,7 @@
 	<string name="try_harder">Gründliche Suche</string>
 	<string name="try_harder_summary">Aktivieren Sie diese Option für sehr schwer lesbare Codes. Beeinträchtigt die Leistung.</string>
 	<string name="show_toast_in_bulk_mode">Daten einblenden</string>
-	<string name="show_toast_in_bulk_mode_summary">Die gescannten Daten werden kurz eingeblenet, wenn fortlaufend gescannt wird.</string>
+	<string name="show_toast_in_bulk_mode_summary">Die gescannten Daten werden kurz eingeblendet, wenn fortlaufend gescannt wird.</string>
 	<string name="vibrate">Bei Erkennung vibrieren</string>
 	<string name="vibrate_summary">Das Gerät soll vibrieren wenn ein Code erkannt wird.</string>
 	<string name="use_history">Codes speichern</string>
@@ -93,12 +97,15 @@
 	<string name="clear_network_suggestions_success">Netzwerkvorschläge entfernt</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Nichts zu entfernen</string>
 	<string name="send_category">Weiterleitung</string>
-	<string name="send_scan_url">URL die für jeden Scan aufgerufen werden soll</string>
-	<string name="send_scan_type">Typ des Requests für jeden Scan</string>
+	<string name="send_scan_active">Scans weiterleiten</string>
+	<string name="send_scan_active_summary">Aktivieren Sie diese Option, um Scans an die angegebene URL weiterzuleiten.</string>
+	<string name="send_scan_url">URL, an die weitergeleitet werden soll</string>
+	<string name="send_scan_type">Requesttyp</string>
 	<string name="send_type_get_add_content">GET mit an die URL angehängtem Inhalt</string>
 	<string name="send_type_get_query_string">GET mit vollständigem Query-String</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
+	<string name="send_type_external_browser">In externem Browser öffnen</string>
 	<string name="test_url">Test URL</string>
 	<string name="really_remove_scan">Code wirklich entfernen?</string>
 	<string name="really_remove_all_scans">Alle Codes entfernen?</string>

app/src/main/res/values-es/strings.xml

@@ -23,6 +23,7 @@
 	<string name="suggested_price">Precio sugerido</string>
 	<string name="upc_ean_extension">Extensión UPC EAN</string>
 	<string name="toggle_flash">Activar la linterna</string>
+	<string name="error_flash">Error toggling flash</string>
 	<string name="share">Compartir</string>
 	<string name="share_as">¿Compartir como?</string>
 	<string name="copy_to_clipboard">Copiar al portapapeles</string>
@@ -45,6 +46,9 @@
 	<string name="bulk_mode">Escanear constantemente</string>
 	<string name="bulk_mode_summary">Siempre iniciar escaneando constantemente</string>
 	<string name="bulk_mode_delay">Delay between continuous scans</string>
+	<string name="restrict_format">Restrict format</string>
+	<string name="remove_restriction">Remove restriction</string>
+	<string name="scan_format">Scan %s</string>
 	<string name="quarter_second">A quarter second</string>
 	<string name="half_second">Half a second</string>
 	<string name="a_second">One second</string>
@@ -93,12 +97,15 @@
 	<string name="clear_network_suggestions_success">Sugerencias de red eliminadas</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Nada que eliminar</string>
 	<string name="send_category">Reenvío</string>
+	<string name="send_scan_active">Forward scans</string>
+	<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
 	<string name="send_scan_url">Enviar todo escaneo a la URL</string>
 	<string name="send_scan_type">Tipo de solicitud para cada escaneo</string>
 	<string name="send_type_get_add_content">GET y solo añadir contenido</string>
 	<string name="send_type_get_query_string">GET con consulta completa</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
+	<string name="send_type_external_browser">Open in external browser</string>
 	<string name="test_url">URL de prueba</string>
 	<string name="really_remove_scan">¿Realmente desea borrar el escaneo seleccionado?</string>
 	<string name="really_remove_all_scans">¿Realmente desea borrar todo lo escaneado?</string>

app/src/main/res/values-fr/strings.xml

@@ -8,6 +8,7 @@
 	<string name="binary_data">(données binaires)</string>
 	<plurals name="barcode_info">
 		<item quantity="one">%2$d caractère, %1$s</item>
+		<item quantity="many">%2$d caractères, %1$s</item>
 		<item quantity="other">%2$d caractères, %1$s</item>
 	</plurals>
 	<string name="error_correction_level">Niveau de correction d\'erreur</string>
@@ -18,11 +19,12 @@
 	<string name="issue_number">Issue number</string>
 	<string name="orientation">Orientation</string>
 	<string name="other_meta_data">Métadonnées</string>
-	<string name="pdf417_extra_metadata">PDF417 métadonnées</string>
+	<string name="pdf417_extra_metadata">Métadonnées PDF417</string>
 	<string name="possible_country">Pays de fabrication possible</string>
 	<string name="suggested_price">Prix suggéré</string>
-	<string name="upc_ean_extension">UPC EAN extension</string>
+	<string name="upc_ean_extension">Extension UPC EAN</string>
 	<string name="toggle_flash">Activer le flash</string>
+	<string name="error_flash">Error toggling flash</string>
 	<string name="share">Partager</string>
 	<string name="share_as">Partager comme ?</string>
 	<string name="copy_to_clipboard">Copier dans le presse-papiers</string>
@@ -43,13 +45,16 @@
 	<string name="info">Info</string>
 	<string name="switch_camera">Changer de camera</string>
 	<string name="bulk_mode">Scan continu</string>
-	<string name="bulk_mode_summary">Always start scanning continuously.</string>
-	<string name="bulk_mode_delay">Delay between continuous scans</string>
-	<string name="quarter_second">A quarter second</string>
-	<string name="half_second">Half a second</string>
-	<string name="a_second">One second</string>
-	<string name="two_seconds">Two seconds</string>
-	<string name="five_seconds">Five seconds</string>
+	<string name="bulk_mode_summary">Toujours démarrer en scannant en continu.</string>
+	<string name="bulk_mode_delay">Délai entre les scans continus</string>
+	<string name="restrict_format">Restrict format</string>
+	<string name="remove_restriction">Remove restriction</string>
+	<string name="scan_format">Scan %s</string>
+	<string name="quarter_second">Un quart de seconde</string>
+	<string name="half_second">Une demi-seconde</string>
+	<string name="a_second">Une seconde</string>
+	<string name="two_seconds">Deux secondes</string>
+	<string name="five_seconds">Cinq secondes</string>
 	<string name="history">Historique</string>
 	<string name="preferences">Préférences</string>
 	<string name="scan_category">Scan</string>
@@ -59,15 +64,15 @@
 	<string name="follow_system_settings">Suivre les réglages du système</string>
 	<string name="show_crop_handle">Afficher le bouton de rognage</string>
 	<string name="show_crop_handle_summary">Restreindre le scan à une région personnalisée.</string>
-	<string name="barcode_formats">Barcode formats</string>
+	<string name="barcode_formats">Formats de codes-barres</string>
 	<string name="zoom_by_swiping">Balayage haut/bas pour zoomer</string>
 	<string name="zoom_by_swiping_summary">Balayez vers le haut ou vers le bas dans l’écran de la caméra pour contrôler le zoom de la caméra.</string>
 	<string name="auto_rotate">Reconnaître les codes-barres 1D verticaux</string>
 	<string name="auto_rotate_summary">Tourner automatiquement le cadre de la  caméra pour reconnaître les codes-barres 1D verticaux. En fonction de l\'appareil, cela peut affecter les performances.</string>
 	<string name="try_harder">Optimiser la précision du lecteur</string>
 	<string name="try_harder_summary">Activez cette option pour les codes très difficiles à lire. Affectera les performances.</string>
-	<string name="show_toast_in_bulk_mode">Show data in continuous mode</string>
-	<string name="show_toast_in_bulk_mode_summary">Briefly show the scanned data when scanning continuously.</string>
+	<string name="show_toast_in_bulk_mode">Afficher les données en mode continu</string>
+	<string name="show_toast_in_bulk_mode_summary">Afficher brièvement les données lors d\'un scan en continu.</string>
 	<string name="vibrate">Vibrer à la détection</string>
 	<string name="vibrate_summary">Activez ceci si vous voulez que votre appareil vibre lorsqu’un code est reconnu.</string>
 	<string name="use_history">Sauvegarder l\'historique des scans</string>
@@ -84,21 +89,24 @@
 	<string name="show_hex_dump_summary">Affiche un dump hexadécimal du contenu scanné.</string>
 	<string name="close_automatically">Revenir après une copie/partage</string>
 	<string name="close_automatically_summary">Revient automatiquement sur l\'écran de scan après avoir copié ou partagé le contenu lu.</string>
-	<string name="default_search_engine">Open unknown data in</string>
-	<string name="always_ask">Always ask</string>
+	<string name="default_search_engine">Ouvrir les données inconnues dans</string>
+	<string name="always_ask">Toujours demander</string>
 	<string name="open_with_url">Ouvrir des données inconnues avec l’URL</string>
-	<string name="clear_network_suggestions">Clear network suggestions</string>
-	<string name="clear_network_suggestions_summary">Remove all of the network suggestions that were previously provided by this app.</string>
-	<string name="really_remove_all_networks">Really remove all networks?</string>
-	<string name="clear_network_suggestions_success">Network suggestions cleared</string>
-	<string name="clear_network_suggestions_nothing_to_remove">Nothing to remove</string>
+	<string name="clear_network_suggestions">Supprimer les suggestions de réseau</string>
+	<string name="clear_network_suggestions_summary">Supprimez toutes les suggestions de réseau précédemment fournies par cette application.</string>
+	<string name="really_remove_all_networks">Supprimer vraiment tous les réseaux ?</string>
+	<string name="clear_network_suggestions_success">Suggestions de réseau supprimées</string>
+	<string name="clear_network_suggestions_nothing_to_remove">Rien à supprimer</string>
 	<string name="send_category">Transfert</string>
+	<string name="send_scan_active">Forward scans</string>
+	<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
 	<string name="send_scan_url">Envoyer chaque scan vers une URL</string>
 	<string name="send_scan_type">Type de requête pour chaque scan</string>
 	<string name="send_type_get_add_content">GET et ajouter simplement le contenu</string>
 	<string name="send_type_get_query_string">GET avec chaîne de requête complète</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
+	<string name="send_type_external_browser">Ouvrir dans un navigateur externe</string>
 	<string name="test_url">Tester l\'URL</string>
 	<string name="really_remove_scan">Supprimer le scan ?</string>
 	<string name="really_remove_all_scans">Supprimer tous les scans ?</string>
@@ -148,14 +156,13 @@
 	<string name="shortcut_preferences">Réglages</string>
 	<string name="background_request_failed">Échec de la requête d\'arrière-plan</string>
 	<string name="entry_type">Type</string>
-	<string name="wifi_network">Wi-Fi network</string>
-	<string name="wifi_ssid">Name</string>
-	<string name="wifi_type">Authentication type</string>
-	<string name="wifi_password">Password</string>
-	<string name="wifi_hidden">Hidden network</string>
-	<string name="wifi_eap">EAP method</string>
-	<string name="wifi_anonymous_identity">Anonymous identity</string>
-	<string name="wifi_identity">Identity</string>
-	<string name="wifi_phase2">Phase 2 method</string>
+	<string name="wifi_network">Réseau Wi-Fi</string>
+	<string name="wifi_ssid">Nom</string>
+	<string name="wifi_type">Type d\'identification</string>
+	<string name="wifi_password">Mot de passe</string>
+	<string name="wifi_hidden">Réseau caché</string>
+	<string name="wifi_eap">Méthode EAP</string>
+	<string name="wifi_anonymous_identity">Identité anonyme</string>
+	<string name="wifi_identity">Identité</string>
+	<string name="wifi_phase2">Méthode de la phase 2</string>
 </resources>
-

app/src/main/res/values-hu/strings.xml

@@ -23,6 +23,7 @@
 	<string name="suggested_price">Ajánlott ár</string>
 	<string name="upc_ean_extension">UPC EAN kiterjesztés</string>
 	<string name="toggle_flash">Vaku be- vagy kikapcsolása</string>
+	<string name="error_flash">Error toggling flash</string>
 	<string name="share">Megosztás</string>
 	<string name="share_as">Megosztja másként?</string>
 	<string name="copy_to_clipboard">Másolás a vágólapra</string>
@@ -45,6 +46,9 @@
 	<string name="bulk_mode">Beolvasás folyamatosan</string>
 	<string name="bulk_mode_summary">Mindig folyamatos beolvasást indítson.</string>
 	<string name="bulk_mode_delay">Folyamatos beolvasások közti késleltetés</string>
+	<string name="restrict_format">Restrict format</string>
+	<string name="remove_restriction">Remove restriction</string>
+	<string name="scan_format">Scan %s</string>
 	<string name="quarter_second">Negyed másodperc</string>
 	<string name="half_second">Fél másodperc</string>
 	<string name="a_second">Egy másodperc</string>
@@ -93,12 +97,15 @@
 	<string name="clear_network_suggestions_success">Hálózati javaslatok törölve</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Nincs mit eltávolítani</string>
 	<string name="send_category">Továbbítás</string>
+	<string name="send_scan_active">Forward scans</string>
+	<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
 	<string name="send_scan_url">Összes beolvasás küldése egy URL-re</string>
 	<string name="send_scan_type">Kérés típusa az egyes beolvasásoknál</string>
 	<string name="send_type_get_add_content">GET és a tartalom egyszerű hozzáadása</string>
 	<string name="send_type_get_query_string">GET a teljes lekérdezési karakterlánccal</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
+	<string name="send_type_external_browser">Open in external browser</string>
 	<string name="test_url">Test URL</string>
 	<string name="really_remove_scan">Valóban eltávolítja a beolvasást?</string>
 	<string name="really_remove_all_scans">Valóban eltávolítja az összes beolvasását?</string>

app/src/main/res/values-in/strings.xml

@@ -22,6 +22,7 @@
 	<string name="suggested_price">Harga yang disarankan</string>
 	<string name="upc_ean_extension">Ekstensi UPC EAN</string>
 	<string name="toggle_flash">Nyala/matikan blitz</string>
+	<string name="error_flash">Error toggling flash</string>
 	<string name="share">Bagikan</string>
 	<string name="share_as">Bagikan sebagai?</string>
 	<string name="copy_to_clipboard">Salin ke clipboard</string>
@@ -44,6 +45,9 @@
 	<string name="bulk_mode">Pindai tanpa henti</string>
 	<string name="bulk_mode_summary">Always start scanning continuously.</string>
 	<string name="bulk_mode_delay">Delay between continuous scans</string>
+	<string name="restrict_format">Restrict format</string>
+	<string name="remove_restriction">Remove restriction</string>
+	<string name="scan_format">Scan %s</string>
 	<string name="quarter_second">A quarter second</string>
 	<string name="half_second">Half a second</string>
 	<string name="a_second">One second</string>
@@ -92,12 +96,15 @@
 	<string name="clear_network_suggestions_success">Network suggestions cleared</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Nothing to remove</string>
 	<string name="send_category">Penerusan</string>
+	<string name="send_scan_active">Forward scans</string>
+	<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
 	<string name="send_scan_url">Kirim setiap pindaian ke URL</string>
 	<string name="send_scan_type">Tipe permintaan untuk setiap pindaian</string>
 	<string name="send_type_get_add_content">GET dan tambahkan konten</string>
 	<string name="send_type_get_query_string">GET dengan kueri lema lengkap</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
+	<string name="send_type_external_browser">Open in external browser</string>
 	<string name="test_url">Test URL</string>
 	<string name="really_remove_scan">Yakin menghapus pindaian?</string>
 	<string name="really_remove_all_scans">Yakin menghapus semua pindaian?</string>

app/src/main/res/values-it/strings.xml

@@ -23,6 +23,7 @@
 	<string name="suggested_price">Prezzo consigliato</string>
 	<string name="upc_ean_extension">Estensione UPC EAN</string>
 	<string name="toggle_flash">Flash</string>
+	<string name="error_flash">Error toggling flash</string>
 	<string name="share">Condividi</string>
 	<string name="share_as">Share as?</string>
 	<string name="copy_to_clipboard">Copia negli appunti</string>
@@ -45,6 +46,9 @@
 	<string name="bulk_mode">Scansione continua</string>
 	<string name="bulk_mode_summary">Always start scanning continuously.</string>
 	<string name="bulk_mode_delay">Delay between continuous scans</string>
+	<string name="restrict_format">Restrict format</string>
+	<string name="remove_restriction">Remove restriction</string>
+	<string name="scan_format">Scan %s</string>
 	<string name="quarter_second">A quarter second</string>
 	<string name="half_second">Half a second</string>
 	<string name="a_second">One second</string>
@@ -93,12 +97,15 @@
 	<string name="clear_network_suggestions_success">Network suggestions cleared</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Nothing to remove</string>
 	<string name="send_category">Inoltro</string>
+	<string name="send_scan_active">Forward scans</string>
+	<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
 	<string name="send_scan_url">Invia ogni scansione ad un URL</string>
 	<string name="send_scan_type">Tipo di richiesta per ogni scansione</string>
 	<string name="send_type_get_add_content">GET e aggiungi il contenuto</string>
 	<string name="send_type_get_query_string">GET con stringa completa della richiesta</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
+	<string name="send_type_external_browser">Open in external browser</string>
 	<string name="test_url">Test URL</string>
 	<string name="really_remove_scan">Vuoi veramente rimuovere la scansione?</string>
 	<string name="really_remove_all_scans">Vuoi veramente rimuovere tutte le scansioni?</string>

app/src/main/res/values-ja/strings.xml

@@ -7,7 +7,6 @@
 	<string name="content">内容</string>
 	<string name="binary_data">(バイナリデータ)</string>
 	<plurals name="barcode_info">
-		<item quantity="one">%2$d 文字, %1$s</item>
 		<item quantity="other">%2$d 文字, %1$s</item>
 	</plurals>
 	<string name="error_correction_level">誤り訂正レベル</string>
@@ -23,6 +22,7 @@
 	<string name="suggested_price">価格</string>
 	<string name="upc_ean_extension">UPC/EAN 拡張型</string>
 	<string name="toggle_flash">フラッシュを切り替え</string>
+	<string name="error_flash">Error toggling flash</string>
 	<string name="share">共有</string>
 	<string name="share_as">画像形式を選択</string>
 	<string name="copy_to_clipboard">クリップボードにコピー</string>
@@ -45,6 +45,9 @@
 	<string name="bulk_mode">まとめてスキャンする</string>
 	<string name="bulk_mode_summary">常に連続してスキャンを行います。</string>
 	<string name="bulk_mode_delay">Delay between continuous scans</string>
+	<string name="restrict_format">Restrict format</string>
+	<string name="remove_restriction">Remove restriction</string>
+	<string name="scan_format">Scan %s</string>
 	<string name="quarter_second">A quarter second</string>
 	<string name="half_second">Half a second</string>
 	<string name="a_second">One second</string>
@@ -93,12 +96,15 @@
 	<string name="clear_network_suggestions_success">ネットワークの提案は消去されました</string>
 	<string name="clear_network_suggestions_nothing_to_remove">消去するものがありませんでした</string>
 	<string name="send_category">転送</string>
+	<string name="send_scan_active">Forward scans</string>
+	<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
 	<string name="send_scan_url">スキャンしたデータを次のURLから開く</string>
 	<string name="send_scan_type">リクエスト方式</string>
 	<string name="send_type_get_add_content">GET でコンテンツを付加</string>
 	<string name="send_type_get_query_string">GET で文字列のコンテンツを付加</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
+	<string name="send_type_external_browser">Open in external browser</string>
 	<string name="test_url">URLをテスト</string>
 	<string name="really_remove_scan">このスキャン履歴を削除しても宜しいですか？</string>
 	<string name="really_remove_all_scans">全てのスキャン履歴を削除しても宜しいですか？</string>

app/src/main/res/values-ka/strings.xml

@@ -8,8 +8,6 @@
 	<string name="binary_data">(ორობითი მონაცემები)</string>
 	<plurals name="barcode_info">
 		<item quantity="one">%2$d სიმბოლო, %1$s</item>
-		<item quantity="few">%2$d სიმბოლო, %1$s</item>
-		<item quantity="many">%2$d სიმბოლო, %1$s</item>
 		<item quantity="other">%2$d სიმბოლო, %1$s</item>
 	</plurals>
 	<string name="error_correction_level">შეცდომების კორექციის დონე</string>
@@ -25,6 +23,7 @@
 	<string name="suggested_price">დაახლოებითი ფასი</string>
 	<string name="upc_ean_extension">UPC EAN გაფართოება</string>
 	<string name="toggle_flash">განათების ჩართვა</string>
+	<string name="error_flash">Error toggling flash</string>
 	<string name="share">გაზიარება</string>
 	<string name="share_as">Share as?</string>
 	<string name="copy_to_clipboard">გაცვლის ბუფერში კოპირება</string>
@@ -47,6 +46,9 @@
 	<string name="bulk_mode">სკანირება უწყვეტად</string>
 	<string name="bulk_mode_summary">Always start scanning continuously.</string>
 	<string name="bulk_mode_delay">Delay between continuous scans</string>
+	<string name="restrict_format">Restrict format</string>
+	<string name="remove_restriction">Remove restriction</string>
+	<string name="scan_format">Scan %s</string>
 	<string name="quarter_second">A quarter second</string>
 	<string name="half_second">Half a second</string>
 	<string name="a_second">One second</string>
@@ -95,12 +97,15 @@
 	<string name="clear_network_suggestions_success">Network suggestions cleared</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Nothing to remove</string>
 	<string name="send_category">გადაგზავნა</string>
+	<string name="send_scan_active">Forward scans</string>
+	<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
 	<string name="send_scan_url">ყოველი სკანირებული შტრიხ-კოდის ბმულის საშუალებით გახსნა</string>
 	<string name="send_scan_type">მოთხოვნის ტიპი ყოველი სკანირებული შტრიხ-კოდისთვის</string>
 	<string name="send_type_get_add_content">GET კონტენტის დამატებით</string>
 	<string name="send_type_get_query_string">GET მოთხოვნის სრული პარამეტრებით</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
+	<string name="send_type_external_browser">Open in external browser</string>
 	<string name="test_url">Test URL</string>
 	<string name="really_remove_scan">ნამდვილად გსურთ სკანირების წაშლა?</string>
 	<string name="really_remove_all_scans">ნამდვილად გსურთ ყველაფრის წაშლა?</string>

app/src/main/res/values-nl/strings.xml

@@ -23,6 +23,7 @@
 	<string name="suggested_price">Adviesprijs</string>
 	<string name="upc_ean_extension">UPC EAN extensie</string>
 	<string name="toggle_flash">Zaklamp aan/uit</string>
+	<string name="error_flash">Error toggling flash</string>
 	<string name="share">Delen</string>
 	<string name="share_as">Delen als?</string>
 	<string name="copy_to_clipboard">Naar klembord kopiëren</string>
@@ -45,8 +46,11 @@
 	<string name="bulk_mode">Continu scannen</string>
 	<string name="bulk_mode_summary">Begin altijd continu te scannen</string>
 	<string name="bulk_mode_delay">Vertraging tussen ononderbroken scans</string>
-	<string name="quarter_second">1/4 seconde</string>
-	<string name="half_second">1/2 seconde</string>
+	<string name="restrict_format">Restrict format</string>
+	<string name="remove_restriction">Remove restriction</string>
+	<string name="scan_format">Scan %s</string>
+	<string name="quarter_second">¼ seconde</string>
+	<string name="half_second">½ seconde</string>
 	<string name="a_second">1 seconde</string>
 	<string name="two_seconds">2 seconden</string>
 	<string name="five_seconds">5 seconden</string>
@@ -84,7 +88,7 @@
 	<string name="show_hex_dump_summary">Hex-dump van de gescande inhoud tonen.</string>
 	<string name="close_automatically">Teruggaan na kopiëren/delen</string>
 	<string name="close_automatically_summary">Automatisch terugkeren naar het scanscherm na het kopiëren of delen van de gelezen inhoud.</string>
-  <string name="default_search_engine">Onbekende data openen in</string>
+	<string name="default_search_engine">Onbekende data openen in</string>
 	<string name="always_ask">Altijd vragen</string>
 	<string name="open_with_url">URL om niet bekende data te openen</string>
 	<string name="clear_network_suggestions">Network suggesties wissen</string>
@@ -93,12 +97,15 @@
 	<string name="clear_network_suggestions_success">Netwerksuggesties gewist</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Niets te wissen</string>
 	<string name="send_category">Doorsturen</string>
+	<string name="send_scan_active">Forward scans</string>
+	<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
 	<string name="send_scan_url">Stuur elke scan naar URL</string>
 	<string name="send_scan_type">Type aanvraag voor elke scan</string>
 	<string name="send_type_get_add_content">GET en gewoon inhoud toevoegen</string>
 	<string name="send_type_get_query_string">GET met volledige query string</string>
 	<string name="send_type_post_form">POST toepassing/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST toepassing/json</string>
+	<string name="send_type_external_browser">Open in external browser</string>
 	<string name="test_url">Test URL</string>
 	<string name="really_remove_scan">Scan echt verwijderen?</string>
 	<string name="really_remove_all_scans">Alle scans echt verwijderen?</string>

app/src/main/res/values-pl/strings.xml

@@ -8,7 +8,7 @@
 	<string name="vevent_add">Dodaj do kalendarza</string>
 	<string name="shortcut_preferences">Ustawienia</string>
 	<string name="share">Udostępnij</string>
-	<string name="share_as">Share as?</string>
+	<string name="share_as">Udostępnij jako?</string>
 	<string name="error_saving_file">Nie można zapisać pliku</string>
 	<string name="clear_history">Wyczyść historię</string>
 	<string name="compose_barcode">Utwórz kod kreskowy</string>
@@ -26,12 +26,12 @@
 	<string name="separator_ruler">Linijka</string>
 	<string name="scan_code">Skanuj kod</string>
 	<string name="error_correction_level">Poziom korekcji błędów</string>
-	<string name="error_correction_level_l" formatted="false">Low (~7&#37; correction)</string>
-	<string name="error_correction_level_m" formatted="false">Medium (~15&#37; correction)</string>
-	<string name="error_correction_level_q" formatted="false">Quartile (~25&#37; correction)</string>
-	<string name="error_correction_level_h" formatted="false">High (~30&#37; correction)</string>
+	<string name="error_correction_level_l" formatted="false">Niski (~7&#37; korekcji)</string>
+	<string name="error_correction_level_m" formatted="false">Średni (~15&#37; korekcji)</string>
+	<string name="error_correction_level_q" formatted="false">Kwartyl (~25&#37; korekcji)</string>
+	<string name="error_correction_level_h" formatted="false">Wysoki (~30&#37; korekcji)</string>
 	<string name="export_csv_comma">CSV z przecinkami</string>
-	<string name="export_csv_semicolon">CSV z średnikami</string>
+	<string name="export_csv_semicolon">CSV ze średnikami</string>
 	<string name="shortcut_encode">Stwórz kod kreskowy</string>
 	<string name="error_file_exists">Plik już istnieje</string>
 	<string name="no_barcode_found">Nie znaleziono kodu kreskowego</string>
@@ -56,24 +56,28 @@
 	<string name="really_remove_selected_scans">Czy naprawdę usunąć wybrane skany?</string>
 	<string name="binary_data">(dane binarne)</string>
 	<string name="show_hex_dump">Pokazuj zrzut szesnastkowy</string>
-	<string name="show_hex_dump_summary">Show a hex dump of the scanned contents.</string>
-	<string name="close_automatically">Go back after Copy/Share</string>
-	<string name="close_automatically_summary">Automatically return to the scan screen after copying or sharing the read contents.</string>
+	<string name="show_hex_dump_summary">Pokaż zeskanowaną zawartośc w postaci szesnastkowej</string>
+	<string name="close_automatically">Wróć po skopiowaniu/udostępnieniu</string>
+	<string name="close_automatically_summary">Automatycznie powracaj do ekranu skanowania po skopiowaniu lub udostępnieniu przeczytanej zawartości.</string>
 	<string name="show_meta_data">Pokazuj metadane</string>
-	<string name="show_meta_data_summary">Show additional data about the scanned barcoded.</string>
+	<string name="show_meta_data_summary">Pokaż dodatkowe dane o zeskanowanym kodzie kreskowym.</string>
 	<string name="switch_camera">Przełącz aparat</string>
-	<string name="bulk_mode">Scan continuously</string>
-	<string name="bulk_mode_summary">Always start scanning continuously.</string>
-	<string name="bulk_mode_delay">Delay between continuous scans</string>
-	<string name="quarter_second">A quarter second</string>
-	<string name="half_second">Half a second</string>
-	<string name="a_second">One second</string>
-	<string name="two_seconds">Two seconds</string>
-	<string name="five_seconds">Five seconds</string>
+	<string name="bulk_mode">Skanuj w sposób ciągły</string>
+	<string name="bulk_mode_summary">Zawsze rozpoczynaj skanowanie w sposób ciągły.</string>
+	<string name="bulk_mode_delay">Opóźnienie między kolejnymi skanami</string>
+	<string name="restrict_format">Restrict format</string>
+	<string name="remove_restriction">Remove restriction</string>
+	<string name="scan_format">Scan %s</string>
+	<string name="quarter_second">Ćwierć sekundy</string>
+	<string name="half_second">Pół sekundy</string>
+	<string name="a_second">Sekunda</string>
+	<string name="two_seconds">Dwie sekundy</string>
+	<string name="five_seconds">Pięć sekund</string>
 	<string name="toggle_flash">Przełącz lampę błyskową</string>
+	<string name="error_flash">Error toggling flash</string>
 	<string name="wifi_added">Wi-Fi dodane</string>
 	<string name="zoom_by_swiping">Przybliżaj kamerę, przesuwając w górę/dół</string>
-	<string name="zoom_by_swiping_summary">Swipe up or down in camera screen to control the camera zoom.</string>
+	<string name="zoom_by_swiping_summary">Przesuń palcem w górę lub w dół na ekranie aparatu, aby sterować powiększeniem aparatu.</string>
 	<string name="view_barcode">Wyświetl kod kreskowy</string>
 	<string name="orientation">Orientacja</string>
 	<string name="error_encoding_barcode">Nie można utworzyć kodu kreskowego</string>
@@ -83,74 +87,77 @@
 	<string name="separator_line_break">Przerwanie linii</string>
 	<string name="shortcut_decode">Zeskanuj kod kreskowy</string>
 	<string name="use_history">Zapisuj historię skanowania</string>
-	<string name="use_history_summary">Save recognized codes on your device.</string>
+	<string name="use_history_summary">Zapisz rozpoznane kody na swoim urządzeniu.</string>
 	<string name="vibrate">Wibruj po wykryciu</string>
-	<string name="vibrate_summary">Enable this if you want your device to vibrate when a code is recognized.</string>
+	<string name="vibrate_summary">Włącz tę opcję, jeśli chcesz, aby urządzenie wibrowało po rozpoznaniu kodu.</string>
 	<string name="open_immediately">Pomiń kontrolę i natychmiast otwórz zawartość</string>
-	<string name="open_immediately_summary">Skip inspection and open contents immediately. May open harmful content if enabled.</string>
-	<string name="copy_immediately">Automatically copy contents into clipboard</string>
-	<string name="copy_immediately_summary">Automatically copy scanned contents into clipboard. Please note that other apps may snoop on your clipboard in the background.</string>
+	<string name="open_immediately_summary">Pomiń kontrolę i natychmiast otwórz zawartość. Może otwierać szkodliwą zawartość, jeśli jest włączona.</string>
+	<string name="copy_immediately">Automatycznie skopiuj zawartość do schowka</string>
+	<string name="copy_immediately_summary">Automatycznie skopiuj zeskanowaną zawartość do schowka. Pamiętaj, że inne aplikacje mogą szpiegować Twój schowek w tle.</string>
 	<string name="show_crop_handle">Pokazuj ogranicznik przycinania</string>
-	<string name="show_crop_handle_summary">Restrict scanning to a customizable region.</string>
-	<string name="barcode_formats">Barcode formats</string>
+	<string name="show_crop_handle_summary">Ogranicz skanowanie do konfigurowalnego regionu.</string>
+	<string name="barcode_formats">Formaty kodów</string>
 	<string name="search_web">Szukaj w sieci</string>
 	<string name="search_scan">Szukaj skanu</string>
 	<string name="export_database">Eksportuj do bazy danych SQLite</string>
 	<string name="ignore_consecutive_duplicates">Nie zapisuj kolejnych duplikatów</string>
-	<string name="ignore_consecutive_duplicates_summary">Do not save consecutive duplicates in the scan history.</string>
-	<string name="default_search_engine">Open unknown data in</string>
-	<string name="always_ask">Always ask</string>
+	<string name="ignore_consecutive_duplicates_summary">Nie zapisuj kolejnych duplikatów w historii skanowania.</string>
+	<string name="default_search_engine">Otwórz nieznane dane w</string>
+	<string name="always_ask">Zawsze pytaj</string>
 	<string name="open_with_url">Otwieraj nieznane dane za pomocą adresu URL</string>
-	<string name="clear_network_suggestions">Clear network suggestions</string>
-	<string name="clear_network_suggestions_summary">Remove all of the network suggestions that were previously provided by this app.</string>
-	<string name="really_remove_all_networks">Really remove all networks?</string>
-	<string name="clear_network_suggestions_success">Network suggestions cleared</string>
-	<string name="clear_network_suggestions_nothing_to_remove">Nothing to remove</string>
-	<string name="send_category">Forwarding</string>
-	<string name="send_scan_url">Send every scan to URL</string>
-	<string name="send_scan_type">Type of request for every scan</string>
-	<string name="send_type_get_add_content">GET and simply add content</string>
-	<string name="send_type_get_query_string">GET with compelete query string</string>
+	<string name="clear_network_suggestions">Wyczyść sugestie z sieci</string>
+	<string name="clear_network_suggestions_summary">Usuń wszystkie sugestie z sieci, które były wcześniej dostarczane przez tę aplikację.</string>
+	<string name="really_remove_all_networks">Naprawdę usunąć wszystkie sieci?</string>
+	<string name="clear_network_suggestions_success">Sugestie dotyczące sieci zostały usunięte</string>
+	<string name="clear_network_suggestions_nothing_to_remove">Nie ma nic do usunięcia</string>
+	<string name="send_category">Przekazywanie</string>
+	<string name="send_scan_active">Forward scans</string>
+	<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
+	<string name="send_scan_url">Wyślij każdy skan na adres URL</string>
+	<string name="send_scan_type">Rodzaj requestu dla każdego skanu</string>
+	<string name="send_type_get_add_content">GET i po prostu dodaj zawartość</string>
+	<string name="send_type_get_query_string">GET z kompletnym query</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
-	<string name="test_url">Test URL</string>
-	<string name="copy_password">Copy password into clipboard</string>
+	<string name="send_type_external_browser">Otwórz w zewnętrznej przeglądarce</string>
+	<string name="test_url">Testuj URL</string>
+	<string name="copy_password">Skopiuj hasło do schowka</string>
 	<string name="copied_password_to_clipboard">Hasło skopiowane do schowka</string>
 	<string name="pdf417_extra_metadata">Metadane PDF417</string>
 	<string name="suggested_price">Sugerowana cena</string>
 	<string name="preferences">Ustawienia</string>
-	<string name="scan_category">Scan</string>
-	<string name="content_category">Content</string>
-	<string name="locale_category">Language</string>
-	<string name="custom_locale">Custom language</string>
-	<string name="follow_system_settings">Follow system settings</string>
+	<string name="scan_category">Skanowanie</string>
+	<string name="content_category">Zawarość</string>
+	<string name="locale_category">Język</string>
+	<string name="custom_locale">Język niestandardowy</string>
+	<string name="follow_system_settings">Zgodny z ustawieniami systemu</string>
 	<string name="decode_barcode">Dekoduj kod kreskowy</string>
 	<string name="upc_ean_extension">Dodatek UPC EAN</string>
 	<string name="possible_country">Możliwy kraj produkcji</string>
 	<string name="encode">ZAKODUJ</string>
 	<string name="error_no_content">Brak zawartości</string>
 	<string name="try_harder">Zoptymalizuj czytnik pod kątem dokładności, a nie prędkości</string>
-	<string name="try_harder_summary">Enable this option for very hard to read codes. Will affect performance.</string>
-	<string name="show_toast_in_bulk_mode">Show data in continuous mode</string>
-	<string name="show_toast_in_bulk_mode_summary">Briefly show the scanned data when scanning continuously.</string>
+	<string name="try_harder_summary">Włącz tę opcję w przypadku bardzo trudnych do odczytania kodów. Wpłynie na wydajność.</string>
+	<string name="show_toast_in_bulk_mode">Pokaż dane w trybie ciągłym</string>
+	<string name="show_toast_in_bulk_mode_summary">Zwięźle pokazuje zeskanowane dane podczas skanowania ciągłego.</string>
 	<string name="cannot_resolve_action">Żadna aplikacja nie może tego otworzyć</string>
 	<string name="width_by_height">%1$d×%2$d</string>
 	<string name="input_content_here">Wprowadź zawartość tutaj</string>
 	<string name="pick_list_separator">Jak oddzielić elementy listy?</string>
 	<string name="enter_name">Wprowadź nazwę opisującą skan</string>
 	<string name="auto_rotate">Rozpoznawaj kody kreskowe 1D pionowo</string>
-	<string name="auto_rotate_summary">Automatically rotate the camera frame to recognize vertical 1D barcodes. Depending on the device, this may affect performance.</string>
+	<string name="auto_rotate_summary">Automatycznie obracaj ramkę aparatu, aby rozpoznać pionowe kody kreskowe 1D. W zależności od urządzenia może to mieć wpływ na wydajność.</string>
 	<string name="save_as_file_name">Jak zapisać plik w pobranych?</string>
 	<string name="issue_number">Numer wydania</string>
-	<string name="background_request_failed">Background request failed</string>
-	<string name="entry_type">Type</string>
-	<string name="wifi_network">Wi-Fi network</string>
-	<string name="wifi_ssid">Name</string>
-	<string name="wifi_type">Authentication type</string>
-	<string name="wifi_password">Password</string>
-	<string name="wifi_hidden">Hidden network</string>
-	<string name="wifi_eap">EAP method</string>
-	<string name="wifi_anonymous_identity">Anonymous identity</string>
-	<string name="wifi_identity">Identity</string>
-	<string name="wifi_phase2">Phase 2 method</string>
+	<string name="background_request_failed">Żądanie w tle nie powiodło się</string>
+	<string name="entry_type">Typ</string>
+	<string name="wifi_network">Sieć Wi-Fi</string>
+	<string name="wifi_ssid">Nazwa</string>
+	<string name="wifi_type">Typ uwierzytelnienia</string>
+	<string name="wifi_password">Hasło</string>
+	<string name="wifi_hidden">Sieć ukryta</string>
+	<string name="wifi_eap">Metoda EAP</string>
+	<string name="wifi_anonymous_identity">Anonimowa tożsamość</string>
+	<string name="wifi_identity">Tożsamość</string>
+	<string name="wifi_phase2">Metoda fazy 2</string>
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -23,6 +23,7 @@
 	<string name="suggested_price">Preço sugerido</string>
 	<string name="upc_ean_extension">Extensão UPC EAN</string>
 	<string name="toggle_flash">Ativar lanterna</string>
+	<string name="error_flash">Error toggling flash</string>
 	<string name="share">Compartilhar</string>
 	<string name="share_as">Compartilhar como?</string>
 	<string name="copy_to_clipboard">Copiar ao Clipboard</string>
@@ -45,6 +46,9 @@
 	<string name="bulk_mode">Escanear continuamente</string>
 	<string name="bulk_mode_summary">Sempre comece em modo contínuo.</string>
 	<string name="bulk_mode_delay">Atrasar em escaneamentos contínuos</string>
+	<string name="restrict_format">Restrict format</string>
+	<string name="remove_restriction">Remove restriction</string>
+	<string name="scan_format">Scan %s</string>
 	<string name="quarter_second">Um quarto de segundo</string>
 	<string name="half_second">Meio segundo</string>
 	<string name="a_second">Um segundo</string>
@@ -93,12 +97,15 @@
 	<string name="clear_network_suggestions_success">Sugestões da rede removidas</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Nada para remover</string>
 	<string name="send_category">Encaminhar</string>
+	<string name="send_scan_active">Forward scans</string>
+	<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
 	<string name="send_scan_url">Enviar cada escaneamento para URL</string>
 	<string name="send_scan_type">Tipo de pedido para cada escaneamento</string>
 	<string name="send_type_get_add_content">GET e simplesmente adicionar conteúdo</string>
 	<string name="send_type_get_query_string">GET com cadeia de consulta completa</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
+	<string name="send_type_external_browser">Open in external browser</string>
 	<string name="test_url">Testar URL</string>
 	<string name="really_remove_scan">Realmente quer remover o escaneamento?</string>
 	<string name="really_remove_all_scans">Realmente quer remover todos os escaneamentos?</string>

app/src/main/res/values-ru-rRU/strings.xml

@@ -25,6 +25,7 @@
 	<string name="suggested_price">Предположительная цена</string>
 	<string name="upc_ean_extension">Расширение UPC EAN</string>
 	<string name="toggle_flash">Включить вспышку</string>
+	<string name="error_flash">Ошибка при переключении вспышки</string>
 	<string name="share">Поделиться</string>
 	<string name="share_as">Поделиться как?</string>
 	<string name="copy_to_clipboard">Скопировать в буфер обмена</string>
@@ -47,6 +48,9 @@
 	<string name="bulk_mode">Непрерывное сканирование</string>
 	<string name="bulk_mode_summary">Всегда запускать непрерывное сканирование.</string>
 	<string name="bulk_mode_delay">Задержка непрерывного сканирования</string>
+	<string name="restrict_format">Исключить формат</string>
+	<string name="remove_restriction">Включить формат</string>
+	<string name="scan_format">Сканировать %s</string>
 	<string name="quarter_second">Четверть секунды</string>
 	<string name="half_second">Полсекунды</string>
 	<string name="a_second">Одну секунду</string>
@@ -95,12 +99,15 @@
 	<string name="clear_network_suggestions_success">Сетевые предложения удалены</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Нечего удалять</string>
 	<string name="send_category">Отправка</string>
-	<string name="send_scan_url">Отправлять сканированные штрих-коды на URL</string>
+	<string name="send_scan_active">Отправлять сканирования</string>
+	<string name="send_scan_active_summary">Пересылать сканированные данные на указанный URL.</string>
+	<string name="send_scan_url">URL для отправки</string>
 	<string name="send_scan_type">Тип запроса для отправки штрих-кодов</string>
 	<string name="send_type_get_add_content">GET с добавлением содержимого</string>
 	<string name="send_type_get_query_string">GET с полной строкой параметров запроса</string>
-	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
-	<string name="send_type_post_json">POST application/json</string>
+	<string name="send_type_post_form">POST-приложение/x-www-form-urlencoded</string>
+	<string name="send_type_post_json">POST-приложение/json</string>
+	<string name="send_type_external_browser">Открыть во внешнем браузере</string>
 	<string name="test_url">Проверка URL</string>
 	<string name="really_remove_scan">Удалить сканирование?</string>
 	<string name="really_remove_all_scans">Удалить все сканирования?</string>

app/src/main/res/values-tr/strings.xml

@@ -23,6 +23,7 @@
 	<string name="suggested_price">Önerilen fiyat</string>
 	<string name="upc_ean_extension">UPC EAN eklentisi</string>
 	<string name="toggle_flash">Flaşı aç</string>
+	<string name="error_flash">Error toggling flash</string>
 	<string name="share">Paylaş</string>
 	<string name="share_as">Şöyle paylaş:</string>
 	<string name="copy_to_clipboard">Panoya kopyala</string>
@@ -45,6 +46,9 @@
 	<string name="bulk_mode">Sürekli tara</string>
 	<string name="bulk_mode_summary">Her zaman sürekli taramaya başla.</string>
 	<string name="bulk_mode_delay">Sürekli taramalar arasındaki gecikme</string>
+	<string name="restrict_format">Restrict format</string>
+	<string name="remove_restriction">Remove restriction</string>
+	<string name="scan_format">Scan %s</string>
 	<string name="quarter_second">Çeyrek saniye</string>
 	<string name="half_second">Yarım saniye</string>
 	<string name="a_second">Bir saniye</string>
@@ -93,12 +97,15 @@
 	<string name="clear_network_suggestions_success">Ağ önerileri temizlendi</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Kaldırılacak bir şey yok</string>
 	<string name="send_category">Yönlendirme</string>
+	<string name="send_scan_active">Forward scans</string>
+	<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
 	<string name="send_scan_url">Her taramayı URL\'ye gönder</string>
 	<string name="send_scan_type">Her tarama için isteğin türü</string>
 	<string name="send_type_get_add_content">GET ve basitçe içeriği ekle</string>
 	<string name="send_type_get_query_string">GET ile tam sorgu dizgesi</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
+	<string name="send_type_external_browser">Harici tarayıcıda aç</string>
 	<string name="test_url">URL\'yi sına</string>
 	<string name="really_remove_scan">Tarama gerçekten silinsin mi?</string>
 	<string name="really_remove_all_scans">Tüm taramalar gerçekten silinsin mi?</string>

app/src/main/res/values-uk/strings.xml

@@ -24,6 +24,7 @@
 	<string name="suggested_price">Рекомендована ціна</string>
 	<string name="upc_ean_extension">Розширення UPC EAN</string>
 	<string name="toggle_flash">Увімкнути спалах</string>
+	<string name="error_flash">Error toggling flash</string>
 	<string name="share">Поділитися</string>
 	<string name="share_as">Поділитися як?</string>
 	<string name="copy_to_clipboard">Копіювати у буфер обміну</string>
@@ -46,6 +47,9 @@
 	<string name="bulk_mode">Сканувати безперервно</string>
 	<string name="bulk_mode_summary">Завжди починати безперервне сканування.</string>
 	<string name="bulk_mode_delay">Затримка між безперервним скануванням</string>
+	<string name="restrict_format">Restrict format</string>
+	<string name="remove_restriction">Remove restriction</string>
+	<string name="scan_format">Scan %s</string>
 	<string name="quarter_second">Чверть секунди</string>
 	<string name="half_second">Півсекунди</string>
 	<string name="a_second">Одна секунда</string>
@@ -94,12 +98,15 @@
 	<string name="clear_network_suggestions_success">Мережеві пропозиції очищено</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Нічого видаляти</string>
 	<string name="send_category">Пересилання</string>
+	<string name="send_scan_active">Forward scans</string>
+	<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
 	<string name="send_scan_url">Надсилати кожне сканування на URL</string>
 	<string name="send_scan_type">Тип запиту для кожного сканування</string>
 	<string name="send_type_get_add_content">GET і просто додати контент</string>
 	<string name="send_type_get_query_string">GET з повним рядком параметрів запиту</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
+	<string name="send_type_external_browser">Відкрити у зовнішньому браузері</string>
 	<string name="test_url">Перевірити URL</string>
 	<string name="really_remove_scan">Дійсно видалити сканування?</string>
 	<string name="really_remove_all_scans">Дійсно видалити всі сканування?</string>

app/src/main/res/values-vi/strings.xml

@@ -7,7 +7,6 @@
 	<string name="content">Nội dung</string>
 	<string name="binary_data">(thông tin dạng nhị phân)</string>
 	<plurals name="barcode_info">
-		<item quantity="one">%2$d ký tự, %1$s</item>
 		<item quantity="other">%2$d ký tự, %1$s</item>
 	</plurals>
 	<string name="error_correction_level">Mức độ tự sửa mã</string>
@@ -23,6 +22,7 @@
 	<string name="suggested_price">Giá được gợi ý</string>
 	<string name="upc_ean_extension">Phần mở rộng UPC EAN</string>
 	<string name="toggle_flash">Bật/tắt đèn</string>
+	<string name="error_flash">Error toggling flash</string>
 	<string name="share">Chia sẻ</string>
 	<string name="share_as">Chia sẻ dưới định dạng?</string>
 	<string name="copy_to_clipboard">Sao chép</string>
@@ -45,6 +45,9 @@
 	<string name="bulk_mode">Quét liên tục</string>
 	<string name="bulk_mode_summary">Luôn quét liên tục.</string>
 	<string name="bulk_mode_delay">Thời gian giữa các lần quét</string>
+	<string name="restrict_format">Restrict format</string>
+	<string name="remove_restriction">Remove restriction</string>
+	<string name="scan_format">Scan %s</string>
 	<string name="quarter_second">Một phần tư giây</string>
 	<string name="half_second">Nửa giây</string>
 	<string name="a_second">Một giây</string>
@@ -93,12 +96,15 @@
 	<string name="clear_network_suggestions_success">Gợi ý mạng đã xoá</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Không còn gì để xoá</string>
 	<string name="send_category">Chuyển tới</string>
+	<string name="send_scan_active">Forward scans</string>
+	<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
 	<string name="send_scan_url">Gửi tất cả mã quét được đến URL</string>
 	<string name="send_scan_type">Kiểu yêu cầu đối với mỗi lần quét</string>
 	<string name="send_type_get_add_content">GET và chỉ thêm nội dung</string>
 	<string name="send_type_get_query_string">GET với xâu truy vấn đầy đủ</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
+	<string name="send_type_external_browser">Open in external browser</string>
 	<string name="test_url">URL thử</string>
 	<string name="really_remove_scan">Thật sự xoá lần quét này?</string>
 	<string name="really_remove_all_scans">Thật sự xoá tất cả các lần quét?</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -1,35 +1,36 @@
 <resources>
-	<string name="no_camera_no_fun">没给我相机权限，不给你扫了，哼！</string>
+	<string name="no_camera_no_fun">没有相机权限的话，该应用没有任何意义。再见！</string>
 	<string name="camera_error">无法访问相机，请重试。</string>
-	<string name="scan_code">扫描</string>
-	<string name="compose_barcode">制作条形码</string>
-	<string name="decode_barcode">解码条形码</string>
+	<string name="scan_code">扫码</string>
+	<string name="compose_barcode">生成条码</string>
+	<string name="decode_barcode">解析条码</string>
 	<string name="content">内容</string>
 	<string name="binary_data">（二进制数据）</string>
 	<plurals name="barcode_info">
 		<item quantity="other">%2$d 字符， %1$s</item>
 	</plurals>
 	<string name="error_correction_level">纠错级别</string>
-	<string name="error_correction_level_l" formatted="false">低 (~7&#37; correction)</string>
-	<string name="error_correction_level_m" formatted="false">中 (~15&#37; correction)</string>
-	<string name="error_correction_level_q" formatted="false">Quartile (~25&#37; correction)</string>
-	<string name="error_correction_level_h" formatted="false">高 (~30&#37; correction)</string>
+	<string name="error_correction_level_l" formatted="false">Low (~7&#37; 准确度)</string>
+	<string name="error_correction_level_m" formatted="false">Medium (~15&#37; 准确度)</string>
+	<string name="error_correction_level_q" formatted="false">Quartile (~25&#37; 准确度)</string>
+	<string name="error_correction_level_h" formatted="false">High (~30&#37; 准确度)</string>
 	<string name="issue_number">发行编号</string>
 	<string name="orientation">方向</string>
 	<string name="other_meta_data">元数据</string>
 	<string name="pdf417_extra_metadata">PDF417 元数据</string>
 	<string name="possible_country">可能产地</string>
-	<string name="suggested_price">隐含价格</string>
+	<string name="suggested_price">建议价格</string>
 	<string name="upc_ean_extension">UPC EAN 扩展</string>
 	<string name="toggle_flash">开关闪光灯</string>
+	<string name="error_flash">开关闪光灯出错</string>
 	<string name="share">分享</string>
-	<string name="share_as">以何种方式分享?</string>
+	<string name="share_as">以何种方式分享？</string>
 	<string name="copy_to_clipboard">复制到剪贴板</string>
 	<string name="copied_to_clipboard">已复制到剪贴板</string>
 	<string name="copy_password">复制密码到剪贴板</string>
 	<string name="copied_password_to_clipboard">已复制密码到剪贴板</string>
 	<string name="open_url">打开链接</string>
-	<string name="cannot_resolve_action">没有相关APP可以打开它</string>
+	<string name="cannot_resolve_action">没有应用可以打开它</string>
 	<string name="pick_search_engine">选择一个搜索引擎</string>
 	<string name="format">编码格式</string>
 	<string name="size">图片尺寸</string>
@@ -37,18 +38,21 @@
 	<string name="input_content_here">在这里输入内容</string>
 	<string name="encode">编码</string>
 	<string name="error_no_content">缺少内容</string>
-	<string name="error_encoding_barcode">无法生成条形码</string>
-	<string name="view_barcode">查看条形码</string>
+	<string name="error_encoding_barcode">无法生成条码</string>
+	<string name="view_barcode">查看条码</string>
 	<string name="info">关于</string>
 	<string name="switch_camera">切换摄像头</string>
 	<string name="bulk_mode">连续扫描</string>
 	<string name="bulk_mode_summary">始终开启连续扫描</string>
-	<string name="bulk_mode_delay">Delay between continuous scans</string>
-	<string name="quarter_second">A quarter second</string>
-	<string name="half_second">Half a second</string>
-	<string name="a_second">One second</string>
-	<string name="two_seconds">Two seconds</string>
-	<string name="five_seconds">Five seconds</string>
+	<string name="bulk_mode_delay">连续扫描之间的延迟</string>
+	<string name="restrict_format">受限格式</string>
+	<string name="remove_restriction">解除限制</string>
+	<string name="scan_format">扫描 %s</string>
+	<string name="quarter_second">四分之一秒</string>
+	<string name="half_second">半秒</string>
+	<string name="a_second">一秒</string>
+	<string name="two_seconds">两秒</string>
+	<string name="five_seconds">五秒</string>
 	<string name="history">历史</string>
 	<string name="preferences">首选项</string>
 	<string name="scan_category">扫描</string>
@@ -56,19 +60,19 @@
 	<string name="locale_category">语言</string>
 	<string name="custom_locale">设定语言</string>
 	<string name="follow_system_settings">跟随系统设置</string>
-	<string name="show_crop_handle">限制扫描区域</string>
+	<string name="show_crop_handle">限制扫描范围</string>
 	<string name="show_crop_handle_summary">把扫描区域限制在选定范围内</string>
-	<string name="barcode_formats">Barcode formats</string>
+	<string name="barcode_formats">条码格式</string>
 	<string name="zoom_by_swiping">上下滑动缩放</string>
 	<string name="zoom_by_swiping_summary">通过上下滑动在扫描界面控制相机缩放</string>
-	<string name="auto_rotate">识别竖直的1D条形码</string>
-	<string name="auto_rotate_summary">自动旋转相机以识别竖直的1D条形码（可能会影响一些设备的扫描性能）</string>
+	<string name="auto_rotate">识别竖直的 1D 条形码</string>
+	<string name="auto_rotate_summary">自动旋转相机以识别竖直的 1D 条形码（可能会影响一些设备的扫描性能）</string>
 	<string name="try_harder">提高扫描精度</string>
-	<string name="try_harder_summary">扫描很难识别的条形码时可启用该选项，但会降低扫描速度</string>
+	<string name="try_harder_summary">扫描很难识别的条码时可启用该选项！会影响性能</string>
 	<string name="show_toast_in_bulk_mode">在连续扫描模式中显示数据</string>
 	<string name="show_toast_in_bulk_mode_summary">连续扫描时简要显示扫描数据。</string>
-	<string name="vibrate">振动提示</string>
-	<string name="vibrate_summary">扫描完成时振动提示</string>
+	<string name="vibrate">识别时震动</string>
+	<string name="vibrate_summary">如果你希望在识别到条码后震动设备，请启用该选项。</string>
 	<string name="use_history">保存扫描历史</string>
 	<string name="use_history_summary">在本地保存扫描历史</string>
 	<string name="ignore_consecutive_duplicates">不保存重复历史</string>
@@ -76,28 +80,31 @@
 	<string name="open_immediately">不查看内容立即打开</string>
 	<string name="open_immediately_summary">可能会打开有害内容</string>
 	<string name="copy_immediately">自动复制扫描结果到剪贴板</string>
-	<string name="copy_immediately_summary">注意其他APP可能会在后台监控剪贴板</string>
+	<string name="copy_immediately_summary">注意其他 APP 可能会在后台监控剪贴板</string>
 	<string name="show_meta_data">显示元数据</string>
-	<string name="show_meta_data_summary">显示已扫描条形码的额外数据</string>
+	<string name="show_meta_data_summary">显示已扫描条码的额外数据</string>
 	<string name="show_hex_dump">显示16进制数据</string>
-	<string name="show_hex_dump_summary">显示已扫描条形码的16进制数据</string>
+	<string name="show_hex_dump_summary">显示已扫描条码的16进制数据</string>
 	<string name="close_automatically">复制/分享后自动返回</string>
 	<string name="close_automatically_summary">复制或分享读取的内容后自动返回扫描主界面。</string>
-	<string name="default_search_engine">Open unknown data in</string>
-	<string name="always_ask">Always ask</string>
-	<string name="open_with_url">使用URL打开未知数据</string>
-	<string name="clear_network_suggestions">Clear network suggestions</string>
-	<string name="clear_network_suggestions_summary">Remove all of the network suggestions that were previously provided by this app.</string>
-	<string name="really_remove_all_networks">Really remove all networks?</string>
-	<string name="clear_network_suggestions_success">Network suggestions cleared</string>
-	<string name="clear_network_suggestions_nothing_to_remove">Nothing to remove</string>
+	<string name="default_search_engine">打开未知数据方式</string>
+	<string name="always_ask">总是询问</string>
+	<string name="open_with_url">使用 URL 打开未知数据</string>
+	<string name="clear_network_suggestions">清除网络建议</string>
+	<string name="clear_network_suggestions_summary">清除该应用之前提供的所有网络建议。</string>
+	<string name="really_remove_all_networks">确定清除所有网络建议？</string>
+	<string name="clear_network_suggestions_success">网络建议已清除</string>
+	<string name="clear_network_suggestions_nothing_to_remove">无内容可清除</string>
 	<string name="send_category">转发</string>
-	<string name="send_scan_url">将每个扫描结果发送到URL</string>
+	<string name="send_scan_active">转发扫描</string>
+	<string name="send_scan_active_summary">启用以转发扫描到给定的 URL</string>
+	<string name="send_scan_url">要转发的 URL</string>
 	<string name="send_scan_type">请求类型</string>
 	<string name="send_type_get_add_content">GET 简单附加数据</string>
 	<string name="send_type_get_query_string">GET 完整查询数据</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
+	<string name="send_type_external_browser">在外部浏览器中打开</string>
 	<string name="test_url">测试 URL</string>
 	<string name="really_remove_scan">确定删除记录？</string>
 	<string name="really_remove_all_scans">确定删除全部记录？</string>
@@ -108,7 +115,7 @@
 	<string name="remove_scan">删除所选记录</string>
 	<string name="enter_name">输入名称</string>
 	<string name="enter_name_hint">扫描描述</string>
-	<string name="no_barcode_found">未找到条形码</string>
+	<string name="no_barcode_found">未找到条码</string>
 	<string name="pick_list_separator">如何分隔列表项？</string>
 	<string name="separator_line_break">换行符</string>
 	<string name="separator_ruler">分割线</string>
@@ -116,9 +123,9 @@
 	<string name="file_name">文件名</string>
 	<string name="error_saving_file">无法保存文件</string>
 	<string name="error_file_exists">文件已存在</string>
-	<string name="connect_to_wifi">连接到WiFi</string>
-	<string name="wifi_config_failed">无法配置WiFi</string>
-	<string name="wifi_added">WiFi已添加</string>
+	<string name="connect_to_wifi">连接到 WiFi</string>
+	<string name="wifi_config_failed">无法配置 WiFi</string>
+	<string name="wifi_added">WiFi 已添加</string>
 	<string name="sms_send">发送短信</string>
 	<string name="sms_error">无法发送短信</string>
 	<string name="tel_dial">拨打号码</string>
@@ -134,26 +141,26 @@
 	<string name="search_scan">搜索扫描记录</string>
 	<string name="export_to_file">导出为文件</string>
 	<string name="export_as">另存为？</string>
-	<string name="export_csv_comma">逗号分隔的CSV</string>
-	<string name="export_csv_semicolon">分号分隔的CSV</string>
+	<string name="export_csv_comma">逗号分隔的 CSV</string>
+	<string name="export_csv_semicolon">分号分隔的 CSV</string>
 	<string name="export_json">JSON</string>
-	<string name="export_database">导出SQLite数据库</string>
+	<string name="export_database">导出 SQLite 数据库</string>
 	<string name="saved_in_downloads">已保存到下载目录</string>
 	<string name="rotate_image_cw">旋转图片</string>
 	<string name="pick_file">选择图片文件</string>
 	<string name="pick_code_to_scan">选择扫描编码</string>
-	<string name="shortcut_decode">扫描条形码</string>
-	<string name="shortcut_encode">创建条形码</string>
+	<string name="shortcut_decode">扫描条码</string>
+	<string name="shortcut_encode">创建条码</string>
 	<string name="shortcut_preferences">设置</string>
 	<string name="background_request_failed">后台请求失败</string>
-	<string name="entry_type">Type</string>
-	<string name="wifi_network">Wi-Fi network</string>
-	<string name="wifi_ssid">Name</string>
-	<string name="wifi_type">Authentication type</string>
-	<string name="wifi_password">Password</string>
-	<string name="wifi_hidden">Hidden network</string>
-	<string name="wifi_eap">EAP method</string>
-	<string name="wifi_anonymous_identity">Anonymous identity</string>
-	<string name="wifi_identity">Identity</string>
-	<string name="wifi_phase2">Phase 2 method</string>
+	<string name="entry_type">类型</string>
+	<string name="wifi_network">Wi-Fi 网络</string>
+	<string name="wifi_ssid">名称</string>
+	<string name="wifi_type">认证类型</string>
+	<string name="wifi_password">密码</string>
+	<string name="wifi_hidden">隐藏的网络</string>
+	<string name="wifi_eap">EAP 方法</string>
+	<string name="wifi_anonymous_identity">匿名身份</string>
+	<string name="wifi_identity">身份</string>
+	<string name="wifi_phase2">阶段 2 方法</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -7,7 +7,6 @@
 	<string name="content">内容</string>
 	<string name="binary_data">(二進位資料)</string>
 	<plurals name="barcode_info">
-		<item quantity="one">%2$d 個字元，%1$s</item>
 		<item quantity="other">%2$d 個字元，%1$s</item>
 	</plurals>
 	<string name="error_correction_level">糾錯等級</string>
@@ -23,6 +22,7 @@
 	<string name="suggested_price">建議價格</string>
 	<string name="upc_ean_extension">UPC EAN 擴充</string>
 	<string name="toggle_flash">開關閃光燈</string>
+	<string name="error_flash">Error toggling flash</string>
 	<string name="share">分享</string>
 	<string name="share_as">以何種方式分享?</string>
 	<string name="copy_to_clipboard">複製到剪貼簿</string>
@@ -45,6 +45,9 @@
 	<string name="bulk_mode">連續掃描</string>
 	<string name="bulk_mode_summary">始終開啟連續掃描。</string>
 	<string name="bulk_mode_delay">連續掃描間的延遲</string>
+	<string name="restrict_format">Restrict format</string>
+	<string name="remove_restriction">Remove restriction</string>
+	<string name="scan_format">Scan %s</string>
 	<string name="quarter_second">四分之一秒</string>
 	<string name="half_second">半秒</string>
 	<string name="a_second">一秒</string>
@@ -93,12 +96,15 @@
 	<string name="clear_network_suggestions_success">網路建議已清除</string>
 	<string name="clear_network_suggestions_nothing_to_remove">沒有什麼可以移除的</string>
 	<string name="send_category">轉發</string>
+	<string name="send_scan_active">Forward scans</string>
+	<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
 	<string name="send_scan_url">將每個掃描結果傳送到 URL</string>
 	<string name="send_scan_type">每次掃描的請求類型</string>
 	<string name="send_type_get_add_content">GET 簡單附加資料</string>
 	<string name="send_type_get_query_string">GET 完整查詢資料</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
+	<string name="send_type_external_browser">Open in external browser</string>
 	<string name="test_url">測試 URL</string>
 	<string name="really_remove_scan">確定刪除記錄?</string>
 	<string name="really_remove_all_scans">確定刪除全部掃描記錄?</string>

app/src/main/res/values/locales.xml

@@ -10,7 +10,7 @@
 		<item>Italian</item>
 		<item>Georgian</item>
 		<item>Dutch</item>
-		<item>Polish</item>
+		<item>Polski</item>
 		<item>Portuguese (Brazil)</item>
 		<item>Russian</item>
 		<item>Turkish</item>

app/src/main/res/values/send_types.xml

@@ -4,11 +4,13 @@
 		<item>@string/send_type_get_query_string</item>
 		<item>@string/send_type_post_form</item>
 		<item>@string/send_type_post_json</item>
+		<item>@string/send_type_external_browser</item>
 	</string-array>
 	<string-array name="send_type_values">
 		<item>0</item>
 		<item>1</item>
 		<item>2</item>
 		<item>3</item>
+		<item>4</item>
 	</string-array>
 </resources>

app/src/main/res/values/strings.xml

@@ -23,6 +23,7 @@
 	<string name="suggested_price">Suggested price</string>
 	<string name="upc_ean_extension">UPC EAN extension</string>
 	<string name="toggle_flash">Toggle flash</string>
+	<string name="error_flash">Error toggling flash</string>
 	<string name="share">Share</string>
 	<string name="share_as">Share as?</string>
 	<string name="copy_to_clipboard">Copy to clipboard</string>
@@ -45,6 +46,9 @@
 	<string name="bulk_mode">Scan continuously</string>
 	<string name="bulk_mode_summary">Always start scanning continuously.</string>
 	<string name="bulk_mode_delay">Delay between continuous scans</string>
+	<string name="restrict_format">Restrict format</string>
+	<string name="remove_restriction">Remove restriction</string>
+	<string name="scan_format">Scan %s</string>
 	<string name="quarter_second">A quarter second</string>
 	<string name="half_second">Half a second</string>
 	<string name="a_second">One second</string>
@@ -93,12 +97,15 @@
 	<string name="clear_network_suggestions_success">Network suggestions cleared</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Nothing to remove</string>
 	<string name="send_category">Forwarding</string>
-	<string name="send_scan_url">Send every scan to URL</string>
-	<string name="send_scan_type">Type of request for every scan</string>
+	<string name="send_scan_active">Forward scans</string>
+	<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
+	<string name="send_scan_url">URL to forward to</string>
+	<string name="send_scan_type">Request type</string>
 	<string name="send_type_get_add_content">GET and simply add content</string>
-	<string name="send_type_get_query_string">GET with compelete query string</string>
+	<string name="send_type_get_query_string">GET with complete query string</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
+	<string name="send_type_external_browser">Open in external browser</string>
 	<string name="test_url">Test URL</string>
 	<string name="really_remove_scan">Really remove scan?</string>
 	<string name="really_remove_all_scans">Really remove all scans?</string>

app/src/main/res/xml-v11/preferences.xml

@@ -66,6 +66,11 @@
 			android:summary="@string/copy_immediately_summary"/>
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/send_category">
+		<android.support.v7.preference.SwitchPreferenceCompat
+			android:defaultValue="true"
+			android:key="send_scan_active"
+			android:title="@string/send_scan_active"
+			android:summary="@string/send_scan_active_summary"/>
 		<de.markusfisch.android.binaryeye.preference.UrlPreference
 			android:key="send_scan_url"
 			android:title="@string/send_scan_url"/>

app/src/main/res/xml/extraction_rules.xml

@@ -0,0 +1,8 @@
+<data-extraction-rules>
+	<cloud-backup>
+		<include domain="root" path="."/>
+	</cloud-backup>
+	<device-transfer>
+		<include domain="root" path="."/>
+	</device-transfer>
+</data-extraction-rules>

app/src/main/res/xml/preferences.xml

@@ -61,6 +61,11 @@
 			android:summary="@string/copy_immediately_summary"/>
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/send_category">
+		<android.support.v7.preference.SwitchPreferenceCompat
+			android:defaultValue="true"
+			android:key="send_scan_active"
+			android:title="@string/send_scan_active"
+			android:summary="@string/send_scan_active_summary"/>
 		<de.markusfisch.android.binaryeye.preference.UrlPreference
 			android:key="send_scan_url"
 			android:title="@string/send_scan_url"/>

build.gradle

@@ -1,9 +1,8 @@
 buildscript {
 	ext {
-		kotlin_version = '1.6.0'
-		tools_version = '7.0.4'
-		build_tools_version = '30.0.2'
-		sdk_version = 30
+		kotlin_version = '1.6.10'
+		tools_version = '7.1.2'
+		sdk_version = 32
 		support_version = '25.3.1'
 	}
 

fastlane/metadata/android/en-US/changelogs/90.txt

@@ -0,0 +1,5 @@
+* Fix cropping still images
+* Improve usability of zoom slider
+* Update Dutch translation
+* Update Chinese translation
+

fastlane/metadata/android/en-US/changelogs/91.txt

@@ -0,0 +1,3 @@
+* Add forwarding into external browser
+* Fix visibility of zoom slider when switching cameras
+

fastlane/metadata/android/en-US/changelogs/92.txt

@@ -0,0 +1,11 @@
+* Add a menu item to temporarily scan a certain format only
+* Add a monochome launcher icon for Android 13
+* Show alpha numeric characters in binary data
+* Fix showing binary data label for scans from the history
+* Fix handling empty meta strings
+* Update Turkish translation
+* Update Ukrainian translation
+* Update French translation
+* Update Polish translation
+* Update Russian translation
+

fastlane/metadata/android/en-US/changelogs/93.txt

@@ -0,0 +1,2 @@
+* Fix broken detection of binary content
+

fastlane/metadata/android/en-US/changelogs/94.txt

@@ -0,0 +1,7 @@
+* Add a setting to quickly enable/disable forwarding
+* Stop playing error beep when in silent mode
+* Improve enabling/disabling torch mode
+* Update to latest ZXing version
+* Update German translation
+* Update Russian translation
+

fastlane/metadata/android/en-US/changelogs/95.txt

@@ -0,0 +1,4 @@
+* Update Simplified Chinese translation
+* Return directly to caller for deep links
+* Fix metadata for deep links
+

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Oct 18 14:14:42 CEST 2020
+#Wed Jan 26 11:58:22 CET 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

svg/ic_launcher_monochrome.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="90px" height="90px" viewBox="0 0 90 90" id="svg2" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<circle style="fill-opacity: 1; stroke: none; stroke-width: 4; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-opacity: 1;" id="path5437" cx="45" cy="45" r="18"/>
+<circle r="13.262" cy="45.264" cx="45.263" id="circle5467" style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
+<circle style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="circle5451" cx="44.885" cy="45.704" r="7.255"/>
+<circle style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="circle5455" cx="49.785" cy="40.407" r="4.768"/>
+</svg>