Advance version number to 1.55.0

This way the barcode can easily be exported, too.

Also live update the data views and clean up the DecodeFragment.

CHANGELOG.md

@@ -1,5 +1,105 @@
 # Change Log
 
+## 1.55.0
+* Make recreated barcode interactive
+* Update to latest ZXing C++
+* Update Italian translation
+
+## 1.54.1
+* Update Russian translation
+* Update Turkish translation
+* Update Italian translation
+* Fix handling GS1 and ISO15434 content types
+* Fix VerifyError on Android 4
+
+## 1.54.0
+* Recreate and show barcode from read contents if possible
+* Add ebay, Amazon and barcodelookup.com to search engines
+
+## 1.53.1
+* Fix proguard configuration
+
+## 1.53.0
+* Migrate to ZXing-C++ and add support for Micro QR Codes
+* Multi-select scans in history listing
+* Remove preset content for Encode shortcut
+* Always show QR Code version and remove setting
+* Fix PDF-417 UTF-8 text encoding
+* Hide sensitive content from clipboard
+* Remove setting a custom language on Android 13+
+* Condense text output of generated barcodes
+* Update Russian translation
+* Update Spanish translation
+* Add Persian translation
+
+## 1.52.0
+* Fix parsing timezone in calendar dates
+* Update French translation
+
+## 1.51.1
+* Fix extraction of raw bytes for some barcodes
+
+## 1.51.0
+* Add support for Deutsche Post Matrixcode stamp
+* Allow free image rotation for scanning from images
+* Fix setting TO field in MATMSG format
+* Update Italian translation
+* Update zh-rCN translation
+* Update pt-br translation
+
+## 1.50.0
+* Add support for MATMSG format
+* Add a setting to show the QR Code version
+* Add timezone offset in calendar dates
+* Recognize colloquial incomplete URLs
+* Update ZXing library to latest version
+* Update Czech translation
+* Update Russian translation
+* Update Japanese translation
+* Update Hungarian translation
+
+## 1.49.2
+* Update design of app icon
+* Update pt-br translation
+
+## 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
+* Update Dutch translation
+* Update Chinese translation
+
 ## 1.46.2
 * Fix saving external files on Android Q and newer
 

Makefile

@@ -20,9 +20,6 @@ infer: clean
 test:
 	./gradlew test
 
-cat:
-	./gradlew test cAT
-
 testview:
 	adb shell am start -W -a android.intent.action.VIEW -d 'binaryeye://scan'
 

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)

README.md

@@ -7,8 +7,8 @@ This one is free, without any ads and open source.
 Works in portrait and landscape orientation, can read inverted codes,
 comes in Material Design and can also generate barcodes.
 
-Binary Eye uses the [ZXing][zxing] ("Zebra Crossing") barcode scanning
-library.
+Binary Eye uses the [ZXing-C++][zxing_cpp] ("Zebra Crossing") barcode
+scanning library.
 
 ## Screenshots
 
@@ -39,10 +39,10 @@ ZXing can read the following barcode formats:
 * [EAN 8][ean_8]
 * [EAN 13][ean_13]
 * [ITF][itf]
-* [MAXICODE][maxicode] (only when unrotated and unskewed, see [77][77],
-	because of which Binary Eye *cannot* read this barcode)
+* [MAXICODE][maxicode] (partial)
 * [PDF417][pdf417]
 * [QR CODE][qr_code]
+* [Micro QR Code][micro_qr_code]
 * [RSS 14][rss]
 * [RSS EXPANDED][rss]
 * [UPC A][upc_a]
@@ -89,60 +89,54 @@ Supported symbols are:
 ### SCAN Intent
 
 You can also use Binary Eye from other apps by using the
-`com.google.zxing.client.android.SCAN` Intent with `startActivityForResult()`
-like this:
+`com.google.zxing.client.android.SCAN` Intent with
+[startActivityForResult()][start_activity] like this:
 
-	startActivityForResult(
-		Intent("com.google.zxing.client.android.SCAN"),
-		SOME_NUMBER
-	)
+```kotlin
+startActivityForResult(
+	Intent("com.google.zxing.client.android.SCAN"),
+	SOME_NUMBER
+)
+```
 
-And process the result in `onActivityResult()` of your `Activity`:
+And process the result in [onActivityResult()][on_activity_result] of your
+`Activity`:
 
-	override fun onActivityResult(
-		requestCode: Int,
-		resultCode: Int,
-		data: Intent?
-	) {
-		when (requestCode) {
-			SOME_NUMBER -> if (resultCode == RESULT_OK) {
-				val result = data.getStringExtra("SCAN_RESULT")
-				…
-			}
+```kotlin
+override fun onActivityResult(
+	requestCode: Int,
+	resultCode: Int,
+	data: Intent?
+) {
+	when (requestCode) {
+		SOME_NUMBER -> if (resultCode == RESULT_OK) {
+			val result = data.getStringExtra("SCAN_RESULT")
+			…
+		}
+	}
+}
+```
+
+If you're using AndroidX, this would be the new,
+[recommended way][intent_result]:
+
+```kotlin
+class YourActivity : Activity() {
+	private val resultLauncher = registerForActivityResult(StartActivityForResult()) { result ->
+		if (result.resultCode == Activity.RESULT_OK) {
+			val scan = result.data?.getStringExtra("SCAN_RESULT")
+			…
 		}
 	}
 
-## RenderScript
-
-This app uses [RenderScript][rs] to resize and rotate the camera image.
-Unfortunately, RenderScript has some nasty gotchas.
-
-### RenderScript.forceCompat()
-
-It's necessary to call `RenderScript.forceCompat()` on some devices/roms.
-
-`RenderScript.forceCompat()` needs to be run before any other RenderScript
-function and unfortunately there is no way to know if invoking `forceCompat()`
-is necessary or not.
-
-If `RenderScript.forceCompat()` is necessary, a `RSRuntimeException` will
-be thrown and the only option is to restart the app, this time with calling
-`forceCompat()` first.
-
-Calling `RenderScript.forceCompat()` means the processing is done in
-software so you probably don't want to enable it by default.
-
-### 2D barcodes
-
-If you want to fork this and are only interested in reading 2D barcodes
-(like QR or Aztec), you may want to remove the custom rotation kernel
-altogether as ZXing can read 2D barcodes in any orientation.
-
-This will make your app a bit simpler and saves you from compiling a
-custom RenderScript kernel for each architecture you want to support.
+	fun openScanner() {
+		resultLauncher.launch(Intent("com.google.zxing.client.android.SCAN"))
+	}
+}
+```
 
 [play]: https://play.google.com/store/search?q=barcode%20scanner&c=apps
-[zxing]: https://github.com/zxing/zxing
+[zxing_cpp]: https://github.com/zxing-cpp/zxing-cpp
 [kotlin]: http://kotlinlang.org/
 [aztec]: https://en.wikipedia.org/wiki/Aztec_Code
 [codabar]: https://en.wikipedia.org/wiki/Codabar
@@ -156,9 +150,11 @@ custom RenderScript kernel for each architecture you want to support.
 [maxicode]: https://en.wikipedia.org/wiki/MaxiCode
 [pdf417]: https://en.wikipedia.org/wiki/PDF417
 [qr_code]: https://en.wikipedia.org/wiki/QR_code
+[micro_qr_code]: https://en.wikipedia.org/wiki/QR_code#Micro_QR_code
 [rss]: https://en.wikipedia.org/wiki/GS1_DataBar
 [upc_a]: https://en.wikipedia.org/wiki/Universal_Product_Code
 [upc_e]: https://en.wikipedia.org/wiki/Universal_Product_Code#UPC-E
 [upc_ean]: https://en.wikipedia.org/wiki/Universal_Product_Code#EAN-13
-[77]: https://github.com/markusfisch/BinaryEye/issues/77
-[rs]: https://developer.android.com/guide/topics/renderscript/compute
+[start_activity]: https://developer.android.com/reference/android/app/Activity#startActivityForResult(android.content.Intent,%20int)
+[on_activity_result]: https://developer.android.com/reference/android/app/Activity#onActivityResult(int,%20int,%20android.content.Intent)
+[intent_result]: https://developer.android.com/training/basics/intents/result

app/build.gradle

@@ -2,27 +2,19 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
+	namespace 'de.markusfisch.android.binaryeye'
 	compileSdkVersion sdk_version
-	buildToolsVersion build_tools_version
 
 	defaultConfig {
 		minSdkVersion 9
 		targetSdkVersion sdk_version
 
-		versionCode 89
-		versionName '1.46.2'
-
-		// It's recommended to set this value to the lowest API level
-		// able to provide all the functionality.
-		renderscriptTargetApi 24
-		renderscriptSupportModeEnabled true
-		renderscriptSupportModeBlasEnabled true
-
-		testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
+		versionCode 105
+		versionName '1.55.0'
 	}
 
 	signingConfigs {
-		config {
+		release {
 			keyAlias System.getenv('ANDROID_KEY_ALIAS')
 			keyPassword System.getenv('ANDROID_KEY_PASSWORD')
 			storePassword System.getenv('ANDROID_STORE_PASSWORD')
@@ -46,7 +38,7 @@ android {
 			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 			minifyEnabled true
 			shrinkResources true
-			signingConfig signingConfigs.config
+			signingConfig signingConfigs.release
 		}
 	}
 
@@ -61,33 +53,18 @@ android {
 			enableSplit = false
 		}
 	}
-
-	lintOptions {
-		// Because at the time of writing, even the latest version
-		// of RenderScript is raising this error no matter if
-		// renderscriptTargetApi matches targetSdkVersion.
-		disable 'GradleCompatible'
-	}
 }
 
 dependencies {
-	androidTestImplementation('com.android.support.test:runner:1.0.2') {
-		exclude module: 'support-annotations'
-	}
-	androidTestImplementation('com.android.support.test:rules:1.0.2') {
-		exclude module: 'support-annotations'
-	}
-	testImplementation 'junit:junit:4.12'
+	testImplementation 'junit:junit:4.13.2'
 
 	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.6.1"
 	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.github.markusfisch:CameraView:1.9.1'
-	implementation 'com.github.markusfisch:ScalingImageView:1.3.0'
+	implementation 'com.github.markusfisch:ScalingImageView:1.4.0'
+	implementation 'com.github.markusfisch:zxing-cpp:v1.4.0.6'
 }

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/proguard-rules.pro

@@ -3,4 +3,5 @@
 -dontwarn android.support.v8.**
 
 -keep class android.support.v7.widget.SearchView { *; }
--keep class android.support.v8.renderscript.** { *; }
+
+-keep class de.markusfisch.android.zxingcpp.** { *; }

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

@@ -1,108 +0,0 @@
-package de.markusfisch.android.binaryeye
-
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
-import android.support.v8.renderscript.RenderScript
-import de.markusfisch.android.binaryeye.rs.Preprocessor
-import de.markusfisch.android.binaryeye.zxing.Zxing
-import org.junit.Assert.fail;
-import org.junit.Test
-import org.junit.runner.RunWith
-import java.util.regex.Pattern
-
-@RunWith(AndroidJUnit4::class)
-class PreprocessorTest {
-	@Test
-	fun processSamples() {
-		val zxing = Zxing()
-		val assets = InstrumentationRegistry.getInstrumentation()
-			.context.assets
-		val pattern = Pattern.compile(
-			"[0-9]+-([0-9]+)deg.jpg"
-		)
-		val samples = assets.list("samples")
-		checkNotNull(samples) { "no samples found" }
-		for (sample in samples) {
-			val m = pattern.matcher(sample)
-			if (!m.find() || m.groupCount() < 1) {
-				fail("invalid sample: $sample")
-			}
-			val bitmap = BitmapFactory.decodeStream(
-				assets.open("samples/$sample")
-			)
-			val frameData = getNV21(bitmap)
-			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,
-				frameHeight,
-				null
-			)
-			val outWidth: Int
-			val outHeight: Int
-			val orientation = frameOrientation.toInt()
-			if (orientation == 90 || orientation == 270) {
-				preprocessor.resizeAndRotate(frameData)
-				outWidth = preprocessor.outHeight
-				outHeight = preprocessor.outWidth
-			} else {
-				preprocessor.resizeOnly(frameData)
-				outWidth = preprocessor.outWidth
-				outHeight = preprocessor.outHeight
-			}
-			val result = zxing.decode(frameData, outWidth, outHeight)
-			preprocessor.destroy()
-			rs.destroy()
-
-			checkNotNull(result) { "no barcode found in $sample" }
-		}
-	}
-}
-
-fun getNV21(bitmap: Bitmap): ByteArray {
-	val width = bitmap.width
-	val height = bitmap.height
-	val argb = IntArray(width * height)
-	bitmap.getPixels(argb, 0, width, 0, 0, width, height)
-	return encodeYUV420SP(argb, width, height)
-}
-
-private fun encodeYUV420SP(argb: IntArray, width: Int, height: Int): ByteArray {
-	val yuv = ByteArray(ceilIfUneven(width) * ceilIfUneven(height) * 3 / 2)
-	var yIndex = 0
-	var uvIndex = width * height
-	var r: Int
-	var g: Int
-	var b: 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) {
-			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
-			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[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()
-			}
-			++index
-		}
-	}
-	return yuv
-}
-
-private fun ceilIfUneven(n: Int) = if (n and 1 == 1) n + 1 else n

app/src/debug/res/drawable/ic_launcher_foreground.xml

@@ -4,35 +4,7 @@
     android:viewportWidth="108"
     android:viewportHeight="108">
   <path
-      android:fillColor="#FF000000"
-      android:pathData="M52,-884.362h29v71h-29z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M52,-884.362h29v71h-29z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M52,-884.362h29v71h-29z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M32.002,-24.974h3.127v7.656h-3.127z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M52,-884.362h29v71h-29z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M52,-884.362h29v71h-29z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M52,-884.362h29v71h-29z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M52,-884.362h29v71h-29z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M52,-884.362h29v71h-29z"/>
-  <path
-      android:pathData="m54.826,27.893c-6.851,0 -13.701,2.581 -18.924,7.745 -10.445,10.328 -10.413,27.062 0,37.423l36.218,36.036 37.879,0.902 -0.07,-38.363 -36.18,-35.998c-5.207,-5.18 -12.073,-7.745 -18.924,-7.745z"
-      android:strokeAlpha="1"
+      android:pathData="M54.826,27.894C47.976,27.894 41.125,30.475 35.903,35.639C25.457,45.967 25.489,62.701 35.903,73.062L72.121,109.098L108,108L109.93,71.637L73.75,35.639C68.543,30.459 61.677,27.894 54.826,27.894Z"
       android:strokeLineJoin="miter"
       android:strokeWidth="8.60725021"
       android:fillColor="#000000"
@@ -41,43 +13,25 @@
       android:fillAlpha="0.1254902"
       android:strokeLineCap="butt"/>
   <path
-      android:pathData="M28.001,54.118a26.525,26.227 0,1 0,53.049 0a26.525,26.227 0,1 0,-53.049 0z"
-      android:strokeAlpha="1"
+      android:pathData="M27.475,54a26.525,26.5 0,1 0,53.05 0a26.525,26.5 0,1 0,-53.05 0z"
       android:strokeLineJoin="miter"
       android:strokeWidth="4"
       android:fillColor="#ffffff"
       android:strokeColor="#00000000"
-      android:fillAlpha="1"
       android:strokeLineCap="butt"/>
   <path
-      android:pathData="M39.26,54.988a14.509,14.346 0,1 0,29.019 0a14.509,14.346 0,1 0,-29.019 0z"
-      android:strokeAlpha="1"
+      android:pathData="M72.745,54.001C72.745,58.588 71.099,62.791 68.362,66.049L68.362,41.953C71.099,45.21 72.745,49.412 72.745,54.001ZM54.001,72.745C53.463,72.745 52.931,72.723 52.406,72.679L52.406,35.322C52.931,35.278 53.463,35.255 54.001,35.255C54.538,35.255 55.071,35.278 55.596,35.322L55.596,72.679C55.071,72.723 54.538,72.745 54.001,72.745ZM35.255,54.001C35.255,49.412 36.903,45.21 39.638,41.953L39.638,66.049C36.903,62.791 35.255,58.588 35.255,54.001ZM61.98,70.969C60.961,71.447 59.895,71.838 58.789,72.13L58.789,35.873C59.895,36.164 60.961,36.553 61.98,37.032L61.98,70.969ZM49.213,72.13C46.877,71.514 44.717,70.458 42.831,69.056L42.831,38.945C44.717,37.543 46.877,36.487 49.213,35.873L49.213,72.13Z"
       android:strokeLineJoin="miter"
       android:strokeWidth="4"
       android:fillColor="#000000"
       android:strokeColor="#00000000"
-      android:fillAlpha="1"
       android:strokeLineCap="butt"/>
   <path
-      android:pathData="M54.034,44.513a9.535,9.428 0,1 0,19.07 0a9.535,9.428 0,1 0,-19.07 0z"
-      android:strokeAlpha="1"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="10"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"
-      android:fillAlpha="1"
-      android:strokeLineCap="butt"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M52,-884.362h29v71h-29z"/>
-  <path
-      android:pathData="m62.745,24.783c-2.055,1.011 -2.87,3.415 -1.847,5.446 0.588,1.168 1.642,1.916 2.839,2.168 -0.564,0.884 -0.835,1.972 -0.925,3.156 -1.782,-0.45 -3.735,-0.191 -5.25,0.639a0.799,0.808 90,0 0,-0.132 0.172,0.799 0.808,90 0,0 -0.132,0.172 0.799,0.808 90,0 0,-0.132 0.39,0.799 0.808,90 0,0 0.044,0.304 0.799,0.808 90,0 0,0.437 0.433,0.799 0.808,90 0,0 0.131,0.043 0.799,0.808 90,0 0,0.131 0.043,0.799 0.808,90 0,0 0.218,-0 0.799,0.808 90,0 0,0.263 -0.129c1.29,-0.707 2.97,-0.892 4.375,-0.425 0.096,0.882 0.341,1.782 0.695,2.683 -0.456,0.072 -0.936,0.177 -1.357,0.343 -1.207,0.48 -2.245,1.302 -3.022,2.244a0.799,0.808 90,0 0,-0.044 0.129,0.799 0.808,90 0,0 -0.088,0.258 0.799,0.808 90,0 0,0.044 0.304,0.799 0.808,90 0,0 0.393,0.563 0.799,0.808 90,0 0,0.394 0.131,0.799 0.808,90 0,0 0.175,-0.086 0.799,0.808 90,0 0,0.175 -0.086,0.799 0.808,90 0,0 0.219,-0.215c0.922,-1.115 2.409,-1.925 3.897,-2.025 0.494,0.845 1.016,1.575 1.658,2.209 -1.232,1.149 -2.043,2.664 -2.239,4.234a0.799,0.808 90,0 0,-0.001 0.215,0.799 0.808,90 0,0 0.174,0.346 0.799,0.808 90,0 0,0.043 0.086,0.799 0.808,90 0,0 0.219,0.217 0.799,0.808 90,0 0,0.131 0.043,0.799 0.808,90 0,0 0.131,0.043 0.799,0.808 90,0 0,0.218 -0,0.799 0.808,90 0,0 0.218,-0 0.799,0.808 90,0 0,0.132 -0.172,0.799 0.808,90 0,0 0.175,-0.086 0.799,0.808 90,0 0,0.044 -0.129,0.799 0.808,90 0,0 0.088,-0.258 0.799,0.808 90,0 0,0.044 -0.129c0.159,-1.272 0.816,-2.493 1.799,-3.371 1.966,1.394 4.252,1.797 6.122,0.876 1.892,-0.931 2.903,-3.018 2.941,-5.444 1.327,-0.259 2.813,0.014 3.936,0.656a0.799,0.808 90,0 0,0.174 0.129,0.799 0.808,90 0,0 0.131,0.043 0.799,0.808 90,0 0,0.088 -0.043,0.799 0.808,90 0,0 0.218,-0 0.799,0.808 90,0 0,0.087 -0.043,0.799 0.808,90 0,0 0.175,-0.086 0.799,0.808 90,0 0,0.132 -0.172,0.799 0.808,90 0,0 0.132,-0.172 0.799,0.808 90,0 0,0.045 -0.562,0.799 0.808,90 0,0 -0.043,-0.086 0.799,0.808 90,0 0,-0.262 -0.303,0.799 0.808,90 0,0 -0.131,-0.043c-1.386,-0.792 -3.097,-1.066 -4.766,-0.787 -0.125,-0.89 -0.309,-1.783 -0.695,-2.683 0.982,-1.073 2.47,-1.756 3.896,-1.81a0.799,0.808 90,0 0,0.131 0.043,0.799 0.808,90 0,0 0.087,-0.043 0.799,0.808 90,0 0,0.482 -0.345,0.799 0.808,90 0,0 0.044,-0.129 0.799,0.808 90,0 0,0.088 -0.476,0.799 0.808,90 0,0 -0.043,-0.086 0.799,0.808 90,0 0,-0.262 -0.303,0.799 0.808,90 0,0 -0.043,-0.086 0.799,0.808 90,0 0,-0.394 -0.131,0.799 0.808,90 0,0 -0.131,-0.043c-1.227,0.048 -2.518,0.369 -3.633,1.031 -0.388,0.233 -0.762,0.548 -1.095,0.864 -0.513,-0.821 -1.093,-1.559 -1.746,-2.166 0.47,-1.39 1.632,-2.605 2.98,-3.195a0.799,0.808 90,0 0,0.175 -0.086,0.799 0.808,90 0,0 0.132,-0.172 0.799,0.808 90,0 0,0.132 -0.172,0.799 0.808,90 0,0 0.132,-0.39 0.799,0.808 90,0 0,-0.043 -0.086,0.799 0.808,90 0,0 -0.174,-0.346 0.799,0.808 90,0 0,-0.043 -0.086,0.799 0.808,90 0,0 -0.437,-0.217 0.799,0.808 90,0 0,-0.175 0.086,0.799 0.808,90 0,0 -0.131,-0.043 0.799,0.808 90,0 0,-0.087 0.043,0.799 0.808,90 0,0 -0.131,-0.043c-1.584,0.694 -2.97,2.079 -3.681,3.756 -1.012,-0.644 -2.048,-1.087 -3.104,-1.173 0.53,-1.101 0.642,-2.414 0.05,-3.59 -1.023,-2.031 -3.541,-2.795 -5.596,-1.783z"
+      android:pathData="m62.745,28.783c-2.055,1.011 -2.87,3.415 -1.847,5.446 0.588,1.168 1.642,1.916 2.839,2.168 -0.564,0.884 -0.835,1.972 -0.925,3.156 -1.782,-0.45 -3.735,-0.191 -5.25,0.639a0.799,0.808 90.001,0 0,-0.132 0.172,0.799 0.808,90.001 0,0 -0.132,0.172 0.799,0.808 90.001,0 0,-0.132 0.39,0.799 0.808,90.001 0,0 0.044,0.304 0.799,0.808 90.001,0 0,0.437 0.433,0.799 0.808,90.001 0,0 0.131,0.043 0.799,0.808 90.001,0 0,0.131 0.043,0.799 0.808,90.001 0,0 0.218,-0 0.799,0.808 90.001,0 0,0.263 -0.129c1.29,-0.707 2.97,-0.892 4.375,-0.425 0.096,0.882 0.341,1.782 0.695,2.683 -0.456,0.072 -0.936,0.177 -1.357,0.343 -1.207,0.48 -2.245,1.302 -3.022,2.244a0.799,0.808 90.001,0 0,-0.044 0.129,0.799 0.808,90.001 0,0 -0.088,0.258 0.799,0.808 90.001,0 0,0.044 0.304,0.799 0.808,90.001 0,0 0.393,0.563 0.799,0.808 90.001,0 0,0.394 0.131,0.799 0.808,90.001 0,0 0.175,-0.086 0.799,0.808 90.001,0 0,0.175 -0.086,0.799 0.808,90.001 0,0 0.219,-0.215c0.922,-1.115 2.409,-1.925 3.897,-2.025 0.494,0.845 1.016,1.575 1.658,2.209 -1.232,1.149 -2.043,2.664 -2.239,4.234a0.799,0.808 90.001,0 0,-0.001 0.215,0.799 0.808,90.001 0,0 0.174,0.346 0.799,0.808 90.001,0 0,0.043 0.086,0.799 0.808,90.001 0,0 0.219,0.217 0.799,0.808 90.001,0 0,0.131 0.043,0.799 0.808,90.001 0,0 0.131,0.043 0.799,0.808 90.001,0 0,0.218 -0,0.799 0.808,90.001 0,0 0.218,-0 0.799,0.808 90.001,0 0,0.132 -0.172,0.799 0.808,90.001 0,0 0.175,-0.086 0.799,0.808 90.001,0 0,0.044 -0.129,0.799 0.808,90.001 0,0 0.088,-0.258 0.799,0.808 90.001,0 0,0.044 -0.129c0.159,-1.272 0.816,-2.493 1.799,-3.371 1.966,1.394 4.252,1.797 6.122,0.876 1.892,-0.931 2.903,-3.018 2.941,-5.444 1.327,-0.259 2.813,0.014 3.936,0.656a0.799,0.808 90.001,0 0,0.174 0.129,0.799 0.808,90.001 0,0 0.131,0.043 0.799,0.808 90.001,0 0,0.088 -0.043,0.799 0.808,90.001 0,0 0.218,-0 0.799,0.808 90.001,0 0,0.087 -0.043,0.799 0.808,90.001 0,0 0.175,-0.086 0.799,0.808 90.001,0 0,0.132 -0.172,0.799 0.808,90.001 0,0 0.132,-0.172 0.799,0.808 90.001,0 0,0.045 -0.562,0.799 0.808,90.001 0,0 -0.043,-0.086 0.799,0.808 90.001,0 0,-0.262 -0.303,0.799 0.808,90.001 0,0 -0.131,-0.043c-1.386,-0.792 -3.097,-1.066 -4.766,-0.787 -0.125,-0.89 -0.309,-1.783 -0.695,-2.683 0.982,-1.073 2.47,-1.756 3.896,-1.81a0.799,0.808 90.001,0 0,0.131 0.043,0.799 0.808,90.001 0,0 0.087,-0.043 0.799,0.808 90.001,0 0,0.482 -0.345,0.799 0.808,90.001 0,0 0.044,-0.129 0.799,0.808 90.001,0 0,0.088 -0.476,0.799 0.808,90.001 0,0 -0.043,-0.086 0.799,0.808 90.001,0 0,-0.262 -0.303,0.799 0.808,90.001 0,0 -0.043,-0.086 0.799,0.808 90.001,0 0,-0.394 -0.131,0.799 0.808,90.001 0,0 -0.131,-0.043c-1.227,0.048 -2.518,0.369 -3.633,1.031 -0.388,0.233 -0.762,0.548 -1.095,0.864 -0.513,-0.821 -1.093,-1.559 -1.746,-2.166 0.47,-1.39 1.632,-2.605 2.98,-3.195a0.799,0.808 90.001,0 0,0.175 -0.086,0.799 0.808,90.001 0,0 0.132,-0.172 0.799,0.808 90.001,0 0,0.132 -0.172,0.799 0.808,90.001 0,0 0.132,-0.39 0.799,0.808 90.001,0 0,-0.043 -0.086,0.799 0.808,90.001 0,0 -0.174,-0.346 0.799,0.808 90.001,0 0,-0.043 -0.086,0.799 0.808,90.001 0,0 -0.437,-0.217 0.799,0.808 90.001,0 0,-0.175 0.086,0.799 0.808,90.001 0,0 -0.131,-0.043 0.799,0.808 90.001,0 0,-0.087 0.043,0.799 0.808,90.001 0,0 -0.131,-0.043c-1.584,0.694 -2.97,2.079 -3.681,3.756 -1.012,-0.644 -2.048,-1.087 -3.104,-1.173 0.53,-1.101 0.642,-2.414 0.05,-3.59 -1.023,-2.031 -3.541,-2.795 -5.596,-1.783z"
       android:fillColor="#ff2a2a"
-      android:strokeColor="#00000000"
-      android:fillAlpha="1"/>
+      android:strokeColor="#00000000"/>
   <path
-      android:pathData="m66.624,32.489c0.281,-0.138 1.896,2.465 3.62,5.889 1.724,3.424 2.893,6.354 2.613,6.492 -0.281,0.138 -1.94,-2.551 -3.663,-5.975 -1.724,-3.424 -2.85,-6.268 -2.569,-6.406z"
+      android:pathData="m66.624,36.489c0.281,-0.138 1.896,2.465 3.62,5.889 1.724,3.424 2.893,6.354 2.613,6.492 -0.281,0.138 -1.94,-2.551 -3.663,-5.975 -1.724,-3.424 -2.85,-6.268 -2.569,-6.406z"
       android:fillColor="#d40000"
-      android:strokeColor="#00000000"
-      android:fillAlpha="1"/>
+      android:strokeColor="#00000000"/>
 </vector>

app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
-	package="de.markusfisch.android.binaryeye"
 	android:installLocation="auto">
 	<supports-screens
 		android:largeScreens="true"
@@ -34,6 +33,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 +41,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 +53,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 +68,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 +83,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 +98,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/ActionRegistry.kt

@@ -1,6 +1,7 @@
 package de.markusfisch.android.binaryeye.actions
 
 import de.markusfisch.android.binaryeye.actions.mail.MailAction
+import de.markusfisch.android.binaryeye.actions.mail.MatMsgAction
 import de.markusfisch.android.binaryeye.actions.otpauth.OtpauthAction
 import de.markusfisch.android.binaryeye.actions.search.OpenOrSearchAction
 import de.markusfisch.android.binaryeye.actions.sms.SmsAction
@@ -15,13 +16,16 @@ object ActionRegistry {
 
 	private val REGISTRY: Set<IAction> = setOf(
 		MailAction,
+		MatMsgAction,
 		OtpauthAction,
 		SmsAction,
 		TelAction,
 		VCardAction,
 		VEventAction,
-		WebAction,
-		WifiAction
+		WifiAction,
+		// Try WebAction last because recognizing colloquial URLs is
+		// very aggressive.
+		WebAction
 	)
 
 	fun getAction(data: ByteArray): IAction = REGISTRY.find {

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,38 @@ 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/mail/MatMsgAction.kt

@@ -0,0 +1,55 @@
+package de.markusfisch.android.binaryeye.actions.mail
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.actions.IntentAction
+
+object MatMsgAction : IntentAction() {
+	override val iconResId: Int = R.drawable.ic_action_mail
+	override val titleResId: Int = R.string.mail_send
+	override val errorMsg: Int = R.string.mail_error
+
+	override fun canExecuteOn(data: ByteArray): Boolean {
+		return String(data).startsWith("MATMSG:")
+	}
+
+	override suspend fun createIntent(
+		context: Context,
+		data: ByteArray
+	): Intent? {
+		val mm = MatMsg(String(data))
+		// Allow incomplete but not completely missing data.
+		if (mm.isEmpty()) {
+			return null
+		}
+		return Intent(
+			Intent.ACTION_SENDTO,
+			Uri.parse("mailto:")
+		).apply {
+			mm.to?.let {
+				putExtra(Intent.EXTRA_EMAIL, arrayOf(mm.to))
+			}
+			mm.sub?.let {
+				putExtra(Intent.EXTRA_SUBJECT, mm.sub)
+			}
+			mm.body?.let {
+				putExtra(Intent.EXTRA_TEXT, mm.body)
+			}
+		}
+	}
+}
+
+// Public so this can be tested.
+class MatMsg(encoded: String) {
+	// Allow arbitrary order.
+	val to = encoded.extractFirst("""[:;]TO:([\w.%@+-]+);""")
+	val sub = encoded.extractFirst("""[:;]SUB:([^;]+);""")
+	val body = encoded.extractFirst("""[:;]BODY:([^;]+);""")
+
+	fun isEmpty() = to == null && sub == null && body == null
+}
+
+private fun String.extractFirst(regex: String) =
+	regex.toRegex().find(this)?.groupValues?.get(1)

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.prefs
-import de.markusfisch.android.binaryeye.content.startIntent
-import java.net.URLEncoder
+import de.markusfisch.android.binaryeye.content.openUrl
+import de.markusfisch.android.binaryeye.net.urlEncode
 
 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

@@ -4,10 +4,12 @@ import android.content.Context
 import android.content.Intent
 import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.actions.IntentAction
-import de.markusfisch.android.binaryeye.app.parseAndNormalizeUri
+import de.markusfisch.android.binaryeye.content.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/actions/vtype/vcard/VCardAction.kt

@@ -9,7 +9,6 @@ import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.actions.IntentAction
 import de.markusfisch.android.binaryeye.actions.vtype.VTypeParser
 import java.util.*
-import kotlin.collections.ArrayList
 
 object VCardAction : IntentAction() {
 	override val iconResId: Int

app/src/main/kotlin/de/markusfisch/android/binaryeye/actions/vtype/vevent/VEventAction.kt

@@ -1,6 +1,5 @@
 package de.markusfisch.android.binaryeye.actions.vtype.vevent
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.os.Build
@@ -45,38 +44,49 @@ object VEventAction : IntentAction() {
 			}
 			info["DTSTART"]?.singleOrNull()?.also { eventStart ->
 				dateFormats.simpleFindParse(eventStart.value)?.also {
-					putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, it.time)
+					putExtra(
+						CalendarContract.EXTRA_EVENT_BEGIN_TIME,
+						it.time
+					)
 				}
 			}
 			info["DTEND"]?.singleOrNull()?.also { eventEnd ->
 				dateFormats.simpleFindParse(eventEnd.value)?.also {
-					putExtra(CalendarContract.EXTRA_EVENT_END_TIME, it.time)
+					putExtra(
+						CalendarContract.EXTRA_EVENT_END_TIME,
+						it.time
+					)
 				}
 			}
 		}
 	}
-
-	// We definitely don't wan't the local format.
-	@SuppressLint("SimpleDateFormat")
-	private val dateFormats = listOf(
-		SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"),
-		SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"),
-		SimpleDateFormat("yyyyMMdd'T'HHmmss'Z'"),
-		SimpleDateFormat("yyyyMMdd'T'HHmmss"),
-		SimpleDateFormat("yyyy-MM-dd"),
-		SimpleDateFormat("yyyyMMdd")
-	)
-
-	private fun List<SimpleDateFormat>.simpleFindParse(data: String): Date? {
-		for (simpleDataFormat in this) {
-			return simpleDataFormat.simpleParse(data) ?: continue
-		}
-		return null
-	}
-
-	private fun SimpleDateFormat.simpleParse(data: String): Date? = try {
-		this.parse(data)
-	} catch (e: Exception) {
-		null
-	}
+}
+
+private val dateFormats = listOf(
+	"yyyy-MM-dd'T'HH:mm:ssXXX",
+	"yyyy-MM-dd'T'HH:mm:ssZ",
+	"yyyy-MM-dd'T'HH:mm:ssz",
+	"yyyy-MM-dd'T'HH:mm:ss",
+	"yyyyMMdd'T'HHmmssXXX",
+	"yyyyMMdd'T'HHmmssZ",
+	"yyyyMMdd'T'HHmmssz",
+	"yyyyMMdd'T'HHmmss",
+	"yyyy-MM-dd",
+	"yyyyMMdd"
+)
+
+private fun List<String>.simpleFindParse(date: String): Date? {
+	for (pattern in this) {
+		return SimpleDateFormat(
+			pattern,
+			Locale.getDefault()
+		).simpleParse(date) ?: continue
+	}
+	return null
+}
+
+private fun SimpleDateFormat.simpleParse(date: String): Date? = try {
+	parse(date)
+} catch (e: Exception) {
+	null
 }

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

@@ -1,11 +1,28 @@
 package de.markusfisch.android.binaryeye.actions.web
 
+import android.content.Context
 import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.actions.SchemeAction
+import de.markusfisch.android.binaryeye.actions.IAction
+import de.markusfisch.android.binaryeye.content.openUrl
+
+object WebAction : IAction {
+	private val colloquialRegex =
+		"""^(http[s]*://)*([a-z0-9]+[a-z0-9-]*[a-z0-9]+[.])+[a-z]{2,}([?#/]+[\w/=&;._-]*)*$""".toRegex(
+			RegexOption.IGNORE_CASE
+		)
 
-object WebAction : SchemeAction() {
 	override val iconResId: Int = R.drawable.ic_action_open
 	override val titleResId: Int = R.string.open_url
-	override val scheme: String = "https?"
-	override val buildRegex: Boolean = true
+
+	override fun canExecuteOn(data: ByteArray): Boolean {
+		return String(data).trim().matches(colloquialRegex)
+	}
+
+	override suspend fun execute(context: Context, data: ByteArray) {
+		var url = String(data).trim()
+		if (!url.startsWith("http") && !url.startsWith("ftp")) {
+			url = "http://${url}"
+		}
+		context.openUrl(url)
+	}
 }

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

@@ -1,12 +1,12 @@
 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
 import android.graphics.Matrix
 import android.graphics.Rect
-import android.graphics.RectF
 import android.hardware.Camera
 import android.media.AudioManager
 import android.media.ToneGenerator
@@ -16,70 +16,60 @@ import android.os.Vibrator
 import android.support.design.widget.FloatingActionButton
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.Toolbar
-import android.support.v8.renderscript.RSRuntimeException
-import android.support.v8.renderscript.RenderScript
 import android.view.Menu
 import android.view.MenuItem
 import android.view.MotionEvent
 import android.view.View
 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.graphics.getFrameToViewMatrix
-import de.markusfisch.android.binaryeye.graphics.map
+import de.markusfisch.android.binaryeye.content.openUrl
+import de.markusfisch.android.binaryeye.content.toHexString
+import de.markusfisch.android.binaryeye.database.toScan
+import de.markusfisch.android.binaryeye.graphics.FrameMetrics
+import de.markusfisch.android.binaryeye.graphics.mapPosition
+import de.markusfisch.android.binaryeye.graphics.setFrameRoi
+import de.markusfisch.android.binaryeye.graphics.setFrameToView
 import de.markusfisch.android.binaryeye.net.sendAsync
+import de.markusfisch.android.binaryeye.net.urlEncode
 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
 import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
 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 de.markusfisch.android.zxingcpp.ZxingCpp
+import de.markusfisch.android.zxingcpp.ZxingCpp.Format
+import de.markusfisch.android.zxingcpp.ZxingCpp.Result
+import java.nio.charset.Charset
 import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.roundToInt
 
 class CameraActivity : AppCompatActivity() {
-	private val zxing = Zxing { point ->
-		point ?: return@Zxing
-		val matrix = getMappingMatrix() ?: return@Zxing
-		detectorView.post {
-			detectorView.update(
-				matrix.map(
-					arrayOf(point),
-					detectorView.coordinates
-				)
-			)
-		}
-	}
+	private val frameRoi = Rect()
+	private val matrix = Matrix()
 
-	private lateinit var rs: RenderScript
 	private lateinit var vibrator: Vibrator
 	private lateinit var cameraView: CameraView
 	private lateinit var detectorView: DetectorView
 	private lateinit var zoomBar: SeekBar
 	private lateinit var flashFab: FloatingActionButton
 
-	private var preprocessor: Preprocessor? = null
-	private var nativeMappingMatrix: Matrix? = null
-	private var rotatedMappingMatrix: Matrix? = null
-	private var recreatePreprocessor = false
-	private var rotate = false
-	private var invert = false
-	private var flash = false
+	private var formats = setOf<String>()
+	private var frameMetrics = FrameMetrics()
 	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
 
@@ -128,8 +118,7 @@ class CameraActivity : AppCompatActivity() {
 		// custom locale.
 		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)
@@ -152,47 +141,52 @@ class CameraActivity : AppCompatActivity() {
 
 	override fun onDestroy() {
 		super.onDestroy()
-		resetPreProcessor()
 		fallbackBuffer = null
 		saveZoom()
 		detectorView.saveCropHandlePos()
-		rs.destroy()
 	}
 
 	override fun onResume() {
 		super.onResume()
 		System.gc()
-		zxing.updateHints(
-			prefs.tryHarder,
-			prefs.barcodeFormats
-		)
+		updateHints()
 		if (prefs.bulkMode && bulkMode != prefs.bulkMode) {
 			bulkMode = prefs.bulkMode
 			invalidateOptionsMenu()
 			ignoreNext = null
 		}
 		setReturnTarget(intent)
-		if (hasCameraPermission(this)) {
+		if (hasCameraPermission()) {
 			openCamera()
 		}
 	}
 
+	private fun updateHints() {
+		val restriction = restrictFormat
+		formats = if (restriction != null) {
+			title = getString(
+				R.string.scan_format,
+				prettifyFormatName(restriction)
+			)
+			setOf(restriction)
+		} else {
+			setTitle(R.string.scan_code)
+			prefs.barcodeFormats
+		}
+	}
+
 	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")
 			}
 		}
 	}
 
-	private fun resetPreProcessor() {
-		preprocessor?.destroy()
-		preprocessor = null
-	}
-
 	private fun openCamera() {
 		cameraView.openAsync(
 			CameraView.findCameraId(
@@ -213,8 +207,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 +215,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 +223,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 +253,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 +274,10 @@ class CameraActivity : AppCompatActivity() {
 				ignoreNext = null
 				true
 			}
+			R.id.restrict_format -> {
+				showRestrictionDialog()
+				true
+			}
 			R.id.preferences -> {
 				startActivity(MainActivity.getPreferencesIntent(this))
 				true
@@ -302,6 +300,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 +387,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 +395,9 @@ class CameraActivity : AppCompatActivity() {
 						saveZoom()
 					}
 					parameters.zoom = zoomBar.progress
+					View.VISIBLE
 				} else {
-					zoomBar.visibility = View.GONE
+					View.GONE
 				}
 				val sceneModes = parameters.supportedSceneModes
 				sceneModes?.let {
@@ -398,25 +418,30 @@ class CameraActivity : AppCompatActivity() {
 			}
 
 			override fun onCameraReady(camera: Camera) {
-				// Reset preprocessor to make sure it always fits the current
-				// frame orientation. Important for landscape to landscape
-				// orientation changes.
-				resetPreProcessor()
-				val frameWidth = cameraView.frameWidth
-				val frameHeight = cameraView.frameHeight
-				val frameOrientation = cameraView.frameOrientation
+				frameMetrics = FrameMetrics(
+					cameraView.frameWidth,
+					cameraView.frameHeight,
+					cameraView.frameOrientation
+				)
+				updateFrameRoiAndMappingMatrix()
 				ignoreNext = null
 				decoding = true
 				camera.setPreviewCallback { frameData, _ ->
 					if (decoding) {
-						decodeFrame(
+						ZxingCpp.readByteArray(
 							frameData,
-							frameWidth,
-							frameHeight,
-							frameOrientation
+							frameMetrics.width,
+							frameRoi.left, frameRoi.top,
+							frameRoi.width(), frameRoi.height(),
+							frameMetrics.orientation,
+							formats.joinToString(),
+							prefs.tryHarder,
+							prefs.autoRotate,
+							tryInvert = true,
+							tryDownscale = true
 						)?.let { result ->
 							if (result.text != ignoreNext) {
-								postResult(result)
+								postResult(result.redact())
 								decoding = false
 							}
 						}
@@ -441,7 +466,7 @@ class CameraActivity : AppCompatActivity() {
 				progress: Int,
 				fromUser: Boolean
 			) {
-				setZoom(progress)
+				cameraView.camera?.setZoom(progress)
 			}
 
 			override fun onStartTrackingTouch(seekBar: SeekBar) {}
@@ -452,16 +477,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.
 		}
 	}
 
@@ -486,12 +508,23 @@ class CameraActivity : AppCompatActivity() {
 		}
 		detectorView.onRoiChanged = {
 			decoding = true
-			recreatePreprocessor = true
+			updateFrameRoiAndMappingMatrix()
 		}
 		detectorView.setPaddingFromWindowInsets()
 		detectorView.restoreCropHandlePos()
 	}
 
+	private fun updateFrameRoiAndMappingMatrix() {
+		val viewRect = cameraView.previewRect
+		val viewRoi = if (detectorView.roi.width() < 1) {
+			viewRect
+		} else {
+			detectorView.roi
+		}
+		frameRoi.setFrameRoi(frameMetrics, viewRect, viewRoi)
+		matrix.setFrameToView(frameMetrics, viewRect, viewRoi)
+	}
+
 	private fun updateFlashFab(unavailable: Boolean) {
 		if (unavailable) {
 			flashFab.setImageResource(R.drawable.ic_action_create)
@@ -504,175 +537,27 @@ 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.
-			}
-		}
-	}
-
-	private fun decodeFrame(
-		frameData: ByteArray?,
-		frameWidth: Int,
-		frameHeight: Int,
-		frameOrientation: Int
-	): Result? {
-		frameData ?: return null
-		rotate = if (prefs.autoRotate) {
-			rotate xor true
-		} else {
-			invert = invert xor true
-			isPortrait(frameOrientation)
-		}
-		return try {
-			if (recreatePreprocessor) {
-				resetPreProcessor()
-				recreatePreprocessor = false
-			}
-			val pp = preprocessor ?: createPreprocessorAndMapping(
-				frameWidth,
-				frameHeight,
-				frameOrientation
-			)
-			val w: Int
-			val h: Int
-			if (rotate) {
-				pp.resizeAndRotate(frameData)
-				w = pp.outHeight
-				h = pp.outWidth
-			} else {
-				invert = invert xor true
-				pp.resizeOnly(frameData)
-				w = pp.outWidth
-				h = pp.outHeight
-			}
-			preprocessor = pp
-			zxing.decode(frameData, w, h, invert)
-		} catch (e: RSRuntimeException) {
-			prefs.forceCompat = prefs.forceCompat xor true
-			// Now the only option is to restart the app because
-			// RenderScript.forceCompat() needs to be called before
-			// RenderScript is initialized.
-			restartApp(this)
-			null
-		}
-	}
-
-	private fun createPreprocessorAndMapping(
-		frameWidth: Int,
-		frameHeight: Int,
-		frameOrientation: Int
-	): Preprocessor {
-		val frameRoi = calculateFrameRect(
-			frameWidth,
-			frameHeight,
-			frameOrientation
-		)
-		val pp = Preprocessor(
-			rs,
-			frameWidth,
-			frameHeight,
-			frameRoi
-		)
-		val viewRect = if (frameRoi != null) {
-			detectorView.roi
-		} else {
-			cameraView.previewRect
-		}
-		nativeMappingMatrix = getFrameToViewMatrix(
-			pp.outWidth,
-			pp.outHeight,
-			frameOrientation,
-			viewRect
-		)
-		rotatedMappingMatrix = getFrameToViewMatrix(
-			pp.outHeight,
-			pp.outWidth,
-			(frameOrientation - 90 + 360) % 360,
-			viewRect
-		)
-		return pp
-	}
-
-	private fun calculateFrameRect(
-		frameWidth: Int,
-		frameHeight: Int,
-		frameOrientation: Int
-	): Rect? {
-		val viewRoi = detectorView.roi
-		return if (
-			viewRoi.width() == 0 ||
-			viewRoi.height() == 0
-		) {
-			null
-		} else {
-			// Map ROI in detectorView to cameraView.
-			val previewRect = cameraView.previewRect
-			// previewRect may be larger than the screen (and thus as the
-			// detectorView) in which case its left and/or top coordinate
-			// will be negative which must then be clamped to the
-			// screen/DetectorView.
-			val previewLeft = max(0, previewRect.left)
-			val previewTop = max(0, previewRect.top)
-			val previewRoi = Rect(
-				previewLeft + viewRoi.left,
-				previewTop + viewRoi.top,
-				previewLeft + viewRoi.right,
-				previewTop + viewRoi.bottom
-			)
-			val previewRectWidth = previewRect.width().toFloat()
-			val previewRectHeight = previewRect.height().toFloat()
-			val normalizedRoi = RectF(
-				previewRoi.left.toFloat() / previewRectWidth,
-				previewRoi.top.toFloat() / previewRectHeight,
-				previewRoi.right.toFloat() / previewRectWidth,
-				previewRoi.bottom.toFloat() / previewRectHeight
-			)
-			// Since the ROI is always centered and symmetric, we don't
-			// need to distinguish between 0 and 180 or 90 and 270 degree.
-			val errectedRoi = if (isPortrait(frameOrientation)) {
-				RectF(
-					normalizedRoi.top,
-					normalizedRoi.left,
-					normalizedRoi.bottom,
-					normalizedRoi.right
-				)
-			} else {
-				normalizedRoi
-			}
-			Rect(
-				(errectedRoi.left * frameWidth.toFloat()).roundToInt(),
-				(errectedRoi.top * frameHeight.toFloat()).roundToInt(),
-				(errectedRoi.right * frameWidth.toFloat()).roundToInt(),
-				(errectedRoi.bottom * frameHeight.toFloat()).roundToInt()
-			)
+		try {
+			camera.parameters = parameters
+		} catch (e: RuntimeException) {
+			toast(e.message ?: getString(R.string.error_flash))
 		}
 	}
 
 	private fun postResult(result: Result) {
-		// Get matrix for the current rotate value.
-		val matrix = getMappingMatrix()
-		val resultPoints = result.resultPoints
-		if (matrix == null ||
-			resultPoints == null ||
-			resultPoints.isEmpty()
-		) {
-			return
-		}
 		cameraView.post {
 			detectorView.update(
-				matrix.map(
-					resultPoints,
+				matrix.mapPosition(
+					result.position,
 					detectorView.coordinates
 				)
 			)
@@ -695,12 +580,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
@@ -714,21 +607,44 @@ class CameraActivity : AppCompatActivity() {
 		}
 	}
 
-	private fun getMappingMatrix() = if (rotate) {
-		rotatedMappingMatrix
-	} else {
-		nativeMappingMatrix
-	}
-
 	companion object {
 		private const val PICK_FILE_RESULT_CODE = 1
 		private const val ZOOM_MAX = "zoom_max"
 		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"
 	}
 }
 
+fun Result.redact() = if (
+	format == Format.PDF_417.name &&
+	text.isNotEmpty()
+) {
+	Result(
+		format,
+		contentType,
+		String(
+			text.toByteArray(Charset.forName("ISO-8859-1")),
+			Charset.forName("UTF-8")
+		),
+		position,
+		orientation,
+		rawBytes,
+		ecLevel,
+		symbologyIdentifier,
+		sequenceSize,
+		sequenceIndex,
+		sequenceId,
+		readerInit,
+		lineCount,
+		versionNumber,
+		gtin
+	)
+} else {
+	this
+}
+
 fun showResult(
 	activity: Activity,
 	result: Result,
@@ -738,15 +654,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 +682,6 @@ fun showResult(
 			}
 		}
 	}
-	if (prefs.useHistory) {
-		scan.id = db.insertScan(scan)
-	}
 	if (!bulkMode) {
 		activity.startActivity(
 			MainActivity.getDecodeIntent(activity, scan)
@@ -765,84 +689,45 @@ fun showResult(
 	}
 }
 
-fun getReturnIntent(result: Result): Intent {
-	val intent = Intent()
-	intent.putExtra("SCAN_RESULT", result.text)
-	intent.putExtra(
-		"SCAN_RESULT_FORMAT",
-		result.barcodeFormat.toString()
-	)
-	if (result.rawBytes?.isNotEmpty() == true) {
-		intent.putExtra("SCAN_RESULT_BYTES", result.rawBytes)
+private fun getReturnIntent(result: Result) = Intent().apply {
+	putExtra("SCAN_RESULT", result.text)
+	putExtra("SCAN_RESULT_FORMAT", result.format)
+	putExtra("SCAN_RESULT_ORIENTATION", result.orientation)
+	putExtra("SCAN_RESULT_ERROR_CORRECTION_LEVEL", result.ecLevel)
+	if (result.rawBytes.isNotEmpty()) {
+		putExtra("SCAN_RESULT_BYTES", result.rawBytes)
 	}
-	result.resultMetadata?.let { metadata ->
-		metadata[ResultMetadataType.UPC_EAN_EXTENSION]?.let {
-			intent.putExtra(
-				"SCAN_RESULT_ORIENTATION",
-				it.toString()
-			)
-		}
-		metadata[ResultMetadataType.ERROR_CORRECTION_LEVEL]?.let {
-			intent.putExtra(
-				"SCAN_RESULT_ERROR_CORRECTION_LEVEL",
-				it.toString()
-			)
-		}
-		metadata[ResultMetadataType.UPC_EAN_EXTENSION]?.let {
-			intent.putExtra(
-				"SCAN_RESULT_UPC_EAN_EXTENSION",
-				it.toString()
-			)
-		}
-		metadata[ResultMetadataType.BYTE_SEGMENTS]?.let {
-			var i = 0
-			@Suppress("UNCHECKED_CAST")
-			for (seg in it as Iterable<ByteArray>) {
-				intent.putExtra("SCAN_RESULT_BYTE_SEGMENTS_$i", seg)
-				++i
-			}
-		}
-	}
-	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_BYTES}", result.rawBytes?.toHexString() ?: "")
+		.replace("{RESULT}", result.text.urlEncode())
+		.replace("{RESULT_BYTES}", result.rawBytes.toHexString())
 		.replace(
-			"{FORMAT}", URLEncoder.encode(
-				result.barcodeFormat.toString(), "UTF-8"
-			)
-		)
-		.replace(
-			"{META}", URLEncoder.encode(
-				result.resultMetadata?.toString() ?: "", "UTF-8"
-			)
+			"{FORMAT}", result.format.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,
 		1000
 	)
 }
-
-private fun isPortrait(
-	orientation: Int
-) = orientation == 90 || orientation == 270

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

@@ -65,7 +65,7 @@ class MainActivity : AppCompatActivity() {
 		}
 
 		if (state == null) {
-			setFragment(supportFragmentManager, getFragmentForIntent(intent))
+			supportFragmentManager?.setFragment(getFragmentForIntent(intent))
 		}
 	}
 
@@ -80,9 +80,7 @@ class MainActivity : AppCompatActivity() {
 			return when {
 				intent.hasExtra(PREFERENCES) -> PreferencesFragment()
 				intent.hasExtra(HISTORY) -> HistoryFragment()
-				intent.hasExtra(ENCODE) -> EncodeFragment.newInstance(
-					intent.getStringExtra(ENCODE)!!
-				)
+				intent.hasExtra(ENCODE) -> EncodeFragment.newInstance()
 				intent.hasExtra(DECODED) -> DecodeFragment.newInstance(
 					intent.getParcelableExtra(DECODED)!!
 				)

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

@@ -3,6 +3,7 @@ package de.markusfisch.android.binaryeye.activity
 import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
+import android.graphics.Matrix
 import android.graphics.Rect
 import android.graphics.RectF
 import android.net.Uri
@@ -11,17 +12,17 @@ import android.os.Parcelable
 import android.os.Vibrator
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.Toolbar
-import android.support.v8.renderscript.RenderScript
 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.fixTransparency
 import de.markusfisch.android.binaryeye.graphics.loadImageUri
-import de.markusfisch.android.binaryeye.graphics.mapResultToView
+import de.markusfisch.android.binaryeye.graphics.mapPosition
+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.colorSystemAndToolBars
 import de.markusfisch.android.binaryeye.view.initSystemBars
 import de.markusfisch.android.binaryeye.view.recordToolbarHeight
@@ -29,16 +30,18 @@ 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
-import de.markusfisch.android.binaryeye.zxing.Zxing
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
+import de.markusfisch.android.zxingcpp.ZxingCpp
+import de.markusfisch.android.zxingcpp.ZxingCpp.Result
+import kotlinx.coroutines.*
+import kotlin.math.max
+import kotlin.math.min
+import kotlin.math.roundToInt
 
 class PickActivity : AppCompatActivity() {
-	private val zxing = Zxing()
+	private val matrix = Matrix()
+	private val parentJob = Job()
+	private val scope = CoroutineScope(Dispatchers.IO + parentJob)
 
-	private lateinit var rs: RenderScript
 	private lateinit var vibrator: Vibrator
 	private lateinit var cropImageView: CropImageView
 	private lateinit var detectorView: DetectorView
@@ -58,12 +61,7 @@ class PickActivity : AppCompatActivity() {
 		// locale.
 		setTitle(R.string.pick_code_to_scan)
 
-		zxing.updateHints(
-			true,
-			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
@@ -74,7 +72,7 @@ class PickActivity : AppCompatActivity() {
 			colorSystemAndToolBars(this@PickActivity)
 		}
 
-		val bitmap = fixTransparency(rs, getBitmapFromIntent())
+		val bitmap = getBitmapFromIntent()?.fixTransparency()
 		if (bitmap == null) {
 			applicationContext.toast(R.string.error_no_content)
 			finish()
@@ -83,6 +81,7 @@ class PickActivity : AppCompatActivity() {
 
 		cropImageView = findViewById(R.id.image) as CropImageView
 		cropImageView.restrictTranslation = false
+		cropImageView.freeRotation = true
 		cropImageView.setImageBitmap(bitmap)
 		cropImageView.onScan = {
 			scanWithinBounds(bitmap)
@@ -115,37 +114,55 @@ class PickActivity : AppCompatActivity() {
 	}
 
 	private fun scanWithinBounds(bitmap: Bitmap) {
-		val roi = detectorView.roi
-		val rectInView = if (roi.width() < 1) {
+		val viewRoi = if (detectorView.roi.width() < 1) {
 			cropImageView.getBoundsRect()
 		} else {
-			roi
+			detectorView.roi
 		}
-		val imageRect = cropImageView.mappedRect
-		val rectInImage = normalizeRoi(imageRect, rectInView)
-		val cropped = crop(
-			bitmap,
-			rectInImage,
-			cropImageView.imageRotation
+		val mappedRect = cropImageView.mappedRect
+		val cropped = bitmap.crop(
+			getNormalizedRoi(mappedRect, viewRoi),
+			cropImageView.imageRotation,
+			cropImageView.pivotX,
+			cropImageView.pivotY
 		) ?: return
-		CoroutineScope(Dispatchers.IO).launch(Dispatchers.IO) {
-			result = zxing.decodePositiveNegative(cropped)
-			result?.let {
+		val croppedInView = Rect(
+			max(viewRoi.left, mappedRect.left.roundToInt()),
+			max(viewRoi.top, mappedRect.top.roundToInt()),
+			min(viewRoi.right, mappedRect.right.roundToInt()),
+			min(viewRoi.bottom, mappedRect.bottom.roundToInt())
+		)
+		matrix.apply {
+			setScale(
+				croppedInView.width().toFloat() / cropped.width,
+				croppedInView.height().toFloat() / cropped.height
+			)
+			postTranslate(
+				croppedInView.left.toFloat(),
+				croppedInView.top.toFloat()
+			)
+		}
+		scope.launch {
+			ZxingCpp.readBitmap(
+				cropped,
+				0, 0,
+				cropped.width, cropped.height,
+				0,
+				prefs.barcodeFormats.joinToString(),
+				tryHarder = true,
+				tryRotate = true,
+				tryInvert = true,
+				tryDownscale = true
+			)?.let {
 				withContext(Dispatchers.Main) {
 					if (isFinishing) {
 						return@withContext
 					}
+					result = it
 					vibrator.vibrate()
-					val rc = Rect()
-					imageRect.round(rc)
-					rectInView.intersect(rc)
 					detectorView.update(
-						mapResultToView(
-							cropped.width,
-							cropped.height,
-							0,
-							rectInView,
-							it.resultPoints,
+						matrix.mapPosition(
+							it.position,
 							detectorView.coordinates
 						)
 					)
@@ -157,7 +174,7 @@ class PickActivity : AppCompatActivity() {
 	override fun onDestroy() {
 		super.onDestroy()
 		detectorView.saveCropHandlePos()
-		rs.destroy()
+		parentJob.cancel()
 	}
 
 	override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -183,18 +200,18 @@ class PickActivity : AppCompatActivity() {
 		val uri = intent.getParcelableExtra<Parcelable>(
 			Intent.EXTRA_STREAM
 		) as? Uri ?: return null
-		return loadImageUri(contentResolver, uri)
+		return contentResolver.loadImageUri(uri)
 	}
 
 	private fun loadImageToOpen(intent: Intent): Bitmap? {
 		val uri = intent.data ?: return null
-		return loadImageUri(contentResolver, uri)
+		return contentResolver.loadImageUri(uri)
 	}
 
 	private fun showResult() {
 		val r = result
 		if (r != null) {
-			showResult(this, r, vibrator)
+			showResult(this, r.redact(), vibrator)
 			finish()
 		} else {
 			applicationContext.toast(R.string.no_barcode_found)
@@ -202,7 +219,7 @@ class PickActivity : AppCompatActivity() {
 	}
 }
 
-private fun normalizeRoi(imageRect: RectF, roi: Rect): RectF {
+private fun getNormalizedRoi(imageRect: RectF, roi: Rect): RectF {
 	val w = imageRect.width()
 	val h = imageRect.height()
 	return RectF(

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

@@ -3,7 +3,6 @@ package de.markusfisch.android.binaryeye.activity
 import android.content.Intent
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
-import de.markusfisch.android.binaryeye.app.setRestartCount
 
 class SplashActivity : AppCompatActivity() {
 	override fun onCreate(state: Bundle?) {
@@ -13,7 +12,6 @@ class SplashActivity : AppCompatActivity() {
 		// because that would happen after the app is fully
 		// initialized what is too late.
 
-		setRestartCount(intent)
 		startActivity(Intent(applicationContext, CameraActivity::class.java))
 		finish()
 	}

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

@@ -2,6 +2,7 @@ package de.markusfisch.android.binaryeye.adapter
 
 import android.content.Context
 import android.database.Cursor
+import android.support.v4.content.ContextCompat
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -10,41 +11,71 @@ import android.widget.TextView
 import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.database.Database
 import java.text.DateFormat
+import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.*
 
 class ScansAdapter(context: Context, cursor: Cursor) :
 	CursorAdapter(context, cursor, false) {
-	var selectedScanId = 0L
-	var selectedScanPosition = -1
-
 	private val idIndex = cursor.getColumnIndex(Database.SCANS_ID)
 	private val timeIndex = cursor.getColumnIndex(Database.SCANS_DATETIME)
 	private val nameIndex = cursor.getColumnIndex(Database.SCANS_NAME)
 	private val contentIndex = cursor.getColumnIndex(Database.SCANS_CONTENT)
 	private val formatIndex = cursor.getColumnIndex(Database.SCANS_FORMAT)
+	private val selections = mutableMapOf<Long, Int>()
+	private val selectedColor = ContextCompat.getColor(
+		context, R.color.selected_row
+	)
 
-	fun select(id: Long, position: Int) {
-		selectedScanId = id
-		selectedScanPosition = position
+	fun select(view: View, id: Long, position: Int) {
+		view.select(
+			if (selections[id] == null) {
+				selections[id] = position
+				true
+			} else {
+				selections.remove(id)
+				false
+			}
+		)
 	}
 
 	fun clearSelection() {
-		selectedScanId = 0L
-		selectedScanPosition = -1
+		selections.clear()
 	}
 
-	fun getSelectedContent() = if (selectedScanPosition < 0) {
-		null
-	} else {
-		val cursor = getItem(selectedScanPosition)
-		if (cursor is Cursor) {
-			cursor.getString(contentIndex)
-		} else {
-			null
+	fun forSelection(callback: (Long, Int) -> Unit) {
+		selections.forEach {
+			callback.invoke(it.key, it.value)
 		}
 	}
 
+	fun getSelectedIds(): List<Long> = mutableListOf<Long>().apply {
+		forSelection { id, _ ->
+			add(id)
+		}
+	}
+
+	fun getSelectedContent(separator: String): String {
+		val sb = StringBuilder()
+		forSelection { _, position ->
+			getContent(position)?.let {
+				if (sb.isNotEmpty()) {
+					sb.append(separator)
+				}
+				sb.append(it)
+			}
+		}
+		return sb.toString()
+	}
+
+	fun getName(
+		position: Int
+	) = (getItem(position) as Cursor?)?.getString(nameIndex)
+
+	fun getContent(
+		position: Int
+	) = (getItem(position) as Cursor?)?.getString(contentIndex)
+
 	override fun newView(
 		context: Context,
 		cursor: Cursor,
@@ -58,38 +89,45 @@ 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
+		val selected = selections[cursor.getLong(idIndex)] != null
 		view.post {
-			view.isSelected = selected
+			// Needs to be put on the queue to work.
+			view.select(selected)
 		}
 	}
 
-	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 View.select(selected: Boolean) {
+		setBackgroundColor(if (selected) selectedColor else 0)
+	}
+
+	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(
@@ -102,11 +140,15 @@ class ScansAdapter(context: Context, cursor: Cursor) :
 fun prettifyFormatName(format: String) = format.replace("_", " ")
 
 private fun formatDateTime(rfc: String): String {
-	SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US).parse(rfc)?.let {
-		return DateFormat.getDateTimeInstance(
-			DateFormat.LONG,
-			DateFormat.SHORT
-		).format(it)
+	try {
+		SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US).parse(rfc)?.let {
+			return DateFormat.getDateTimeInstance(
+				DateFormat.LONG,
+				DateFormat.SHORT
+			).format(it)
+		}
+	} catch (e: ParseException) {
+		// Ignore and fall through.
 	}
 	return rfc
 }

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

@@ -1,7 +1,7 @@
 package de.markusfisch.android.binaryeye.app
 
+import android.app.AlertDialog
 import android.content.Context
-import android.support.v7.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,7 +1,6 @@
 package de.markusfisch.android.binaryeye.app
 
 import android.app.Application
-import android.support.v8.renderscript.RenderScript
 import de.markusfisch.android.binaryeye.database.Database
 import de.markusfisch.android.binaryeye.preference.Preferences
 
@@ -13,9 +12,5 @@ class BinaryEyeApp : Application() {
 		super.onCreate()
 		db.open(this)
 		prefs.init(this)
-
-		if (prefs.forceCompat) {
-			RenderScript.forceCompat()
-		}
 	}
 }

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

@@ -1,14 +0,0 @@
-package de.markusfisch.android.binaryeye.app
-
-import android.net.Uri
-import android.os.Build
-
-private val nonPrintable = "[\\x00-\\x08\\x0e-\\x1f]".toRegex()
-
-fun hasNonPrintableCharacters(s: String) = nonPrintable.containsMatchIn(s)
-
-fun parseAndNormalizeUri(input: String): Uri = Uri.parse(input).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/app/Fragments.kt

@@ -5,16 +5,15 @@ import android.support.v4.app.Fragment
 import android.support.v4.app.FragmentManager
 import de.markusfisch.android.binaryeye.R
 
-fun setFragment(fm: FragmentManager?, fragment: Fragment) {
-	fm?.let { getTransaction(fm, fragment).commit() }
+fun FragmentManager.setFragment(fragment: Fragment) {
+	getTransaction(fragment).commit()
 }
 
-fun addFragment(fm: FragmentManager?, fragment: Fragment) {
-	fm?.let { getTransaction(fm, fragment).addToBackStack(null).commit() }
+fun FragmentManager.addFragment(fragment: Fragment) {
+	getTransaction(fragment).addToBackStack(null).commit()
 }
 
 @SuppressLint("CommitTransaction")
-private fun getTransaction(
-	fm: FragmentManager,
+private fun FragmentManager.getTransaction(
 	fragment: Fragment
-) = fm.beginTransaction().replace(R.id.content_frame, fragment)
+) = beginTransaction().replace(R.id.content_frame, fragment)

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

@@ -1,29 +0,0 @@
-package de.markusfisch.android.binaryeye.app
-
-import java.util.regex.Pattern
-
-private val urlPattern: Pattern = Pattern.compile(
-	"(?:^|[\\W])((ht|f)tp(s?):\\/\\/|www\\.)" +
-			"(([\\w\\-]+\\.){1,}?([\\w\\-.~]+\\/?)*" +
-			"[\\p{Alnum}.,%_=?&#\\-+()\\[\\]\\*$~@!:/{};']*)",
-	Pattern.CASE_INSENSITIVE or Pattern.MULTILINE or Pattern.DOTALL
-)
-
-fun getLinks(text: String): List<String> {
-	val matcher = urlPattern.matcher(text)
-	val urls = mutableListOf<String>()
-
-	while (matcher.find()) {
-		val matchStart = matcher.start(1)
-		val matchEnd = matcher.end()
-
-		var url = text.substring(matchStart, matchEnd)
-		if (!url.startsWith("http://") && !url.startsWith("https://")) {
-			url = "https://$url"
-		}
-
-		urls.add(url)
-	}
-
-	return urls
-}

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

@@ -9,43 +9,39 @@ import android.support.v4.content.ContextCompat
 var permissionGrantedCallback: (() -> Any)? = null
 
 const val PERMISSION_CAMERA = 1
-fun hasCameraPermission(activity: Activity) = hasPermission(
-	activity,
+fun Activity.hasCameraPermission() = hasPermission(
 	Manifest.permission.CAMERA,
 	PERMISSION_CAMERA
 )
 
 const val PERMISSION_WRITE = 2
-fun hasWritePermission(activity: Activity, callback: () -> Any): Boolean {
+fun Activity.hasWritePermission(callback: () -> Any): Boolean {
 	permissionGrantedCallback = callback
 	return hasPermission(
-		activity,
 		Manifest.permission.WRITE_EXTERNAL_STORAGE,
 		PERMISSION_WRITE
 	)
 }
 
 const val PERMISSION_LOCATION = 3
-fun hasLocationPermission(activity: Activity, callback: () -> Any): Boolean {
+fun Activity.hasLocationPermission(callback: () -> Any): Boolean {
 	permissionGrantedCallback = callback
 	return hasPermission(
-		activity,
 		Manifest.permission.ACCESS_FINE_LOCATION,
 		PERMISSION_LOCATION
 	)
 }
 
-private fun hasPermission(
-	activity: Activity,
+private fun Activity.hasPermission(
 	permission: String,
 	requestCode: Int
 ) = if (ContextCompat.checkSelfPermission(
-		activity,
+		this,
 		permission
 	) != PackageManager.PERMISSION_GRANTED
 ) {
 	ActivityCompat.requestPermissions(
-		activity,
+		this,
 		arrayOf(permission),
 		requestCode
 	)

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

@@ -1,26 +0,0 @@
-package de.markusfisch.android.binaryeye.app
-
-import android.app.Activity
-import android.content.Intent
-import de.markusfisch.android.binaryeye.activity.SplashActivity
-
-private const val RESTART_COUNT = "restart_count"
-
-private var restartCount = 0
-
-fun setRestartCount(intent: Intent?) {
-	intent?.let {
-		restartCount = intent.getIntExtra(RESTART_COUNT, restartCount)
-	}
-}
-
-fun restartApp(activity: Activity? = null) {
-	if (activity != null && restartCount < 3) {
-		val intent = Intent(activity, SplashActivity::class.java)
-		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-		intent.putExtra(RESTART_COUNT, ++restartCount)
-		activity.startActivity(intent)
-		activity.finish()
-	}
-	Runtime.getRuntime().exit(0)
-}

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

@@ -1,17 +1,37 @@
 package de.markusfisch.android.binaryeye.content
 
 import android.content.ClipData
+import android.content.ClipDescription
 import android.content.Context
 import android.os.Build
+import android.os.PersistableBundle
 
-fun Context.copyToClipboard(text: String) {
+fun Context.copyToClipboard(text: String, isSensitive: Boolean = false) {
 	val service = getSystemService(Context.CLIPBOARD_SERVICE)
 	if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
 		@Suppress("DEPRECATION")
 		(service as android.text.ClipboardManager).text = text
 	} else {
 		(service as android.content.ClipboardManager).setPrimaryClip(
-			ClipData.newPlainText("plain text", text)
+			ClipData.newPlainText("plain text", text).apply {
+				setSensitive(isSensitive)
+			}
 		)
 	}
-}
+}
+
+private fun ClipData.setSensitive(isSensitive: Boolean) {
+	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+		description.extras = PersistableBundle().apply {
+			putBoolean(EXTRA_IS_SENSITIVE, isSensitive)
+		}
+	}
+}
+
+private val EXTRA_IS_SENSITIVE = if (
+	Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
+) {
+	ClipDescription.EXTRA_IS_SENSITIVE
+} else {
+	"android.content.extra.IS_SENSITIVE"
+}

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

@@ -0,0 +1,3 @@
+package de.markusfisch.android.binaryeye.content
+
+fun ByteArray.toHexString() = joinToString("") { "%02X".format(it) }

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

@@ -11,13 +11,16 @@ import de.markusfisch.android.binaryeye.R
 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,35 +35,49 @@ fun Context.startIntent(intent: Intent) = try {
 	false
 }
 
-fun shareText(context: Context, text: String, type: String = "text/plain") {
-	val intent = Intent(Intent.ACTION_SEND)
-	intent.putExtra(Intent.EXTRA_TEXT, text)
-	intent.type = type
-	context.execShareIntent(intent)
-}
+fun Context.openUrl(url: String): Boolean = openUri(url.parseAndNormalizeUri())
 
-fun shareUri(context: Context, uri: Uri, type: String) {
-	val intent = Intent(Intent.ACTION_SEND)
-	intent.putExtra(Intent.EXTRA_STREAM, uri)
-	intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-	intent.type = type
-	context.execShareIntent(intent)
-}
+fun Context.openUri(uri: Uri): Boolean = execShareIntent(
+	Intent(Intent.ACTION_VIEW, uri)
+)
 
-fun shareFile(context: Context, file: File, type: String) {
-	getUriForFile(context, file)?.let {
-		shareUri(context, it, type)
-	}
-}
-
-fun getUriForFile(context: Context, file: File): Uri? {
-	return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
-		Uri.fromFile(file)
+fun String.parseAndNormalizeUri(): Uri = Uri.parse(this).let {
+	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+		it.normalizeScheme()
 	} else {
-		FileProvider.getUriForFile(
-			context,
-			BuildConfig.APPLICATION_ID + ".provider",
-			file
-		)
+		it
 	}
 }
+
+fun Context.shareText(text: String, mimeType: String = "text/plain") {
+	execShareIntent(Intent(Intent.ACTION_SEND).apply {
+		putExtra(Intent.EXTRA_TEXT, text)
+		type = mimeType
+	})
+}
+
+fun Context.shareFile(file: File, mimeType: String) {
+	getUriForFile(file)?.let {
+		shareUri(it, mimeType)
+	}
+}
+
+private fun Context.getUriForFile(file: File): Uri? = if (
+	Build.VERSION.SDK_INT < Build.VERSION_CODES.N
+) {
+	Uri.fromFile(file)
+} else {
+	FileProvider.getUriForFile(
+		this,
+		BuildConfig.APPLICATION_ID + ".provider",
+		file
+	)
+}
+
+private fun Context.shareUri(uri: Uri, mimeType: String) {
+	execShareIntent(Intent(Intent.ACTION_SEND).apply {
+		putExtra(Intent.EXTRA_STREAM, uri)
+		addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+		type = mimeType
+	})
+}

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

@@ -2,23 +2,22 @@ package de.markusfisch.android.binaryeye.database
 
 import android.content.Context
 import android.database.Cursor
-import de.markusfisch.android.binaryeye.app.toHexString
+import de.markusfisch.android.binaryeye.content.toHexString
 import de.markusfisch.android.binaryeye.io.writeExternalFile
 import java.io.ByteArrayOutputStream
 import java.io.OutputStream
 
-fun exportCsv(
-	context: Context,
+fun Context.exportCsv(
 	name: String,
 	cursor: Cursor,
 	delimiter: String
-) = writeExternalFile(context, name, "text/csv") { outputStream ->
+) = writeExternalFile(name, "text/csv") { outputStream ->
 	exportCsv(outputStream, cursor, delimiter)
 }
 
-fun exportCsv(cursor: Cursor, delimiter: String): String {
+fun Cursor.exportCsv(delimiter: String): String {
 	val outputStream = ByteArrayOutputStream()
-	exportCsv(outputStream, cursor, delimiter)
+	exportCsv(outputStream, this, delimiter)
 	return outputStream.toString()
 }
 
@@ -35,13 +34,14 @@ private fun exportCsv(
 		Database.SCANS_FORMAT,
 		Database.SCANS_CONTENT,
 		Database.SCANS_ERROR_CORRECTION_LEVEL,
-		Database.SCANS_ISSUE_NUMBER,
-		Database.SCANS_ORIENTATION,
-		Database.SCANS_OTHER_META_DATA,
-		Database.SCANS_PDF417_EXTRA_METADATA,
-		Database.SCANS_POSSIBLE_COUNTRY,
-		Database.SCANS_SUGGESTED_PRICE,
-		Database.SCANS_UPC_EAN_EXTENSION
+		Database.SCANS_VERSION_NUMBER,
+		Database.SCANS_SEQUENCE_SIZE,
+		Database.SCANS_SEQUENCE_INDEX,
+		Database.SCANS_SEQUENCE_ID,
+		Database.SCANS_GTIN_COUNTRY,
+		Database.SCANS_GTIN_ADD_ON,
+		Database.SCANS_GTIN_PRICE,
+		Database.SCANS_GTIN_ISSUE_NUMBER
 	)
 	val indices = columns.map {
 		cursor.getColumnIndex(it)

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

@@ -0,0 +1,32 @@
+package de.markusfisch.android.binaryeye.database
+
+import android.database.Cursor
+
+// Overwrite Kotlin's ".use" function for Cursor because Cursor cannot
+// be cast to Closeable below API level 16. This should be removed when
+// the minSDK is increased to at least JELLY_BEAN (16).
+inline fun <R> Cursor.use(block: (Cursor) -> R): R = try {
+	block.invoke(this)
+} finally {
+	close()
+}
+
+fun Cursor.getInt(name: String): Int {
+	val idx = getColumnIndex(name)
+	return if (idx < 0) 0 else getInt(idx)
+}
+
+fun Cursor.getLong(name: String): Long {
+	val idx = getColumnIndex(name)
+	return if (idx < 0) 0L else getLong(idx)
+}
+
+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)
+}

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 {
@@ -25,7 +24,7 @@ class Database {
 			FROM $SCANS
 			${getWhereClause(query)}
 			ORDER BY $SCANS_DATETIME DESC
-		""", getWhereArguments(query)
+		""".trimMargin(), getWhereArguments(query)
 	)
 
 	fun getScansDetailed(query: String? = null): Cursor? = db.rawQuery(
@@ -37,17 +36,18 @@ class Database {
 			$SCANS_RAW,
 			$SCANS_FORMAT,
 			$SCANS_ERROR_CORRECTION_LEVEL,
-			$SCANS_ISSUE_NUMBER,
-			$SCANS_ORIENTATION,
-			$SCANS_OTHER_META_DATA,
-			$SCANS_PDF417_EXTRA_METADATA,
-			$SCANS_POSSIBLE_COUNTRY,
-			$SCANS_SUGGESTED_PRICE,
-			$SCANS_UPC_EAN_EXTENSION
+			$SCANS_VERSION_NUMBER,
+			$SCANS_SEQUENCE_SIZE,
+			$SCANS_SEQUENCE_INDEX,
+			$SCANS_SEQUENCE_ID,
+			$SCANS_GTIN_COUNTRY,
+			$SCANS_GTIN_ADD_ON,
+			$SCANS_GTIN_PRICE,
+			$SCANS_GTIN_ISSUE_NUMBER
 			FROM $SCANS
 			${getWhereClause(query)}
 			ORDER BY $SCANS_DATETIME DESC
-		""", getWhereArguments(query)
+		""".trimMargin(), getWhereArguments(query)
 	)
 
 	private fun getWhereClause(
@@ -78,16 +78,17 @@ class Database {
 			$SCANS_RAW,
 			$SCANS_FORMAT,
 			$SCANS_ERROR_CORRECTION_LEVEL,
-			$SCANS_ISSUE_NUMBER,
-			$SCANS_ORIENTATION,
-			$SCANS_OTHER_META_DATA,
-			$SCANS_PDF417_EXTRA_METADATA,
-			$SCANS_POSSIBLE_COUNTRY,
-			$SCANS_SUGGESTED_PRICE,
-			$SCANS_UPC_EAN_EXTENSION
+			$SCANS_VERSION_NUMBER,
+			$SCANS_SEQUENCE_SIZE,
+			$SCANS_SEQUENCE_INDEX,
+			$SCANS_SEQUENCE_ID,
+			$SCANS_GTIN_COUNTRY,
+			$SCANS_GTIN_ADD_ON,
+			$SCANS_GTIN_PRICE,
+			$SCANS_GTIN_ISSUE_NUMBER
 			FROM $SCANS
 			WHERE $SCANS_ID = ?
-		""", arrayOf("$id")
+		""".trimMargin(), arrayOf("$id")
 	)?.use {
 		if (it.moveToFirst()) {
 			Scan(
@@ -95,13 +96,14 @@ class Database {
 				it.getBlob(SCANS_RAW),
 				it.getString(SCANS_FORMAT),
 				it.getString(SCANS_ERROR_CORRECTION_LEVEL),
-				it.getString(SCANS_ISSUE_NUMBER),
-				it.getString(SCANS_ORIENTATION),
-				it.getString(SCANS_OTHER_META_DATA),
-				it.getString(SCANS_PDF417_EXTRA_METADATA),
-				it.getString(SCANS_POSSIBLE_COUNTRY),
-				it.getString(SCANS_SUGGESTED_PRICE),
-				it.getString(SCANS_UPC_EAN_EXTENSION),
+				it.getInt(SCANS_VERSION_NUMBER),
+				it.getInt(SCANS_SEQUENCE_SIZE),
+				it.getInt(SCANS_SEQUENCE_INDEX),
+				it.getString(SCANS_SEQUENCE_ID),
+				it.getString(SCANS_GTIN_COUNTRY),
+				it.getString(SCANS_GTIN_ADD_ON),
+				it.getString(SCANS_GTIN_PRICE),
+				it.getString(SCANS_GTIN_ISSUE_NUMBER),
 				it.getString(SCANS_DATETIME),
 				it.getLong(SCANS_ID)
 			)
@@ -110,47 +112,49 @@ 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)
+			}
+			put(SCANS_VERSION_NUMBER, scan.versionNumber)
+			put(SCANS_SEQUENCE_SIZE, scan.sequenceSize)
+			put(SCANS_SEQUENCE_INDEX, scan.sequenceIndex)
+			put(SCANS_SEQUENCE_ID, scan.sequenceId)
+			scan.country?.let { put(SCANS_GTIN_COUNTRY, it) }
+			scan.addOn?.let { put(SCANS_GTIN_ADD_ON, it) }
+			scan.price?.let { put(SCANS_GTIN_PRICE, it) }
+			scan.issueNumber?.let { put(SCANS_GTIN_ISSUE_NUMBER, 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,
 		raw: ByteArray?,
 		format: String
-	): Long {
-		return db.rawQuery(
-			"""SELECT
+	): Long = db.rawQuery(
+		"""SELECT
 				$SCANS_ID,
 				$SCANS_CONTENT,
 				$SCANS_RAW,
@@ -158,21 +162,20 @@ class Database {
 				FROM $SCANS
 				ORDER BY $SCANS_ID DESC
 				LIMIT 1
-			""", null
-		)?.use {
-			if (it.count > 0 &&
-				it.moveToFirst() &&
-				it.getString(it.getColumnIndex(SCANS_CONTENT)) == content &&
-				(raw == null || it.getBlob(it.getColumnIndex(SCANS_RAW))
-					?.contentEquals(raw) == true) &&
-				it.getString(it.getColumnIndex(SCANS_FORMAT)) == format
-			) {
-				it.getLong(it.getColumnIndex(SCANS_ID))
-			} else {
-				0L
-			}
-		} ?: 0L
-	}
+			""".trimMargin(), null
+	)?.use {
+		if (it.count > 0 &&
+			it.moveToFirst() &&
+			it.getString(SCANS_CONTENT) == content &&
+			(raw == null || it.getBlob(SCANS_RAW)
+				?.contentEquals(raw) == true) &&
+			it.getString(SCANS_FORMAT) == format
+		) {
+			it.getLong(SCANS_ID)
+		} else {
+			0L
+		}
+	} ?: 0L
 
 	fun removeScan(id: Long) {
 		db.delete(SCANS, "$SCANS_ID = ?", arrayOf("$id"))
@@ -189,7 +192,7 @@ class Database {
 	}
 
 	private class OpenHelper(context: Context) :
-		SQLiteOpenHelper(context, FILE_NAME, null, 4) {
+		SQLiteOpenHelper(context, FILE_NAME, null, 5) {
 		override fun onCreate(db: SQLiteDatabase) {
 			createScans(db)
 		}
@@ -208,6 +211,9 @@ class Database {
 			if (oldVersion < 4) {
 				addNameColumn(db)
 			}
+			if (oldVersion < 5) {
+				migrateToZxingCpp(db)
+			}
 		}
 	}
 
@@ -221,6 +227,7 @@ class Database {
 		const val SCANS_RAW = "raw"
 		const val SCANS_FORMAT = "format"
 		const val SCANS_ERROR_CORRECTION_LEVEL = "error_correction_level"
+		const val SCANS_VERSION_NUMBER = "version_number"
 		const val SCANS_ISSUE_NUMBER = "issue_number"
 		const val SCANS_ORIENTATION = "orientation"
 		const val SCANS_OTHER_META_DATA = "other_meta_data"
@@ -228,9 +235,16 @@ class Database {
 		const val SCANS_POSSIBLE_COUNTRY = "possible_country"
 		const val SCANS_SUGGESTED_PRICE = "suggested_price"
 		const val SCANS_UPC_EAN_EXTENSION = "upc_ean_extension"
+		const val SCANS_SEQUENCE_SIZE = "sequence_size"
+		const val SCANS_SEQUENCE_INDEX = "sequence_index"
+		const val SCANS_SEQUENCE_ID = "sequence_id"
+		const val SCANS_GTIN_COUNTRY = "gtin_country"
+		const val SCANS_GTIN_ADD_ON = "gtin_add_on"
+		const val SCANS_GTIN_PRICE = "gtin_price"
+		const val SCANS_GTIN_ISSUE_NUMBER = "gtin_issue_number"
 
 		private fun createScans(db: SQLiteDatabase) {
-			db.execSQL("DROP TABLE IF EXISTS $SCANS")
+			db.execSQL("DROP TABLE IF EXISTS $SCANS".trimMargin())
 			db.execSQL(
 				"""CREATE TABLE $SCANS (
 					$SCANS_ID INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -240,46 +254,56 @@ class Database {
 					$SCANS_RAW BLOB,
 					$SCANS_FORMAT TEXT NOT NULL,
 					$SCANS_ERROR_CORRECTION_LEVEL TEXT,
-					$SCANS_ISSUE_NUMBER INT,
-					$SCANS_ORIENTATION INT,
-					$SCANS_OTHER_META_DATA TEXT,
-					$SCANS_PDF417_EXTRA_METADATA TEXT,
-					$SCANS_POSSIBLE_COUNTRY TEXT,
-					$SCANS_SUGGESTED_PRICE TEXT,
-					$SCANS_UPC_EAN_EXTENSION TEXT
-				)"""
+					$SCANS_VERSION_NUMBER INTEGER,
+					$SCANS_SEQUENCE_SIZE INTEGER,
+					$SCANS_SEQUENCE_INDEX INTEGER,
+					$SCANS_SEQUENCE_ID TEXT,
+					$SCANS_GTIN_COUNTRY TEXT,
+					$SCANS_GTIN_ADD_ON TEXT,
+					$SCANS_GTIN_PRICE TEXT,
+					$SCANS_GTIN_ISSUE_NUMBER TEXT
+				)""".trimMargin()
 			)
 		}
 
 		private fun addRawColumn(db: SQLiteDatabase) {
-			db.execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_RAW BLOB")
+			db.execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_RAW BLOB".trimMargin())
 		}
 
 		private fun addMetaDataColumns(db: SQLiteDatabase) {
-			db.execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_ERROR_CORRECTION_LEVEL TEXT")
-			db.execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_ISSUE_NUMBER INT")
-			db.execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_ORIENTATION INT")
-			db.execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_OTHER_META_DATA TEXT")
-			db.execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_PDF417_EXTRA_METADATA TEXT")
-			db.execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_POSSIBLE_COUNTRY TEXT")
-			db.execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_SUGGESTED_PRICE TEXT")
-			db.execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_UPC_EAN_EXTENSION TEXT")
+			db.apply {
+				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_ERROR_CORRECTION_LEVEL TEXT".trimMargin())
+				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_ISSUE_NUMBER INT".trimMargin())
+				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_ORIENTATION INT".trimMargin())
+				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_OTHER_META_DATA TEXT".trimMargin())
+				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_PDF417_EXTRA_METADATA TEXT".trimMargin())
+				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_POSSIBLE_COUNTRY TEXT".trimMargin())
+				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_SUGGESTED_PRICE TEXT".trimMargin())
+				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_UPC_EAN_EXTENSION TEXT".trimMargin())
+			}
 		}
 
 		private fun addNameColumn(db: SQLiteDatabase) {
-			db.execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_NAME TEXT")
+			db.execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_NAME TEXT".trimMargin())
+		}
+
+		private fun migrateToZxingCpp(db: SQLiteDatabase) {
+			db.apply {
+				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_VERSION_NUMBER INTEGER".trimMargin())
+				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_SEQUENCE_SIZE INTEGER".trimMargin())
+				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_SEQUENCE_INDEX INTEGER".trimMargin())
+				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_SEQUENCE_ID TEXT".trimMargin())
+				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_GTIN_COUNTRY TEXT".trimMargin())
+				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_GTIN_ADD_ON TEXT".trimMargin())
+				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_GTIN_PRICE TEXT".trimMargin())
+				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_GTIN_ISSUE_NUMBER TEXT".trimMargin())
+				execSQL("UPDATE $SCANS SET $SCANS_SEQUENCE_SIZE = -1")
+				execSQL("UPDATE $SCANS SET $SCANS_SEQUENCE_INDEX = -1")
+				execSQL("UPDATE $SCANS SET $SCANS_GTIN_COUNTRY = $SCANS_POSSIBLE_COUNTRY")
+				execSQL("UPDATE $SCANS SET $SCANS_GTIN_ADD_ON = $SCANS_UPC_EAN_EXTENSION")
+				execSQL("UPDATE $SCANS SET $SCANS_GTIN_PRICE = $SCANS_SUGGESTED_PRICE")
+				execSQL("UPDATE $SCANS SET $SCANS_GTIN_ISSUE_NUMBER = $SCANS_ISSUE_NUMBER")
+			}
 		}
 	}
 }
-
-private fun Cursor.getString(name: String) = this.getString(
-	this.getColumnIndex(name)
-)
-
-private fun Cursor.getBlob(name: String) = this.getBlob(
-	this.getColumnIndex(name)
-)
-
-private fun Cursor.getLong(name: String) = this.getLong(
-	this.getColumnIndex(name)
-)

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

@@ -6,16 +6,15 @@ import de.markusfisch.android.binaryeye.io.writeExternalFile
 import java.io.File
 import java.io.FileInputStream
 
-fun exportDatabase(activity: Activity, fileName: String): Boolean {
+fun Activity.exportDatabase(fileName: String): Boolean {
 	val dbFile = File(
 		Environment.getDataDirectory(),
-		"//data//${activity.packageName}//databases//${Database.FILE_NAME}"
+		"//data//${packageName}//databases//${Database.FILE_NAME}"
 	)
 	if (!dbFile.exists()) {
 		return false
 	}
 	return writeExternalFile(
-		activity,
 		fileName,
 		"application/vnd.sqlite3"
 	) {

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

@@ -2,24 +2,23 @@ package de.markusfisch.android.binaryeye.database
 
 import android.content.Context
 import android.database.Cursor
-import de.markusfisch.android.binaryeye.app.toHexString
+import de.markusfisch.android.binaryeye.content.toHexString
 import de.markusfisch.android.binaryeye.io.writeExternalFile
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 
-fun exportJson(
-	context: Context,
+fun Context.exportJson(
 	name: String,
 	cursor: Cursor
-) = writeExternalFile(context, name, "application/json") { outputStream ->
-	exportJson(cursor)?.let {
+) = writeExternalFile(name, "application/json") { outputStream ->
+	cursor.exportJson()?.let {
 		outputStream.write(it.toByteArray())
 	}
 }
 
-fun exportJson(cursor: Cursor): String? {
-	if (!cursor.moveToFirst()) {
+fun Cursor.exportJson(): String? {
+	if (!moveToFirst()) {
 		return null
 	}
 	val columns = arrayOf(
@@ -27,30 +26,31 @@ fun exportJson(cursor: Cursor): String? {
 		Database.SCANS_FORMAT,
 		Database.SCANS_CONTENT,
 		Database.SCANS_ERROR_CORRECTION_LEVEL,
-		Database.SCANS_ISSUE_NUMBER,
-		Database.SCANS_ORIENTATION,
-		Database.SCANS_OTHER_META_DATA,
-		Database.SCANS_PDF417_EXTRA_METADATA,
-		Database.SCANS_POSSIBLE_COUNTRY,
-		Database.SCANS_SUGGESTED_PRICE,
-		Database.SCANS_UPC_EAN_EXTENSION
+		Database.SCANS_VERSION_NUMBER,
+		Database.SCANS_SEQUENCE_SIZE,
+		Database.SCANS_SEQUENCE_INDEX,
+		Database.SCANS_SEQUENCE_ID,
+		Database.SCANS_GTIN_COUNTRY,
+		Database.SCANS_GTIN_ADD_ON,
+		Database.SCANS_GTIN_PRICE,
+		Database.SCANS_GTIN_ISSUE_NUMBER
 	)
 	val indices = columns.map {
-		Pair(cursor.getColumnIndex(it), it)
+		Pair(getColumnIndex(it), it)
 	}
-	val contentIndex = cursor.getColumnIndex(Database.SCANS_CONTENT)
-	val rawIndex = cursor.getColumnIndex(Database.SCANS_RAW)
+	val contentIndex = getColumnIndex(Database.SCANS_CONTENT)
+	val rawIndex = getColumnIndex(Database.SCANS_RAW)
 	val root = JSONArray()
 	do {
 		var deviation: Pair<Int, String>? = null
-		if (cursor.getString(contentIndex)?.isEmpty() == true) {
+		if (getString(contentIndex)?.isEmpty() == true) {
 			deviation = Pair(
 				contentIndex,
-				cursor.getBlob(rawIndex).toHexString()
+				getBlob(rawIndex).toHexString()
 			)
 		}
-		root.put(cursor.toJsonObject(indices, deviation))
-	} while (cursor.moveToNext())
+		root.put(toJsonObject(indices, deviation))
+	} while (moveToNext())
 	return root.toString()
 }
 

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

@@ -1,42 +1,33 @@
 package de.markusfisch.android.binaryeye.database
 
+import android.graphics.Bitmap
+import android.os.Build
 import android.os.Parcel
 import android.os.Parcelable
 import android.text.format.DateFormat
-import com.google.zxing.Result
-import com.google.zxing.ResultMetadataType
+import de.markusfisch.android.zxingcpp.ZxingCpp
+import de.markusfisch.android.zxingcpp.ZxingCpp.ContentType
+import de.markusfisch.android.zxingcpp.ZxingCpp.Format
+import de.markusfisch.android.zxingcpp.ZxingCpp.Result
 
 data class Scan(
 	val content: String,
 	val raw: ByteArray?,
 	val format: String,
-	val errorCorrectionLevel: String?,
-	val issueNumber: String?,
-	val orientation: String?,
-	val otherMetaData: String?,
-	val pdf417ExtraMetaData: String?,
-	val possibleCountry: String?,
-	val suggestedPrice: String?,
-	val upcEanExtension: String?,
-	val timestamp: String = getDateTime(),
+	val errorCorrectionLevel: String? = null,
+	val versionNumber: Int = 0,
+	val sequenceSize: Int = -1,
+	val sequenceIndex: Int = -1,
+	val sequenceId: String = "",
+	val country: String? = null,
+	val addOn: String? = null,
+	val price: String? = null,
+	val issueNumber: String? = null,
+	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
+	// this isn't handled well by Kotlin.
 	override fun equals(other: Any?): Boolean {
 		if (this === other) {
 			return true
@@ -48,70 +39,76 @@ 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))) &&
 				format == other.format &&
 				errorCorrectionLevel == other.errorCorrectionLevel &&
-				issueNumber == other.issueNumber &&
-				orientation == other.orientation &&
-				otherMetaData == other.otherMetaData &&
-				pdf417ExtraMetaData == other.pdf417ExtraMetaData &&
-				possibleCountry == other.possibleCountry &&
-				suggestedPrice == other.suggestedPrice &&
-				upcEanExtension == other.upcEanExtension
+				versionNumber == other.versionNumber &&
+				sequenceSize == other.sequenceSize &&
+				sequenceIndex == other.sequenceIndex &&
+				sequenceId == other.sequenceId &&
+				country == other.country &&
+				addOn == other.addOn &&
+				price == other.price &&
+				issueNumber == other.issueNumber
 	}
 
 	// Needs to be overwritten manually, as ByteArray is an array and
-	// this isn't handled well by Kotlin
+	// 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()
 		result = 31 * result + (errorCorrectionLevel?.hashCode() ?: 0)
+		result = 31 * result + versionNumber
+		result = 31 * result + sequenceSize
+		result = 31 * result + sequenceIndex
+		result = 31 * result + sequenceId.hashCode()
+		result = 31 * result + (country?.hashCode() ?: 0)
+		result = 31 * result + (addOn?.hashCode() ?: 0)
+		result = 31 * result + (price?.hashCode() ?: 0)
 		result = 31 * result + (issueNumber?.hashCode() ?: 0)
-		result = 31 * result + (orientation?.hashCode() ?: 0)
-		result = 31 * result + (otherMetaData?.hashCode() ?: 0)
-		result = 31 * result + (pdf417ExtraMetaData?.hashCode() ?: 0)
-		result = 31 * result + (possibleCountry?.hashCode() ?: 0)
-		result = 31 * result + (suggestedPrice?.hashCode() ?: 0)
-		result = 31 * result + (upcEanExtension?.hashCode() ?: 0)
 		return result
 	}
 
 	private constructor(parcel: Parcel) : this(
 		content = parcel.readString() ?: "",
-		raw = readByteArray(parcel),
+		raw = parcel.readSizedByteArray(),
 		format = parcel.readString() ?: "",
 		errorCorrectionLevel = parcel.readString(),
+		versionNumber = parcel.readInt(),
+		sequenceSize = parcel.readInt(),
+		sequenceIndex = parcel.readInt(),
+		sequenceId = parcel.readString() ?: "",
+		country = parcel.readString(),
+		addOn = parcel.readString(),
+		price = parcel.readString(),
 		issueNumber = parcel.readString(),
-		orientation = parcel.readString(),
-		otherMetaData = parcel.readString(),
-		pdf417ExtraMetaData = parcel.readString(),
-		possibleCountry = parcel.readString(),
-		suggestedPrice = parcel.readString(),
-		upcEanExtension = parcel.readString(),
-		timestamp = parcel.readString() ?: "",
+		dateTime = parcel.readString() ?: "",
 		id = parcel.readLong()
 	)
 
 	override fun writeToParcel(parcel: Parcel, flags: Int) {
-		parcel.writeString(content)
-		writeByteArray(parcel, raw)
-		parcel.writeString(format)
-		parcel.writeString(errorCorrectionLevel)
-		parcel.writeString(issueNumber)
-		parcel.writeString(orientation)
-		parcel.writeString(otherMetaData)
-		parcel.writeString(pdf417ExtraMetaData)
-		parcel.writeString(possibleCountry)
-		parcel.writeString(suggestedPrice)
-		parcel.writeString(upcEanExtension)
-		parcel.writeString(timestamp)
-		parcel.writeLong(id)
+		parcel.apply {
+			writeString(content)
+			writeSizedByteArray(raw)
+			writeString(format)
+			writeString(errorCorrectionLevel)
+			writeInt(versionNumber)
+			writeInt(sequenceSize)
+			writeInt(sequenceIndex)
+			writeString(sequenceId)
+			writeString(country)
+			writeString(addOn)
+			writeString(price)
+			writeString(issueNumber)
+			writeString(dateTime)
+			writeLong(id)
+		}
 	}
 
 	override fun describeContents() = 0
@@ -125,47 +122,98 @@ data class Scan(
 	}
 }
 
-private fun getDateTime(time: Long = System.currentTimeMillis()) = DateFormat.format(
-	"yyyy-MM-dd HH:mm:ss",
+fun Result.toScan(): Scan {
+	val content: String
+	val raw: ByteArray?
+	when (contentType) {
+		ContentType.GS1,
+		ContentType.ISO15434,
+		ContentType.TEXT -> {
+			content = text
+			raw = null
+		}
+		else -> {
+			content = ""
+			raw = rawBytes
+		}
+	}
+	return Scan(
+		content,
+		raw,
+		format,
+		ecLevel,
+		versionNumber,
+		sequenceSize,
+		sequenceIndex,
+		sequenceId,
+		gtin?.country,
+		gtin?.addOn,
+		gtin?.price,
+		gtin?.issueNumber
+	)
+}
+
+data class Recreation(
+	val format: Format,
+	val ecLevel: Int,
+	val size: Int,
+	val margin: Int
+) {
+	fun encode(content: String): Bitmap? = try {
+		ZxingCpp.encodeAsBitmap(
+			content, format, size, size, margin, ecLevel
+		)
+	} catch (_: RuntimeException) {
+		null
+	}
+}
+
+fun Scan.toRecreation(
+	size: Int = 128,
+	margin: Int = -1
+) = if (content.isEmpty()) {
+	null
+} else {
+	Recreation(
+		Format.valueOf(format),
+		when (errorCorrectionLevel) {
+			"L" -> 0
+			"M" -> 1
+			"Q" -> 2
+			"H" -> 3
+			else -> -1
+		},
+		size,
+		margin
+	)
+}
+
+private fun getDateTime(
+	time: Long = System.currentTimeMillis()
+) = DateFormat.format(
+	if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
+		// Up to API level 17, 'k' was interpreted as 'H', which wasn't
+		// implemented until API level 18.
+		"yyyy-MM-dd kk:mm:ss"
+	} else {
+		"yyyy-MM-dd HH:mm:ss"
+	},
 	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 writeByteArray(parcel: Parcel, array: ByteArray?) {
+private fun Parcel.writeSizedByteArray(array: ByteArray?) {
 	val size = array?.size ?: 0
-	parcel.writeInt(size)
+	writeInt(size)
 	if (size > 0) {
-		parcel.writeByteArray(array)
+		writeByteArray(array)
 	}
 }
 
-private fun readByteArray(parcel: Parcel): ByteArray? {
-	val size = parcel.readInt()
+private fun Parcel.readSizedByteArray(): ByteArray? {
+	val size = readInt()
 	return if (size > 0) {
 		val array = ByteArray(size)
-		parcel.readByteArray(array)
+		readByteArray(array)
 		array
 	} else {
 		null

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

@@ -9,8 +9,6 @@ import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.view.*
 import android.widget.EditText
-import com.google.zxing.BarcodeFormat
-import com.google.zxing.EncodeHintType
 import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.app.hasWritePermission
 import de.markusfisch.android.binaryeye.content.copyToClipboard
@@ -23,12 +21,9 @@ import de.markusfisch.android.binaryeye.view.doOnApplyWindowInsets
 import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
 import de.markusfisch.android.binaryeye.widget.ConfinedScalingImageView
 import de.markusfisch.android.binaryeye.widget.toast
-import de.markusfisch.android.binaryeye.zxing.encodeAsBitmap
-import de.markusfisch.android.binaryeye.zxing.encodeAsSvg
-import de.markusfisch.android.binaryeye.zxing.encodeAsText
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
+import de.markusfisch.android.zxingcpp.ZxingCpp
+import de.markusfisch.android.zxingcpp.ZxingCpp.Format
+import kotlinx.coroutines.*
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
@@ -40,11 +35,10 @@ class BarcodeFragment : Fragment() {
 		PNG, SVG, TXT
 	}
 
-	private var barcodeBitmap: Bitmap? = null
-	private var barcodeSvg: String? = null
-	private var barcodeTxt: String? = null
-	private var content: String = ""
-	private var format: BarcodeFormat? = null
+	private val parentJob = Job()
+	private val scope = CoroutineScope(Dispatchers.IO + parentJob)
+
+	private lateinit var barcode: Barcode
 
 	override fun onCreate(state: Bundle?) {
 		super.onCreate(state)
@@ -65,15 +59,13 @@ class BarcodeFragment : Fragment() {
 			false
 		)
 
-		val args = arguments ?: return view
-		val content = args.getString(CONTENT) ?: return view
-		val format = args.getSerializable(FORMAT) as BarcodeFormat? ?: return view
-		val hints = args.getSerializable(HINTS) as EnumMap<EncodeHintType, Any>?
-		val size = args.getInt(SIZE)
+		val bitmap: Bitmap
 		try {
-			barcodeBitmap = encodeAsBitmap(content, format, size, size, hints)
-			barcodeSvg = encodeAsSvg(content, format, hints)
-			barcodeTxt = encodeAsText(content, format, hints)
+			barcode = arguments?.toProperties() ?: throw IllegalArgumentException(
+				"Illegal arguments"
+			)
+			// Catch exceptions from encoding.
+			bitmap = barcode.bitmap
 		} catch (e: Exception) {
 			var message = e.message
 			if (message == null || message.isEmpty()) {
@@ -85,21 +77,21 @@ class BarcodeFragment : Fragment() {
 			fragmentManager.popBackStack()
 			return null
 		}
-		this.content = content
-		this.format = format
 
 		val imageView = view.findViewById<ConfinedScalingImageView>(
 			R.id.barcode
 		)
-		imageView.setImageBitmap(barcodeBitmap)
+		imageView.setImageBitmap(bitmap)
 		imageView.post {
 			// Make sure to invoke this after ScalingImageView.onLayout().
 			imageView.minWidth /= 2f
 		}
 
 		view.findViewById<View>(R.id.share).setOnClickListener {
-			pickFileType(context, R.string.share_as) {
-				shareAs(it)
+			it.context?.apply {
+				pickFileType(R.string.share_as) { fileType ->
+					shareAs(fileType)
+				}
 			}
 		}
 
@@ -111,6 +103,24 @@ class BarcodeFragment : Fragment() {
 		return view
 	}
 
+	private fun Bundle.toProperties() = Barcode(
+		getString(CONTENT) ?: throw IllegalArgumentException(
+			"content cannot be null"
+		),
+		Format.valueOf(
+			getString(FORMAT) ?: throw IllegalArgumentException(
+				"format cannot be null"
+			)
+		),
+		getInt(SIZE),
+		getInt(EC_LEVEL)
+	)
+
+	override fun onDestroyView() {
+		super.onDestroyView()
+		parentJob.cancel()
+	}
+
 	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
 		inflater.inflate(R.menu.fragment_barcode, menu)
 	}
@@ -118,14 +128,14 @@ class BarcodeFragment : Fragment() {
 	override fun onOptionsItemSelected(item: MenuItem): Boolean {
 		return when (item.itemId) {
 			R.id.copy_to_clipboard -> {
-				barcodeTxt?.let {
-					context.copyToClipboard(it)
-					context.toast(R.string.copied_to_clipboard)
+				context.apply {
+					copyToClipboard(barcode.text)
+					toast(R.string.copied_to_clipboard)
 				}
 				true
 			}
 			R.id.export_to_file -> {
-				pickFileType(context, R.string.export_as) {
+				context.pickFileType(R.string.export_as) {
 					askForFileNameAndSave(it)
 				}
 				true
@@ -134,13 +144,12 @@ class BarcodeFragment : Fragment() {
 		}
 	}
 
-	private fun pickFileType(
-		context: Context,
+	private fun Context.pickFileType(
 		title: Int,
 		action: (FileType) -> Unit
 	) {
 		val fileTypes = FileType.values()
-		AlertDialog.Builder(context)
+		AlertDialog.Builder(this)
 			.setTitle(title)
 			.setItems(fileTypes.map { it.name }.toTypedArray()) { _, which ->
 				action(fileTypes[which])
@@ -154,13 +163,15 @@ class BarcodeFragment : Fragment() {
 		val ac = activity ?: return
 		// Write permission is only required before Android Q.
 		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&
-			!hasWritePermission(ac) { askForFileNameAndSave(fileType) }
+			!ac.hasWritePermission { askForFileNameAndSave(fileType) }
 		) {
 			return
 		}
 		val view = ac.layoutInflater.inflate(R.layout.dialog_save_file, null)
 		val editText = view.findViewById<EditText>(R.id.file_name)
-		editText.setText(encodeFileName("${format.toString()}_$content"))
+		editText.setText(
+			encodeFileName("${barcode.format}_${barcode.content}")
+		)
 		AlertDialog.Builder(ac)
 			.setView(view)
 			.setPositiveButton(android.R.string.ok) { _, _ ->
@@ -170,23 +181,19 @@ class BarcodeFragment : Fragment() {
 						addSuffixIfNotGiven(fileName, ".png"),
 						MIME_PNG
 					) {
-						barcodeBitmap?.saveAsPng(it)
+						barcode.bitmap.saveAsPng(it)
 					}
 					FileType.SVG -> saveAs(
 						addSuffixIfNotGiven(fileName, ".svg"),
 						MIME_SVG
 					) { outputStream ->
-						barcodeSvg?.let {
-							outputStream.write(it.toByteArray())
-						}
+						outputStream.write(barcode.svg.toByteArray())
 					}
 					FileType.TXT -> saveAs(
 						addSuffixIfNotGiven(fileName, ".txt"),
 						MIME_TXT
 					) { outputStream ->
-						barcodeTxt?.let {
-							outputStream.write(it.toByteArray())
-						}
+						outputStream.write(barcode.text.toByteArray())
 					}
 				}
 			}
@@ -201,27 +208,26 @@ class BarcodeFragment : Fragment() {
 		write: (outputStream: OutputStream) -> Unit
 	) {
 		val ac = activity ?: return
-		GlobalScope.launch(Dispatchers.IO) {
-			val message = writeExternalFile(ac, fileName, mimeType, write).toSaveResult()
-			launch(Dispatchers.Main) {
+		scope.launch(Dispatchers.IO) {
+			val message = ac.writeExternalFile(fileName, mimeType, write).toSaveResult()
+			withContext(Dispatchers.Main) {
 				ac.toast(message)
 			}
 		}
 	}
 
-	private fun shareAs(fileType: FileType) {
+	private fun Context.shareAs(fileType: FileType) {
 		when (fileType) {
-			FileType.PNG -> barcodeBitmap?.let { share(it) }
-			FileType.SVG -> barcodeSvg?.let { shareText(context, it, MIME_SVG) }
-			FileType.TXT -> barcodeTxt?.let { shareText(context, it) }
+			FileType.PNG -> share(barcode.bitmap)
+			FileType.SVG -> shareText(barcode.svg, MIME_SVG)
+			FileType.TXT -> shareText(barcode.text)
 		}
 	}
 
-	private fun share(bitmap: Bitmap) {
-		val ctx = context ?: return
-		GlobalScope.launch(Dispatchers.IO) {
+	private fun Context.share(bitmap: Bitmap) {
+		scope.launch(Dispatchers.IO) {
 			val file = File(
-				ctx.externalCacheDir,
+				externalCacheDir,
 				"shared_barcode.png"
 			)
 			val success = try {
@@ -232,11 +238,11 @@ class BarcodeFragment : Fragment() {
 			} catch (e: IOException) {
 				false
 			}
-			launch(Dispatchers.Main) {
+			withContext(Dispatchers.Main) {
 				if (success) {
-					shareFile(ctx, file, "image/png")
+					shareFile(file, "image/png")
 				} else {
-					ctx.toast(R.string.error_saving_file)
+					toast(R.string.error_saving_file)
 				}
 			}
 		}
@@ -245,25 +251,23 @@ class BarcodeFragment : Fragment() {
 	companion object {
 		private const val CONTENT = "content"
 		private const val FORMAT = "format"
-		private const val HINTS = "hints"
 		private const val SIZE = "size"
+		private const val EC_LEVEL = "ec_level"
 		private const val MIME_PNG = "image/png"
 		private const val MIME_SVG = "image/svg+xmg"
 		private const val MIME_TXT = "text/plain"
 
 		fun newInstance(
 			content: String,
-			format: BarcodeFormat,
+			format: Format,
 			size: Int,
-			hints: EnumMap<EncodeHintType, Any>? = null
+			ecLevel: Int = -1
 		): Fragment {
 			val args = Bundle()
 			args.putString(CONTENT, content)
-			args.putSerializable(FORMAT, format)
-			hints?.let {
-				args.putSerializable(HINTS, it)
-			}
+			args.putString(FORMAT, format.name)
 			args.putInt(SIZE, size)
+			args.putInt(EC_LEVEL, ecLevel)
 			val fragment = BarcodeFragment()
 			fragment.arguments = args
 			return fragment
@@ -271,10 +275,29 @@ class BarcodeFragment : Fragment() {
 	}
 }
 
-private fun Bitmap.saveAsPng(outputStream: OutputStream, quality: Int = 90) {
-	this.compress(Bitmap.CompressFormat.PNG, quality, outputStream)
+private data class Barcode(
+	val content: String,
+	val format: Format,
+	val size: Int,
+	val ecLevel: Int
+) {
+	val bitmap: Bitmap
+		get() = ZxingCpp.encodeAsBitmap(
+			content, format, size, size, -1, ecLevel
+		)
+	val svg: String
+		get() = ZxingCpp.encodeAsSvg(
+			content, format, -1, ecLevel
+		)
+	val text: String
+		get() = ZxingCpp.encodeAsText(
+			content, format, -1, ecLevel
+		)
 }
 
+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 =
 	fileNameCharacters.replace(name, "_").take(16).trim('_').lowercase(Locale.getDefault())

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

@@ -5,14 +5,14 @@ import android.os.Bundle
 import android.support.design.widget.FloatingActionButton
 import android.support.v4.app.Fragment
 import android.text.Editable
+import android.text.Html
 import android.text.TextWatcher
+import android.text.method.LinkMovementMethod
 import android.view.*
-import android.widget.EditText
-import android.widget.TableLayout
-import android.widget.TableRow
-import android.widget.TextView
+import android.widget.*
 import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.actions.ActionRegistry
+import de.markusfisch.android.binaryeye.actions.IAction
 import de.markusfisch.android.binaryeye.actions.wifi.WifiAction
 import de.markusfisch.android.binaryeye.actions.wifi.WifiConnector
 import de.markusfisch.android.binaryeye.activity.MainActivity
@@ -20,16 +20,17 @@ 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.shareText
+import de.markusfisch.android.binaryeye.content.toHexString
+import de.markusfisch.android.binaryeye.database.Recreation
 import de.markusfisch.android.binaryeye.database.Scan
+import de.markusfisch.android.binaryeye.database.toRecreation
 import de.markusfisch.android.binaryeye.io.askForFileName
 import de.markusfisch.android.binaryeye.io.toSaveResult
 import de.markusfisch.android.binaryeye.io.writeExternalFile
 import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
 import de.markusfisch.android.binaryeye.widget.toast
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
+import kotlin.math.roundToInt
 
 class DecodeFragment : Fragment() {
 	private lateinit var contentView: EditText
@@ -37,19 +38,24 @@ class DecodeFragment : Fragment() {
 	private lateinit var dataView: TableLayout
 	private lateinit var metaView: TableLayout
 	private lateinit var hexView: TextView
-	private lateinit var format: String
+	private lateinit var stampView: TextView
+	private lateinit var recreationView: ImageView
 	private lateinit var fab: FloatingActionButton
+	private lateinit var format: String
 
 	private val parentJob = Job()
 	private val scope: CoroutineScope = CoroutineScope(Dispatchers.Main + parentJob)
+	private val dp: Float
+		get() = resources.displayMetrics.density
 	private val content: String
 		get() = contentView.text.toString()
 
 	private var closeAutomatically = false
 	private var action = ActionRegistry.DEFAULT_ACTION
 	private var isBinary = false
-	private var raw: ByteArray = ByteArray(0)
+	private var originalBytes: ByteArray = ByteArray(0)
 	private var id = 0L
+	private var recreation: Recreation? = null
 
 	override fun onCreate(state: Bundle?) {
 		super.onCreate(state)
@@ -72,72 +78,42 @@ class DecodeFragment : Fragment() {
 		closeAutomatically = prefs.closeAutomatically &&
 				activity?.intent?.hasExtra(MainActivity.DECODED) == true
 
-		val scan = arguments?.getParcelable(SCAN) as Scan?
-			?: throw IllegalArgumentException("DecodeFragment needs a Scan")
+		val scan = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+			arguments?.getParcelable(SCAN, Scan::class.java)
+		} else {
+			@Suppress("DEPRECATION")
+			arguments?.getParcelable(SCAN) as Scan?
+		} ?: throw IllegalArgumentException("DecodeFragment needs a Scan")
+
+		val originalContent = scan.content
+		isBinary = scan.raw != null
+		originalBytes = scan.raw ?: originalContent.toByteArray()
+		format = scan.format
 		id = scan.id
 
-		val inputContent = scan.content
-		isBinary = hasNonPrintableCharacters(
-			inputContent
-		) or inputContent.isEmpty()
-		raw = scan.raw ?: inputContent.toByteArray()
-		format = scan.format
-
 		contentView = view.findViewById(R.id.content)
-		fab = view.findViewById(R.id.open)
-
-		if (!isBinary) {
-			contentView.setText(inputContent)
-			contentView.addTextChangedListener(object : TextWatcher {
-				override fun afterTextChanged(s: Editable?) {
-					updateViewsAndAction(content.toByteArray())
-				}
-
-				override fun beforeTextChanged(
-					s: CharSequence?,
-					start: Int,
-					count: Int,
-					after: Int
-				) {
-				}
-
-				override fun onTextChanged(
-					s: CharSequence?,
-					start: Int,
-					before: Int,
-					count: Int
-				) {
-				}
-			})
-			fab.setOnClickListener {
-				executeAction(content.toByteArray())
-			}
-			if (prefs.openImmediately) {
-				executeAction(content.toByteArray())
-			}
-		} else {
-			contentView.setText(R.string.binary_data)
-			contentView.isEnabled = false
-			fab.setImageResource(R.drawable.ic_action_save)
-			fab.setOnClickListener {
-				askForFileNameAndSave(raw)
-			}
-		}
-
 		formatView = view.findViewById(R.id.format)
 		dataView = view.findViewById(R.id.data)
 		metaView = view.findViewById(R.id.meta)
 		hexView = view.findViewById(R.id.hex)
+		stampView = view.findViewById(R.id.stamp)
+		recreationView = view.findViewById(R.id.recreation)
+		fab = view.findViewById(R.id.open)
 
-		updateViewsAndAction(raw)
-
-		if (!isBinary) {
-			fillDataView(dataView, inputContent)
-		}
+		initContentAndFab(originalContent)
 
 		if (prefs.showMetaData) {
-			fillMetaView(metaView, scan)
+			metaView.fillMetaView(scan)
+		} else {
+			metaView.visibility = View.GONE
 		}
+		if (prefs.showRecreation) {
+			recreation = scan.toRecreation(
+				(200f * dp).roundToInt()
+			)
+		}
+
+		updateViewsAndFab(originalContent, originalBytes)
 
 		(view.findViewById(R.id.inset_layout) as View).setPaddingFromWindowInsets()
 		(view.findViewById(R.id.scroll_view) as View).setPaddingFromWindowInsets()
@@ -150,91 +126,175 @@ class DecodeFragment : Fragment() {
 		parentJob.cancel()
 	}
 
-	private fun updateViewsAndAction(bytes: ByteArray) {
+	private fun initContentAndFab(originalContent: String) {
+		if (isBinary) {
+			contentView.setText(String(originalBytes).foldNonAlNum())
+			contentView.isEnabled = false
+			fab.setImageResource(R.drawable.ic_action_save)
+			fab.setOnClickListener {
+				askForFileNameAndSave(originalBytes)
+			}
+		} else {
+			contentView.setText(originalContent)
+			contentView.addTextChangedListener(object : TextWatcher {
+				override fun afterTextChanged(s: Editable?) {
+					updateViewsAndFab(s?.toString() ?: "")
+				}
+
+				override fun beforeTextChanged(
+					s: CharSequence?,
+					start: Int,
+					count: Int,
+					after: Int
+				) = Unit
+
+				override fun onTextChanged(
+					s: CharSequence?,
+					start: Int,
+					before: Int,
+					count: Int
+				) = Unit
+			})
+			fab.setOnClickListener {
+				executeAction(content)
+			}
+			if (prefs.openImmediately) {
+				executeAction(content)
+			}
+		}
+	}
+
+	private fun updateViewsAndFab(text: String, bytes: ByteArray? = null) {
+		val b = bytes ?: text.toByteArray()
+		resolveActionAndUpdateFab(b)
+		updateViews(text, b)
+	}
+
+	private fun resolveActionAndUpdateFab(bytes: ByteArray) {
 		val prevAction = action
 		if (!prevAction.canExecuteOn(bytes)) {
 			action = ActionRegistry.getAction(bytes)
 		}
+		if (prevAction !== action) {
+			updateFab(action)
+		}
+	}
+
+	private fun updateFab(action: IAction) {
+		fab.setImageResource(action.iconResId)
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+			fab.setOnLongClickListener { v ->
+				v.context.toast(action.titleResId)
+				true
+			}
+		} else {
+			fab.tooltipText = getString(action.titleResId)
+		}
+	}
+
+	private fun updateViews(text: String, bytes: ByteArray) {
 		formatView.text = resources.getQuantityString(
 			R.plurals.barcode_info,
 			bytes.size,
 			prettifyFormatName(format),
 			bytes.size
 		)
-		hexView.text = if (prefs.showHexDump) hexDump(bytes) else ""
-		if (prevAction !== action) {
-			fab.setImageResource(action.iconResId)
-			if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-				fab.setOnLongClickListener { v ->
-					v.context.toast(action.titleResId)
-					true
-				}
-			} else {
-				fab.tooltipText = getString(action.titleResId)
+		hexView.showIf(prefs.showHexDump) { v ->
+			v.text = hexDump(bytes)
+		}
+		recreationView.showIf(prefs.showRecreation) { v ->
+			val r = recreation ?: return@showIf
+			v.setImageBitmap(r.encode(text))
+			v.setOnClickListener {
+				fragmentManager?.addFragment(
+					BarcodeFragment.newInstance(
+						text,
+						r.format,
+						r.size,
+						r.ecLevel
+					)
+				)
 			}
 		}
+		dataView.fillDataView(text)
+		stampView.setTrackingLink(bytes, format)
 	}
 
-	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) {
+	private fun TableLayout.fillDataView(text: 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(text)?.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)
+		fill(items)
 	}
 
-	private fun fillMetaView(tableLayout: TableLayout, scan: Scan) {
-		fillDataTable(
-			tableLayout, linkedMapOf(
-				R.string.error_correction_level to scan.errorCorrectionLevel,
-				R.string.issue_number to scan.issueNumber,
-				R.string.orientation to scan.orientation,
-				R.string.other_meta_data to scan.otherMetaData,
-				R.string.pdf417_extra_metadata to scan.pdf417ExtraMetaData,
-				R.string.possible_country to scan.possibleCountry,
-				R.string.suggested_price to scan.suggestedPrice,
-				R.string.upc_ean_extension to scan.upcEanExtension
-			)
+	private fun TableLayout.fillMetaView(scan: Scan) {
+		val items = linkedMapOf(
+			R.string.error_correction_level to scan.errorCorrectionLevel,
+			R.string.sequence_size to scan.sequenceSize.positiveToString(),
+			R.string.sequence_index to scan.sequenceIndex.positiveToString(),
+			R.string.sequence_id to scan.sequenceId,
+			R.string.gtin_country to scan.country,
+			R.string.gtin_add_on to scan.addOn,
+			R.string.gtin_price to scan.price,
+			R.string.gtin_issue_number to scan.issueNumber,
 		)
+		if (scan.versionNumber > 0) {
+			val versionString = if (scan.format == "QR_CODE") {
+				getString(
+					R.string.qr_version_and_modules,
+					scan.versionNumber,
+					scan.versionNumber * 4 + 17
+				)
+			} else {
+				scan.versionNumber.toString()
+			}
+			items.putAll(
+				linkedMapOf(
+					R.string.barcode_version_number to versionString
+				)
+			)
+		}
+		fill(items)
+	}
+
+	private fun TableLayout.fill(
+		items: LinkedHashMap<Int, String?>
+	) {
+		removeAllViews()
+		visibility = if (items.isEmpty()) View.GONE else {
+			val ctx = context
+			val spaceBetween = (16f * dp).roundToInt()
+			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)
+					addView(tr)
+				}
+			}
+			View.VISIBLE
+		}
 	}
 
 	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -264,15 +324,14 @@ class DecodeFragment : Fragment() {
 				true
 			}
 			R.id.share -> {
-				context?.also {
-					shareText(it, textOrHex())
+				context?.apply {
+					shareText(textOrHex())
 					maybeBackOrFinish()
 				}
 				true
 			}
 			R.id.create -> {
-				addFragment(
-					fragmentManager,
+				fragmentManager?.addFragment(
 					EncodeFragment.newInstance(content, format)
 				)
 				true
@@ -287,7 +346,7 @@ class DecodeFragment : Fragment() {
 	}
 
 	private fun textOrHex() = if (isBinary) {
-		raw.toHexString()
+		originalBytes.toHexString()
 	} else {
 		content
 	}
@@ -297,16 +356,16 @@ class DecodeFragment : Fragment() {
 		if (ac is WifiAction) {
 			ac.password?.let { password ->
 				activity?.apply {
-					copyToClipboard(password)
+					copyToClipboard(password, isSensitive = true)
 					toast(R.string.copied_password_to_clipboard)
 				}
 			}
 		}
 	}
 
-	private fun copyToClipboard(text: String) {
+	private fun copyToClipboard(text: String, isSensitive: Boolean = false) {
 		activity?.apply {
-			copyToClipboard(text)
+			copyToClipboard(text, isSensitive)
 			toast(R.string.copied_to_clipboard)
 		}
 	}
@@ -326,17 +385,17 @@ class DecodeFragment : Fragment() {
 		}
 	}
 
-	private fun executeAction(content: ByteArray) {
+	private fun executeAction(content: String) {
 		val ac = activity ?: return
 		if (content.isNotEmpty()) {
 			if (action is WifiAction &&
 				Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&
-				!hasLocationPermission(ac) { executeAction(content) }
+				!ac.hasLocationPermission { executeAction(content) }
 			) {
 				return
 			}
 			scope.launch {
-				action.execute(ac, content)
+				action.execute(ac, content.toByteArray())
 				maybeBackOrFinish()
 			}
 		}
@@ -346,20 +405,23 @@ class DecodeFragment : Fragment() {
 		val ac = activity ?: return
 		// Write permission is only required before Android Q.
 		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&
-			!hasWritePermission(ac) { askForFileNameAndSave(raw) }
+			!ac.hasWritePermission { askForFileNameAndSave(raw) }
 		) {
 			return
 		}
 		scope.launch(Dispatchers.Main) {
 			val name = ac.askForFileName() ?: return@launch
-			val message = writeExternalFile(
-				ac,
-				name,
-				"application/octet-stream"
-			) {
-				it.write(raw)
-			}.toSaveResult()
-			ac.toast(message)
+			withContext(Dispatchers.IO) {
+				val message = ac.writeExternalFile(
+					name,
+					"application/octet-stream"
+				) {
+					it.write(raw)
+				}.toSaveResult()
+				withContext(Dispatchers.Main) {
+					ac.toast(message)
+				}
+			}
 		}
 	}
 
@@ -376,6 +438,23 @@ class DecodeFragment : Fragment() {
 	}
 }
 
+private inline fun <T : View> T.showIf(
+	visible: Boolean,
+	block: (T) -> Unit
+) {
+	visibility = if (visible) {
+		block.invoke(this)
+		View.VISIBLE
+	} else {
+		View.GONE
+	}
+}
+
+private val nonAlNum = "[^a-zA-Z0-9]".toRegex()
+private val multipleDots = "[…]+".toRegex()
+private fun String.foldNonAlNum() = replace(nonAlNum, "…")
+	.replace(multipleDots, "…")
+
 private fun hexDump(bytes: ByteArray, charsPerLine: Int = 33): String {
 	if (charsPerLine < 4 || bytes.isEmpty()) {
 		return ""
@@ -414,3 +493,92 @@ private fun hexDump(bytes: ByteArray, charsPerLine: Int = 33): String {
 	}
 	return dump.toString()
 }
+
+private fun Int.positiveToString() = if (this > -1) this.toString() else ""
+
+private fun TextView.setTrackingLink(bytes: ByteArray, format: String) {
+	val trackingLink = generateDpTrackingLink(bytes, format)
+	if (trackingLink != null) {
+		text = trackingLink.fromHtml()
+		isClickable = true
+		movementMethod = LinkMovementMethod.getInstance()
+	} else {
+		visibility = View.GONE
+	}
+}
+
+private fun generateDpTrackingLink(bytes: ByteArray, format: String): String? {
+	// Check for Deutsche Post Matrixcode stamp.
+	var isStamp = false
+	var rawData = bytes
+	if (format == "DATA_MATRIX" &&
+		bytes.toString(Charsets.ISO_8859_1).startsWith("DEA5")
+	) {
+		if (bytes.size == 47) {
+			isStamp = true
+		} else if (bytes.size > 47) {
+			// Transform back to original data.
+			rawData = bytes.toString(Charsets.UTF_8).toByteArray(
+				Charsets.ISO_8859_1
+			)
+			if (rawData.size == 47) {
+				isStamp = true
+			}
+		}
+	}
+
+	if (!isStamp) {
+		return null
+	}
+
+	val hex = StringBuilder()
+	hex.append(String.format("%02X", rawData[9]))
+	hex.append(String.format("%02X", rawData[10]))
+	hex.append(String.format("%02X", rawData[11]))
+	hex.append(String.format("%02X", rawData[12]))
+	hex.append(String.format("%02X", rawData[13]))
+	hex.append(String.format("%X", (rawData[4].toInt() and 0x0f).toByte()))
+	hex.append(String.format("%02X", rawData[5]))
+	hex.append(String.format("%02X", rawData[6]))
+	hex.append(String.format("%02X", rawData[7]))
+	hex.append(String.format("%02X", rawData[8]))
+	val hexString = hex.toString()
+	val trackingNumber = hexString + String.format(
+		"%X",
+		crc4(hexString.toByteArray(Charsets.ISO_8859_1))
+	)
+	return "<a href=\"https://www.deutschepost.de/de/s/sendungsverfolgung/verfolgen.html?piececode=$trackingNumber\">Deutsche Post: $trackingNumber</a>"
+}
+
+// CRC-4 with polynomial x^4 + x + 1.
+private fun crc4(input: ByteArray): Int {
+	var crc = 0
+	var i = 0
+	while (i < input.size) {
+		val c = input[i].toInt()
+		var j = 0x80
+		while (j != 0) {
+			var bit = crc and 0x8
+			crc = crc shl 1
+			if (c and j != 0) {
+				bit = bit xor 0x8
+			}
+			if (bit != 0) {
+				crc = crc xor 0x3
+			}
+			j = j ushr 1
+		}
+		++i
+	}
+	crc = crc and 0xF
+	return crc
+}
+
+private fun String.fromHtml() = if (
+	Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
+) {
+	Html.fromHtml(this, Html.FROM_HTML_MODE_LEGACY)
+} else {
+	@Suppress("DEPRECATION")
+	Html.fromHtml(this)
+}

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

@@ -6,16 +6,13 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
-import com.google.zxing.BarcodeFormat
-import com.google.zxing.EncodeHintType
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
 import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.adapter.prettifyFormatName
 import de.markusfisch.android.binaryeye.app.addFragment
 import de.markusfisch.android.binaryeye.app.prefs
 import de.markusfisch.android.binaryeye.view.hideSoftKeyboard
 import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
-import java.util.*
+import de.markusfisch.android.zxingcpp.ZxingCpp.Format
 
 class EncodeFragment : Fragment() {
 	private lateinit var formatView: Spinner
@@ -26,17 +23,17 @@ class EncodeFragment : Fragment() {
 	private lateinit var contentView: EditText
 
 	private val writers = arrayListOf(
-		BarcodeFormat.AZTEC,
-		BarcodeFormat.CODABAR,
-		BarcodeFormat.CODE_39,
-		BarcodeFormat.CODE_128,
-		BarcodeFormat.DATA_MATRIX,
-		BarcodeFormat.EAN_8,
-		BarcodeFormat.EAN_13,
-		BarcodeFormat.ITF,
-		BarcodeFormat.PDF_417,
-		BarcodeFormat.QR_CODE,
-		BarcodeFormat.UPC_A
+		Format.AZTEC,
+		Format.CODABAR,
+		Format.CODE_39,
+		Format.CODE_128,
+		Format.DATA_MATRIX,
+		Format.EAN_8,
+		Format.EAN_13,
+		Format.ITF,
+		Format.PDF_417,
+		Format.QR_CODE,
+		Format.UPC_A
 	)
 
 	override fun onCreateView(
@@ -71,7 +68,7 @@ class EncodeFragment : Fragment() {
 				id: Long
 			) {
 				val visibility = if (
-					writers[position] == BarcodeFormat.QR_CODE
+					writers[position] == Format.QR_CODE
 				) {
 					View.VISIBLE
 				} else {
@@ -94,14 +91,14 @@ class EncodeFragment : Fragment() {
 		contentView = view.findViewById(R.id.content)
 
 		val args = arguments
-		args?.also {
-			contentView.setText(it.getString(CONTENT))
+		args?.getString(CONTENT)?.let {
+			contentView.setText(it)
 		}
 
 		val barcodeFormat = args?.getString(FORMAT)
 		if (barcodeFormat != null) {
 			formatView.setSelection(
-				writers.indexOf(resolveFormat(barcodeFormat))
+				writers.indexOf(barcodeFormat.toFormat())
 			)
 		} else if (state == null) {
 			formatView.post {
@@ -125,17 +122,6 @@ class EncodeFragment : Fragment() {
 	}
 
 	private fun encode() {
-		val hints = EnumMap<EncodeHintType, Any>(EncodeHintType::class.java)
-		val format = writers[formatView.selectedItemPosition]
-		if (format == BarcodeFormat.QR_CODE) {
-			hints[EncodeHintType.ERROR_CORRECTION] = arrayListOf(
-				ErrorCorrectionLevel.L,
-				ErrorCorrectionLevel.M,
-				ErrorCorrectionLevel.Q,
-				ErrorCorrectionLevel.H
-			)[errorCorrectionLevel.selectedItemPosition]
-		}
-		val size = getSize(sizeBarView.progress)
 		val content = contentView.text.toString()
 		if (content.isEmpty()) {
 			Toast.makeText(
@@ -145,9 +131,13 @@ class EncodeFragment : Fragment() {
 			).show()
 		} else {
 			activity?.hideSoftKeyboard(contentView)
-			addFragment(
-				fragmentManager,
-				BarcodeFragment.newInstance(content, format, size, hints)
+			fragmentManager?.addFragment(
+				BarcodeFragment.newInstance(
+					content,
+					writers[formatView.selectedItemPosition],
+					getSize(sizeBarView.progress),
+					errorCorrectionLevel.selectedItemPosition
+				)
 			)
 		}
 	}
@@ -182,11 +172,11 @@ class EncodeFragment : Fragment() {
 		private const val FORMAT = "format"
 
 		fun newInstance(
-			content: String,
+			content: String? = null,
 			format: String? = null
 		): Fragment {
 			val args = Bundle()
-			args.putString(CONTENT, content)
+			content?.let { args.putString(CONTENT, content) }
 			format?.let { args.putString(FORMAT, it) }
 			val fragment = EncodeFragment()
 			fragment.arguments = args
@@ -195,8 +185,8 @@ class EncodeFragment : Fragment() {
 	}
 }
 
-private fun resolveFormat(name: String): BarcodeFormat = try {
-	BarcodeFormat.valueOf(name)
+private fun String.toFormat(default: Format = Format.QR_CODE): Format = try {
+	Format.valueOf(this)
 } catch (_: IllegalArgumentException) {
-	BarcodeFormat.QR_CODE
+	default
 }

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

@@ -23,10 +23,7 @@ import de.markusfisch.android.binaryeye.adapter.ScansAdapter
 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.exportCsv
-import de.markusfisch.android.binaryeye.database.exportDatabase
-import de.markusfisch.android.binaryeye.database.exportJson
+import de.markusfisch.android.binaryeye.database.*
 import de.markusfisch.android.binaryeye.io.askForFileName
 import de.markusfisch.android.binaryeye.io.toSaveResult
 import de.markusfisch.android.binaryeye.view.*
@@ -75,7 +72,7 @@ class HistoryFragment : Fragment() {
 			val ac = activity ?: return false
 			return when (item.itemId) {
 				R.id.copy_scan -> {
-					scansAdapter?.getSelectedContent()?.let {
+					scansAdapter?.getSelectedContent("\n")?.let {
 						ac.copyToClipboard(it)
 						ac.toast(R.string.copied_to_clipboard)
 					}
@@ -83,19 +80,21 @@ class HistoryFragment : Fragment() {
 					true
 				}
 				R.id.edit_scan -> {
-					scansAdapter?.let {
-						askForName(
-							ac,
-							it.selectedScanId,
-							getScanName(it.selectedScanPosition)
+					scansAdapter?.forSelection { id, position ->
+						ac.askForName(
+							id,
+							scansAdapter?.getName(position),
+							scansAdapter?.getContent(position)
 						)
 					}
 					closeActionMode()
 					true
 				}
 				R.id.remove_scan -> {
-					scansAdapter?.let {
-						askToRemoveScan(ac, it.selectedScanId)
+					scansAdapter?.getSelectedIds()?.let {
+						if (it.isNotEmpty()) {
+							ac.askToRemoveScans(it)
+						}
 					}
 					closeActionMode()
 					true
@@ -145,8 +144,7 @@ class HistoryFragment : Fragment() {
 			showScan(id)
 		}
 		listView.setOnItemLongClickListener { _, v, position, id ->
-			v.isSelected = true
-			scansAdapter?.select(id, position)
+			scansAdapter?.select(v, id, position)
 			if (actionMode == null && ac is AppCompatActivity) {
 				actionMode = ac.delegate.startSupportActionMode(
 					actionModeCallback
@@ -158,7 +156,7 @@ class HistoryFragment : Fragment() {
 
 		fab = view.findViewById(R.id.share)
 		fab.setOnClickListener { v ->
-			pickListSeparatorAndShare(v.context)
+			v.context.pickListSeparatorAndShare()
 		}
 
 		progressView = view.findViewById(R.id.progress_view)
@@ -220,7 +218,7 @@ class HistoryFragment : Fragment() {
 	override fun onOptionsItemSelected(item: MenuItem): Boolean {
 		return when (item.itemId) {
 			R.id.clear -> {
-				askToRemoveScans(context)
+				context.askToRemoveScans()
 				true
 			}
 			R.id.export_history -> {
@@ -293,29 +291,28 @@ class HistoryFragment : Fragment() {
 	private fun showScan(id: Long) = db.getScan(id)?.also { scan ->
 		closeActionMode()
 		try {
-			addFragment(
-				fragmentManager,
-				DecodeFragment.newInstance(scan)
-			)
+			fragmentManager?.addFragment(DecodeFragment.newInstance(scan))
 		} catch (e: IllegalArgumentException) {
 			// Ignore, can never happen.
 		}
 	}
 
-	private fun getScanName(position: Int): String? {
-		val cursor = scansAdapter?.getItem(position) as Cursor?
-		return cursor?.getString(cursor.getColumnIndex(Database.SCANS_NAME))
-	}
-
 	// Dialogs don't have a parent layout.
 	@SuppressLint("InflateParams")
-	private fun askForName(context: Context, id: Long, text: String?) {
-		val view = LayoutInflater.from(context).inflate(
+	private fun Context.askForName(id: Long, text: String?, content: String?) {
+		val view = LayoutInflater.from(this).inflate(
 			R.layout.dialog_enter_name, null
 		)
 		val nameView = view.findViewById<EditText>(R.id.name)
 		nameView.setText(text)
-		AlertDialog.Builder(context)
+		AlertDialog.Builder(this)
+			.setTitle(
+				if (content.isNullOrEmpty()) {
+					getString(R.string.binary_data)
+				} else {
+					content
+				}
+			)
 			.setView(view)
 			.setPositiveButton(android.R.string.ok) { _, _ ->
 				val name = nameView.text.toString()
@@ -326,11 +323,17 @@ class HistoryFragment : Fragment() {
 			.show()
 	}
 
-	private fun askToRemoveScan(context: Context, id: Long) {
-		AlertDialog.Builder(context)
-			.setMessage(R.string.really_remove_scan)
+	private fun Context.askToRemoveScans(ids: List<Long>) {
+		AlertDialog.Builder(this)
+			.setMessage(
+				if (ids.size > 1) {
+					R.string.really_remove_selected_scans
+				} else {
+					R.string.really_remove_scan
+				}
+			)
 			.setPositiveButton(android.R.string.ok) { _, _ ->
-				db.removeScan(id)
+				ids.forEach { db.removeScan(it) }
 				if (scansAdapter?.count == 1) {
 					updateAndClearFilter()
 				} else {
@@ -342,8 +345,8 @@ class HistoryFragment : Fragment() {
 			.show()
 	}
 
-	private fun askToRemoveScans(context: Context) {
-		AlertDialog.Builder(context)
+	private fun Context.askToRemoveScans() {
+		AlertDialog.Builder(this)
 			.setMessage(
 				if (filter == null) {
 					R.string.really_remove_all_scans
@@ -366,14 +369,14 @@ class HistoryFragment : Fragment() {
 			progressView.useVisibility {
 				// Write permission is only required before Android Q.
 				if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&
-					!hasWritePermission(ac) { askToExportToFile() }
+					!ac.hasWritePermission { askToExportToFile() }
 				) {
 					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,11 +392,11 @@ class HistoryFragment : Fragment() {
 					)
 				} ?: return@useVisibility
 				val message = when (delimiter) {
-					"db" -> exportDatabase(ac, name)
+					"db" -> ac.exportDatabase(name)
 					else -> db.getScansDetailed(filter)?.use {
 						when (delimiter) {
-							"json" -> exportJson(context, name, it)
-							else -> exportCsv(context, name, it, delimiter)
+							"json" -> ac.exportJson(name, it)
+							else -> ac.exportCsv(name, it, delimiter)
 						}
 					} ?: false
 				}.toSaveResult()
@@ -404,11 +407,11 @@ class HistoryFragment : Fragment() {
 		}
 	}
 
-	private fun pickListSeparatorAndShare(context: Context) {
-		val separators = context.resources.getStringArray(
+	private fun Context.pickListSeparatorAndShare() {
+		val separators = resources.getStringArray(
 			R.array.list_separators_values
 		)
-		AlertDialog.Builder(context)
+		AlertDialog.Builder(this)
 			.setTitle(R.string.pick_list_separator)
 			.setItems(R.array.list_separators_names) { _, which ->
 				shareScans(separators[which])
@@ -422,31 +425,31 @@ class HistoryFragment : Fragment() {
 			db.getScansDetailed(filter)?.use { cursor ->
 				val details = format.split(":")
 				text = when (details[0]) {
-					"text" -> exportText(cursor, details[1])
-					"csv" -> exportCsv(cursor, details[1])
-					else -> exportJson(cursor)
+					"text" -> cursor.exportText(details[1])
+					"csv" -> cursor.exportCsv(details[1])
+					else -> cursor.exportJson()
 				}
 			}
 			text?.let {
 				withContext(Dispatchers.Main) {
-					shareText(context, it)
+					context.shareText(it)
 				}
 			}
 		}
 	}
 }
 
-private fun exportText(cursor: Cursor, separator: String): String {
+private fun Cursor.exportText(separator: String): String {
 	val sb = StringBuilder()
-	val contentIndex = cursor.getColumnIndex(Database.SCANS_CONTENT)
-	if (cursor.moveToFirst()) {
+	val contentIndex = getColumnIndex(Database.SCANS_CONTENT)
+	if (contentIndex > -1 && moveToFirst()) {
 		do {
-			val content = cursor.getString(contentIndex)
+			val content = getString(contentIndex)
 			if (content?.isNotEmpty() == true) {
 				sb.append(content)
 				sb.append(separator)
 			}
-		} while (cursor.moveToNext())
+		} while (moveToNext())
 	}
 	return sb.toString()
 }

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

@@ -52,28 +52,28 @@ class PreferencesFragment : PreferenceFragmentCompat() {
 			pref.isVisible = false
 		} else {
 			pref.setOnPreferenceClickListener {
-				askToClearNetworkSuggestions(context)
+				context.askToClearNetworkSuggestions()
 				true
 			}
 		}
 	}
 
 	@RequiresApi(Build.VERSION_CODES.Q)
-	private fun askToClearNetworkSuggestions(context: Context) {
-		AlertDialog.Builder(context)
+	private fun Context.askToClearNetworkSuggestions() {
+		AlertDialog.Builder(this)
 			.setMessage(R.string.really_remove_all_networks)
 			.setPositiveButton(android.R.string.ok) { _, _ ->
-				clearNetworkSuggestions(context)
+				clearNetworkSuggestions()
 			}
 			.setNegativeButton(android.R.string.cancel) { _, _ -> }
 			.show()
 	}
 
 	@RequiresApi(Build.VERSION_CODES.Q)
-	private fun clearNetworkSuggestions(context: Context) {
-		context.toast(
+	private fun Context.clearNetworkSuggestions() {
+		toast(
 			if (
-				removeNetworkSuggestions(context) == WifiManager.STATUS_NETWORK_SUGGESTIONS_SUCCESS
+				removeNetworkSuggestions(this) == WifiManager.STATUS_NETWORK_SUGGESTIONS_SUCCESS
 			) {
 				R.string.clear_network_suggestions_success
 			} else {

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

@@ -50,15 +50,7 @@ class UrlDialogFragment : PreferenceDialogFragmentCompat() {
 		Scan(
 			"test",
 			null,
-			"none",
-			null,
-			null,
-			null,
-			null,
-			null,
-			null,
-			null,
-			null
+			"none"
 		).sendAsync(url, prefs.sendScanType) { code, body ->
 			textView.text = when {
 				code != null -> "$code"

app/src/main/kotlin/de/markusfisch/android/binaryeye/graphics/BitmapEditor.kt

@@ -11,9 +11,9 @@ import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.roundToInt
 
-fun loadImageUri(cr: ContentResolver, uri: Uri): Bitmap? = try {
+fun ContentResolver.loadImageUri(uri: Uri): Bitmap? = try {
 	val options = BitmapFactory.Options()
-	cr.openInputStream(uri)?.use {
+	openInputStream(uri)?.use {
 		options.inJustDecodeBounds = true
 		BitmapFactory.decodeStream(it, null, options)
 		options.inSampleSize = calculateInSampleSize(
@@ -22,7 +22,7 @@ fun loadImageUri(cr: ContentResolver, uri: Uri): Bitmap? = try {
 		)
 		options.inJustDecodeBounds = false
 	}
-	cr.openInputStream(uri)?.use {
+	openInputStream(uri)?.use {
 		BitmapFactory.decodeStream(it, null, options)
 	}
 } catch (e: IOException) {
@@ -49,8 +49,13 @@ private fun calculateInSampleSize(
 	return inSampleSize
 }
 
-fun crop(bitmap: Bitmap, rect: RectF, rotation: Float) = try {
-	val erected = erect(bitmap, rotation)
+fun Bitmap.crop(
+	rect: RectF,
+	rotation: Float,
+	pivotX: Float,
+	pivotY: Float
+) = try {
+	val erected = erect(rotation, pivotX, pivotY)
 	val w = erected.width
 	val h = erected.height
 	val x = max(0, (rect.left * w).roundToInt())
@@ -59,8 +64,8 @@ fun crop(bitmap: Bitmap, rect: RectF, rotation: Float) = try {
 		erected,
 		x,
 		y,
-		min(w - x, (rect.width() * w).roundToInt()),
-		min(h - y, (rect.height() * h).roundToInt())
+		min(w - x, (rect.right * w).roundToInt() - x),
+		min(h - y, (rect.bottom * h).roundToInt() - y)
 	)
 } catch (e: OutOfMemoryError) {
 	null
@@ -68,20 +73,24 @@ fun crop(bitmap: Bitmap, rect: RectF, rotation: Float) = try {
 	null
 }
 
-private fun erect(bitmap: Bitmap, rotation: Float): Bitmap = if (
+private fun Bitmap.erect(
+	rotation: Float,
+	pivotX: Float,
+	pivotY: Float
+): Bitmap = if (
 	rotation % 360f != 0f
 ) {
-	val matrix = Matrix()
-	matrix.setRotate(rotation)
 	Bitmap.createBitmap(
-		bitmap,
+		this,
 		0,
 		0,
-		bitmap.width,
-		bitmap.height,
-		matrix,
+		width,
+		height,
+		Matrix().apply {
+			setRotate(rotation, pivotX, pivotY)
+		},
 		true
 	)
 } else {
-	bitmap
+	this
 }

app/src/main/kotlin/de/markusfisch/android/binaryeye/graphics/Mapping.kt

@@ -2,61 +2,86 @@ package de.markusfisch.android.binaryeye.graphics
 
 import android.graphics.Matrix
 import android.graphics.Rect
-import com.google.zxing.ResultPoint
+import android.graphics.RectF
+import de.markusfisch.android.zxingcpp.ZxingCpp.Position
+import kotlin.math.roundToInt
 
-fun mapResultToView(
-	frameWidth: Int,
-	frameHeight: Int,
-	frameOrientation: Int,
-	viewRect: Rect,
-	resultPoints: Array<ResultPoint?>,
-	targetArray: FloatArray
-): Int = getFrameToViewMatrix(
-	frameWidth,
-	frameHeight,
-	frameOrientation,
-	viewRect
-).map(
-	resultPoints,
-	targetArray
+data class FrameMetrics(
+	var width: Int = 0,
+	var height: Int = 0,
+	var orientation: Int = 0
 )
 
-fun getFrameToViewMatrix(
-	frameWidth: Int,
-	frameHeight: Int,
-	frameOrientation: Int,
-	viewRect: Rect
-) = Matrix().apply {
-	// Normalize to frame dimensions for rotation.
-	postScale(
-		1f / frameWidth,
-		1f / frameHeight
-	)
-	// Rotate around center.
-	postRotate(frameOrientation.toFloat(), 0.5f, 0.5f)
-	// Scale up to view size.
-	postScale(viewRect.width().toFloat(), viewRect.height().toFloat())
-	// Apply view displacement.
-	postTranslate(viewRect.left.toFloat(), viewRect.top.toFloat())
+fun Rect.setFrameRoi(
+	frameMetrics: FrameMetrics,
+	viewRect: Rect,
+	viewRoi: Rect
+) {
+	Matrix().apply {
+		// Map ROI from view coordinates to frame coordinates.
+		setScale(1f / viewRect.width(), 1f / viewRect.height())
+		postRotate(-frameMetrics.orientation.toFloat(), .5f, .5f)
+		postScale(frameMetrics.width.toFloat(), frameMetrics.height.toFloat())
+		postTranslate(-viewRect.left.toFloat(), -viewRect.top.toFloat())
+		val frameRoiF = RectF()
+		val viewRoiF = RectF(
+			viewRoi.left.toFloat(),
+			viewRoi.top.toFloat(),
+			viewRoi.right.toFloat(),
+			viewRoi.bottom.toFloat()
+		)
+		mapRect(frameRoiF, viewRoiF)
+		set(
+			frameRoiF.left.roundToInt(),
+			frameRoiF.top.roundToInt(),
+			frameRoiF.right.roundToInt(),
+			frameRoiF.bottom.roundToInt()
+		)
+	}
 }
 
-fun Matrix.map(
-	resultPoints: Array<ResultPoint?>,
-	targetArray: FloatArray
-): Int {
-	val max = targetArray.size
-	var i = 0
-	for (resultPoint in resultPoints) {
-		// Because ZXing apparently returns null in this array sometimes.
-		if (resultPoint == null) {
-			continue
+fun Matrix.setFrameToView(
+	frameMetrics: FrameMetrics,
+	viewRect: Rect,
+	viewRoi: Rect? = null
+) {
+	// Configure this matrix to map points in frame coordinates to
+	// view coordinates.
+	val uprightWidth: Int
+	val uprightHeight: Int
+	when (frameMetrics.orientation) {
+		90, 270 -> {
+			uprightWidth = frameMetrics.height
+			uprightHeight = frameMetrics.width
 		}
-		targetArray[i++] = resultPoint.x
-		targetArray[i++] = resultPoint.y
-		if (i >= max) {
-			break
+		else -> {
+			uprightWidth = frameMetrics.width
+			uprightHeight = frameMetrics.height
 		}
 	}
-	mapPoints(targetArray, 0, targetArray, 0, i)
+	setScale(
+		viewRect.width().toFloat() / uprightWidth,
+		viewRect.height().toFloat() / uprightHeight
+	)
+	viewRoi?.let {
+		postTranslate(viewRoi.left.toFloat(), viewRoi.top.toFloat())
+	}
+}
+
+fun Matrix.mapPosition(
+	position: Position,
+	coords: FloatArray
+): Int {
+	var i = 0
+	setOf(
+		position.topLeft,
+		position.topRight,
+		position.bottomRight,
+		position.bottomLeft
+	).forEach {
+		coords[i++] = it.x.toFloat()
+		coords[i++] = it.y.toFloat()
+	}
+	mapPoints(coords)
 	return i
 }

app/src/main/kotlin/de/markusfisch/android/binaryeye/graphics/Transparency.kt

@@ -0,0 +1,57 @@
+package de.markusfisch.android.binaryeye.graphics
+
+import android.graphics.Bitmap
+import android.graphics.Canvas
+
+fun Bitmap.fixTransparency(): Bitmap {
+	val result = analyzeTransparency()
+	return if (result.hasTransparentPixels) {
+		val copy = Bitmap.createBitmap(
+			width,
+			height,
+			config
+		)
+		Canvas(copy).apply {
+			drawColor(result.backgroundColor)
+			drawBitmap(this@fixTransparency, 0f, 0f, null)
+		}
+		copy
+	} else {
+		this
+	}
+}
+
+private fun Bitmap.analyzeTransparency(): Result {
+	val pixels = IntArray(width * height)
+	getPixels(pixels, 0, width, 0, 0, width, height)
+	var transparent = 0
+	var visible = 0
+	var bright = 0
+	for (pixel in pixels) {
+		val alpha = (pixel shr 24) and 0xff
+		if (alpha < 0xff) {
+			++transparent
+		}
+		if (alpha > 0) {
+			++visible
+			if (
+				((pixel shr 16) and 0xff) +
+				((pixel shr 8) and 0xff) +
+				(pixel and 0xff) > 128
+			) ++bright
+		}
+	}
+	return Result(
+		transparent > 0,
+		if (bright > 0 && visible / bright < 2) {
+			0xff000000.toInt()
+		} else {
+			0xffffffff.toInt()
+		}
+	)
+}
+
+private data class Result(
+	val hasTransparentPixels: Boolean,
+	val backgroundColor: Int
+)

app/src/main/kotlin/de/markusfisch/android/binaryeye/io/FileSaving.kt

@@ -46,20 +46,18 @@ fun Boolean.toSaveResult() = if (this) {
 	R.string.error_saving_file
 }
 
-fun writeExternalFile(
-	context: Context,
+fun Context.writeExternalFile(
 	fileName: String,
 	mimeType: String,
 	write: (outputStream: OutputStream) -> Unit
 ): Boolean = try {
-	openExternalOutputStream(context, fileName, mimeType).use { write(it) }
+	openExternalOutputStream(fileName, mimeType).use { write(it) }
 	true
 } catch (e: IOException) {
 	false
 }
 
-private fun openExternalOutputStream(
-	context: Context,
+private fun Context.openExternalOutputStream(
 	fileName: String,
 	mimeType: String
 ): OutputStream = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
@@ -75,7 +73,7 @@ private fun openExternalOutputStream(
 	}
 	FileOutputStream(file)
 } else {
-	val resolver = context.contentResolver
+	val resolver = contentResolver
 	val uri = resolver.insert(
 		MediaStore.Downloads.EXTERNAL_CONTENT_URI,
 		ContentValues().apply {

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

@@ -1,6 +1,6 @@
 package de.markusfisch.android.binaryeye.net
 
-import de.markusfisch.android.binaryeye.app.toHexString
+import de.markusfisch.android.binaryeye.content.toHexString
 import de.markusfisch.android.binaryeye.database.Scan
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -14,9 +14,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,34 +50,33 @@ 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(),
 	"format" to format,
 	"errorCorrectionLevel" to errorCorrectionLevel,
+	"versionNumber" to versionNumber.toString(),
+	"sequenceSize" to sequenceSize.toString(),
+	"sequenceIndex" to sequenceIndex.toString(),
+	"sequenceId" to sequenceId,
+	"country" to country,
+	"addOn" to addOn,
+	"price" to price,
 	"issueNumber" to issueNumber,
-	"orientation" to orientation,
-	"otherMetaData" to otherMetaData,
-	"pdf417ExtraMetaData" to pdf417ExtraMetaData,
-	"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/net/Url.kt

@@ -0,0 +1,10 @@
+package de.markusfisch.android.binaryeye.net
+
+import java.io.UnsupportedEncodingException
+import java.net.URLEncoder
+
+fun String.urlEncode(): String = try {
+	URLEncoder.encode(this, "UTF-8")
+} catch (e: UnsupportedEncodingException) {
+	this
+}

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

@@ -1,11 +1,14 @@
 package de.markusfisch.android.binaryeye.os
 
+import android.content.Context
 import android.os.Build
 import android.os.VibrationEffect
 import android.os.Vibrator
 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 +16,37 @@ private val errorPatternAmplitudes = intArrayOf(
 	255, 0, 255, 0, 255
 )
 
+// On SDK 31 and better, we should ask the `VIBRATOR_MANAGER_SERVICE`
+// for the default vibrator. This was implemented here before:
+/*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
+}*/
+// But for reasons beyond my interests, using `VIBRATOR_MANAGER_SERVICE`
+// leads to a very cryptic `java.lang.VerifyError: r0/b` on Android 4.
+// This is probably a Proguard/R8 issue, but I don't want to waste more
+// time just to get rid of the deprecation warning. So let's use the old
+// `VIBRATOR_SERVICE` and wait for Google to fix their stuff.
+fun Context.getVibrator(): Vibrator = getSystemService(
+	Context.VIBRATOR_SERVICE
+) as Vibrator
+
 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 +56,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

@@ -5,28 +5,29 @@ import android.content.SharedPreferences
 import android.os.Build
 import android.preference.PreferenceManager
 import android.support.annotation.RequiresApi
+import de.markusfisch.android.zxingcpp.ZxingCpp.Format
 
 class Preferences {
 	lateinit var preferences: SharedPreferences
 
 	var barcodeFormats = setOf(
-		"AZTEC",
-		"CODABAR",
-		"CODE_39",
-		"CODE_93",
-		"CODE_128",
-		"DATA_MATRIX",
-		"EAN_8",
-		"EAN_13",
-		"ITF",
-		"MAXICODE",
-		"PDF_417",
-		"QR_CODE",
-		"RSS_14",
-		"RSS_EXPANDED",
-		"UPC_A",
-		"UPC_E",
-		"UPC_EAN_EXTENSION"
+		Format.AZTEC.name,
+		Format.CODABAR.name,
+		Format.CODE_39.name,
+		Format.CODE_93.name,
+		Format.CODE_128.name,
+		Format.DATA_BAR.name,
+		Format.DATA_BAR_EXPANDED.name,
+		Format.DATA_MATRIX.name,
+		Format.EAN_8.name,
+		Format.EAN_13.name,
+		Format.ITF.name,
+		Format.MAXICODE.name,
+		Format.PDF_417.name,
+		Format.QR_CODE.name,
+		Format.MICRO_QR_CODE.name,
+		Format.UPC_A.name,
+		Format.UPC_E.name,
 	)
 		@RequiresApi(Build.VERSION_CODES.HONEYCOMB)
 		set(value) {
@@ -58,7 +59,7 @@ class Preferences {
 			apply(ZOOM_BY_SWIPING, value)
 			field = value
 		}
-	var autoRotate = false
+	var autoRotate = true
 		set(value) {
 			// Immediately save this setting before it shouldn't change
 			// on the fly while scanning.
@@ -128,6 +129,11 @@ class Preferences {
 			apply(SHOW_HEX_DUMP, value)
 			field = value
 		}
+	var showRecreation = true
+		set(value) {
+			apply(SHOW_RECREATION, value)
+			field = value
+		}
 	var closeAutomatically = false
 		set(value) {
 			apply(CLOSE_AUTOMATICALLY, value)
@@ -143,6 +149,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 +174,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.
@@ -220,6 +231,7 @@ class Preferences {
 		)
 		showMetaData = preferences.getBoolean(SHOW_META_DATA, showMetaData)
 		showHexDump = preferences.getBoolean(SHOW_HEX_DUMP, showHexDump)
+		showRecreation = preferences.getBoolean(SHOW_RECREATION, showRecreation)
 		closeAutomatically = preferences.getBoolean(
 			CLOSE_AUTOMATICALLY,
 			closeAutomatically
@@ -230,6 +242,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 +294,33 @@ 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 = "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 SHOW_RECREATION = "show_recreation"
+		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/rs/Analyzer.kt

@@ -1,42 +0,0 @@
-package de.markusfisch.android.binaryeye.rs
-
-import android.graphics.Bitmap
-import android.graphics.Canvas
-import android.support.v8.renderscript.Allocation
-import android.support.v8.renderscript.RenderScript
-
-fun fixTransparency(rs: RenderScript, bitmap: Bitmap?): Bitmap? {
-	bitmap ?: return null
-	val result = analyze(rs, bitmap)
-	return if (result.hasTransparentPixels) {
-		val copy = Bitmap.createBitmap(
-			bitmap.width,
-			bitmap.height,
-			bitmap.config
-		)
-		Canvas(copy).apply {
-			drawColor(result.backgroundColor)
-			drawBitmap(bitmap, 0f, 0f, null)
-		}
-		copy
-	} else {
-		bitmap
-	}
-}
-
-private fun analyze(rs: RenderScript, bitmap: Bitmap): Result {
-	val analyzeScript = ScriptC_analyze(rs)
-	val bitmapAllocation = Allocation.createFromBitmap(rs, bitmap)
-	val result = analyzeScript.reduce_analyze(bitmapAllocation).get()
-	bitmapAllocation.destroy()
-	analyzeScript.destroy()
-	return Result(
-		result.x > 0,
-		if (result.y > 0) 0xff000000.toInt() else 0xffffffff.toInt()
-	)
-}
-
-private data class Result(
-	val hasTransparentPixels: Boolean,
-	val backgroundColor: Int
-)

app/src/main/kotlin/de/markusfisch/android/binaryeye/rs/Preprocessor.kt

@@ -1,156 +0,0 @@
-package de.markusfisch.android.binaryeye.rs
-
-import android.graphics.Rect
-import android.support.v8.renderscript.*
-import kotlin.math.max
-import kotlin.math.roundToInt
-
-private const val SCALE_FACTOR = .75f
-
-class Preprocessor(
-	rs: RenderScript,
-	width: Int,
-	height: Int,
-	private val roi: Rect?
-) {
-	var outWidth = 0
-	var outHeight = 0
-
-	private val resizeScript = ScriptIntrinsicResize.create(rs)
-	private val rotateScript = ScriptC_rotate(rs)
-
-	private var yuvType: Type? = null
-	private var yuvAlloc: Allocation? = null
-	private var roiType: Type? = null
-	private var roiAlloc: Allocation? = null
-	private var resizedType: Type? = null
-	private var resizedAlloc: Allocation? = null
-	private var rotatedType: Type? = null
-	private var rotatedAlloc: Allocation? = null
-
-	init {
-		yuvType = Type.createXY(
-			rs,
-			Element.U8(rs),
-			width,
-			height // use only grayscale part
-		)
-		yuvAlloc = Allocation.createTyped(
-			rs,
-			yuvType,
-			Allocation.USAGE_SCRIPT
-		)
-
-		if (roi != null) {
-			val roiWidth = roi.width()
-			val roiHeight = roi.height()
-
-			roiType = Type.createXY(
-				rs,
-				Element.U8(rs),
-				roiWidth,
-				roiHeight
-			)
-			roiAlloc = Allocation.createTyped(
-				rs,
-				roiType,
-				Allocation.USAGE_SCRIPT
-			)
-
-			outWidth = (roiWidth * SCALE_FACTOR).roundToInt()
-			outHeight = (roiHeight * SCALE_FACTOR).roundToInt()
-
-			// Make sure the dimensions are always a multiple of 4.
-			outWidth -= outWidth % 4
-			outHeight -= outHeight % 4
-
-			// Make sure the dimensions are always greater than 4.
-			outWidth = max(4, outWidth)
-			outHeight = max(4, outHeight)
-		} else {
-			outWidth = (width * SCALE_FACTOR).roundToInt()
-			outHeight = (height * SCALE_FACTOR).roundToInt()
-		}
-
-		resizedType = Type.createXY(
-			rs,
-			Element.U8(rs),
-			outWidth,
-			outHeight
-		)
-		resizedAlloc = Allocation.createTyped(
-			rs,
-			resizedType,
-			Allocation.USAGE_SCRIPT
-		)
-
-		rotatedType = Type.createXY(
-			rs,
-			Element.U8(rs),
-			outHeight,
-			outWidth
-		)
-		rotatedAlloc = Allocation.createTyped(
-			rs,
-			rotatedType,
-			Allocation.USAGE_SCRIPT
-		)
-	}
-
-	fun destroy() {
-		yuvType?.destroy()
-		yuvType = null
-		yuvAlloc?.destroy()
-		yuvAlloc = null
-		roiType?.destroy()
-		roiType = null
-		roiAlloc?.destroy()
-		roiAlloc = null
-		resizedType?.destroy()
-		resizedType = null
-		resizedAlloc?.destroy()
-		resizedAlloc = null
-		rotatedType?.destroy()
-		rotatedType = null
-		rotatedAlloc?.destroy()
-		rotatedAlloc = null
-		resizeScript.destroy()
-		rotateScript.destroy()
-	}
-
-	fun resizeOnly(frame: ByteArray) {
-		resize(frame)
-		resizedAlloc?.copyTo(frame)
-	}
-
-	fun resizeAndRotate(frame: ByteArray) {
-		resize(frame)
-		val t = resizedType ?: return
-		rotateScript._inImage = resizedAlloc
-		rotateScript._inWidth = t.x
-		rotateScript._inHeight = t.y
-		rotateScript.forEach_rotate90(
-			rotatedAlloc, // Ignored in kernel, just to satisfy forEach.
-			rotatedAlloc
-		)
-		rotatedAlloc?.copyTo(frame)
-	}
-
-	private fun resize(frame: ByteArray) {
-		yuvAlloc?.copyFrom(frame)
-		resizeScript.setInput(
-			if (roi != null) {
-				roiAlloc?.copy2DRangeFrom(
-					0, 0,
-					roi.width(), roi.height(),
-					yuvAlloc,
-					max(0, roi.left), max(0, roi.top)
-				)
-				roiAlloc
-			} else {
-				yuvAlloc
-			}
-		)
-		resizeScript.forEach_bicubic(resizedAlloc)
-	}
-}

app/src/main/kotlin/de/markusfisch/android/binaryeye/service/ScanTileService.kt

@@ -8,11 +8,10 @@ import de.markusfisch.android.binaryeye.activity.CameraActivity
 
 @RequiresApi(Build.VERSION_CODES.N)
 class ScanTileService : TileService() {
-	@RequiresApi(Build.VERSION_CODES.N)
 	override fun onClick() {
 		super.onClick()
 		val intent = Intent(applicationContext, CameraActivity::class.java)
 		intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
 		startActivityAndCollapse(intent)
 	}
-}
+}

app/src/main/kotlin/de/markusfisch/android/binaryeye/widget/DetectorView.kt

@@ -100,14 +100,15 @@ class DetectorView : View {
 	}
 
 	private fun setCropHandlePos(x: Int, y: Int, orientation: Int) {
+		// Always set handlePos even if it's invalid because
+		// handlePos.x may be -2 which is a signal to set the
+		// default ROI.
 		if (orientation == currentOrientation) {
 			handlePos.set(x, y)
 		} else {
 			handlePos.set(y, x)
 		}
-		if (x > -1) {
-			handleActive = true
-		}
+		handleActive = handlePos.x > -1
 	}
 
 	fun update(numberOfCoordinates: Int) {
@@ -164,8 +165,8 @@ class DetectorView : View {
 			MotionEvent.ACTION_MOVE -> {
 				if (handleGrabbed) {
 					handlePos.set(x, y)
-					handleActive =
-						handleActive or (distSq(handlePos, touchDown) > minMoveThresholdSq)
+					handleActive = handleActive ||
+							distSq(handlePos, touchDown) > minMoveThresholdSq
 					if (handleActive) {
 						updateClipRect()
 						invalidate()
@@ -216,10 +217,10 @@ class DetectorView : View {
 		val cy = clampY(y)
 		val dx = abs(cx - center.x)
 		val dy = abs(cy - center.y)
-		// check if handle is close to the vertical or horizontal center line
+		// Check if handle is close to the vertical or horizontal center line.
 		if (dx < distToFull ||
 			dy < distToFull ||
-			// check if handle is close to a screen corner
+			// Check if handle is close to a screen corner.
 			((abs(cy - minY) < distToFull || abs(maxY - cy) < distToFull) &&
 					abs(dx - center.x) < distToFull)
 		) {
@@ -260,23 +261,18 @@ class DetectorView : View {
 
 	override fun onDraw(canvas: Canvas) {
 		if (handleActive) {
-			drawClip(canvas)
+			canvas.drawClip()
 		}
-		drawDots(canvas)
+		canvas.drawDots()
 		if (prefs.showCropHandle) {
-			canvas.drawBitmap(
-				handleBitmap,
-				(handlePos.x - handleXRadius).toFloat(),
-				(handlePos.y - handleYRadius).toFloat(),
-				null
-			)
+			canvas.drawHandle()
 		}
 	}
 
-	private fun drawDots(canvas: Canvas) {
+	private fun Canvas.drawDots() {
 		var i = 0
 		while (i < coordinatesLast) {
-			canvas.drawCircle(
+			drawCircle(
 				coordinates[i++],
 				coordinates[i++],
 				dotRadius,
@@ -285,15 +281,15 @@ class DetectorView : View {
 		}
 	}
 
-	private fun drawClip(canvas: Canvas) {
+	private fun Canvas.drawClip() {
 		if (minDist < 1) {
 			return
 		}
 		// canvas.clipRect() doesn't work reliably below KITKAT.
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
 			val radius = min(minDist / 2, cornerRadius).toFloat()
-			canvas.save()
-			canvas.clipOutPathCompat(
+			save()
+			clipOutPathCompat(
 				calculateRoundedRectPath(
 					roi.left.toFloat(),
 					roi.top.toFloat(),
@@ -303,13 +299,22 @@ class DetectorView : View {
 					radius
 				)
 			)
-			canvas.drawColor(shadeColor)
-			canvas.restore()
+			drawColor(shadeColor)
+			restore()
 		} else {
-			canvas.drawRect(roi, roiPaint)
+			drawRect(roi, roiPaint)
 		}
 	}
 
+	private fun Canvas.drawHandle() {
+		drawBitmap(
+			handleBitmap,
+			(handlePos.x - handleXRadius).toFloat(),
+			(handlePos.y - handleYRadius).toFloat(),
+			null
+		)
+	}
+
 	private fun updateClipRect() {
 		clampHandlePos()
 		val dx = abs(handlePos.x - center.x)

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

@@ -1,208 +0,0 @@
-package de.markusfisch.android.binaryeye.zxing
-
-import android.graphics.Bitmap
-import com.google.zxing.*
-import com.google.zxing.common.BitMatrix
-import com.google.zxing.common.HybridBinarizer
-import java.util.*
-
-class Zxing(possibleResultPoint: ResultPointCallback? = null) {
-	private val hints = EnumMap<DecodeHintType, Any>(DecodeHintType::class.java)
-	private val multiFormatReader = MultiFormatReader()
-
-	init {
-		possibleResultPoint?.let {
-			hints[DecodeHintType.NEED_RESULT_POINT_CALLBACK] = it
-		}
-	}
-
-	fun updateHints(tryHarder: Boolean, formats: Set<String>) {
-		if (tryHarder) {
-			hints[DecodeHintType.TRY_HARDER] = java.lang.Boolean.TRUE
-		} else {
-			hints.remove(DecodeHintType.TRY_HARDER)
-		}
-		setDecodeFormats(formats)
-	}
-
-	private fun setDecodeFormats(formats: Set<String>) {
-		val decodeFormats = EnumSet.noneOf(
-			BarcodeFormat::class.java
-		)
-		decodeFormats.addAll(
-			EnumSet.copyOf(
-				formats.map { BarcodeFormat.valueOf(it) }
-			)
-		)
-		hints[DecodeHintType.POSSIBLE_FORMATS] = decodeFormats
-	}
-
-	fun decode(
-		yuvData: ByteArray,
-		width: Int,
-		height: Int,
-		invert: Boolean = false
-	): Result? {
-		val source = PlanarYUVLuminanceSource(
-			yuvData,
-			width,
-			height,
-			0,
-			0,
-			width,
-			height,
-			false
-		)
-		return decodeLuminanceSource(source, 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
-		if (bitmap.config != Bitmap.Config.ARGB_8888) {
-			bitmap.copy(Bitmap.Config.ARGB_8888, true)
-		} else {
-			bitmap
-		}.getPixels(pixels, 0, width, 0, 0, width, height)
-		return decodeLuminanceSource(
-			RGBLuminanceSource(width, height, pixels),
-			invert
-		)
-	}
-
-	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()
-		}
-	}
-}
-
-private const val BLACK = 0xff000000.toInt()
-private const val WHITE = 0xffffffff.toInt()
-
-fun encodeAsBitmap(
-	text: String,
-	format: BarcodeFormat,
-	width: Int,
-	height: Int,
-	hints: EnumMap<EncodeHintType, Any>? = null
-): Bitmap? {
-	val bitMatrix = encode(text, format, hints, width, height)
-	val w = bitMatrix.width
-	val h = bitMatrix.height
-	val pixels = IntArray(w * h)
-	var offset = 0
-	for (y in 0 until h) {
-		for (x in 0 until w) {
-			pixels[offset + x] = if (bitMatrix.get(x, y)) {
-				BLACK
-			} else {
-				WHITE
-			}
-		}
-		offset += w
-	}
-	val bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888)
-	bitmap.setPixels(pixels, 0, w, 0, 0, w, h)
-	return bitmap
-}
-
-fun encodeAsSvg(
-	text: String,
-	format: BarcodeFormat,
-	hints: EnumMap<EncodeHintType, Any>? = null
-): String {
-	val bitMatrix = encode(text, format, hints)
-	val sb = StringBuilder()
-	val w = bitMatrix.width
-	var h = bitMatrix.height
-	val moduleHeight = if (h == 1) w / 2 else 1
-	for (y in 0 until h) {
-		for (x in 0 until w) {
-			if (bitMatrix.get(x, y)) {
-				sb.append(" M${x},${y}h1v${moduleHeight}h-1z")
-			}
-		}
-	}
-	h *= moduleHeight
-	return """<svg width="$w" height="$h"
-viewBox="0 0 $w $h"
-xmlns="http://www.w3.org/2000/svg">
-<path d="$sb"/>
-</svg>
-"""
-}
-
-fun encodeAsText(
-	text: String,
-	format: BarcodeFormat,
-	hints: EnumMap<EncodeHintType, Any>? = null
-): String {
-	val bitMatrix = encode(text, format, hints)
-	val w = bitMatrix.width
-	val h = bitMatrix.height
-	val sb = StringBuilder()
-	for (y in 0 until h) {
-		for (x in 0 until w) {
-			sb.append(if (bitMatrix.get(x, y)) "█" else " ")
-		}
-		sb.append("\n")
-	}
-	return sb.toString()
-}
-
-private fun encode(
-	text: String,
-	format: BarcodeFormat,
-	encodeHints: EnumMap<EncodeHintType, Any>? = null,
-	width: Int = 0,
-	height: Int = 0
-): BitMatrix {
-	val hints = encodeHints ?: EnumMap<EncodeHintType, Any>(EncodeHintType::class.java)
-	if (!hints.contains(EncodeHintType.CHARACTER_SET)) {
-		hints[EncodeHintType.CHARACTER_SET] = "utf-8"
-	}
-	return MultiFormatWriter().encode(
-		text,
-		format,
-		width,
-		height,
-		hints
-	)
-}

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

@@ -0,0 +1,3 @@
+<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="#FF000000" android:pathData="M3 11h8V3H3v8zm2-6h4v4H5V5zM3 21h8v-8H3v8zm2-6h4v4H5v-4zm8-12v8h8V3h-8zm6 6h-4V5h4v4zm0 10h2v2h-2zm-6-6h2v2h-2zm2 2h2v2h-2zm-2 2h2v2h-2zm2 2h2v2h-2zm2-2h2v2h-2zm0-4h2v2h-2zm2 2h2v2h-2z"/>
+</vector>

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

@@ -1,14 +1,5 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="108dp" android:height="108dp" android:viewportWidth="108" android:viewportHeight="108">
-    <path android:fillColor="#FF000000" android:pathData="M52-884.362h29v71H52z"/>
-    <path android:fillColor="#FF000000" android:pathData="M52-884.362h29v71H52z"/>
-    <path android:fillColor="#FF000000" android:pathData="M52-884.362h29v71H52zM32.002-24.974h3.127v7.656h-3.127z"/>
-    <path android:fillColor="#FF000000" android:pathData="M52-884.362h29v71H52z"/>
-    <path android:fillColor="#FF000000" android:pathData="M52-884.362h29v71H52z"/>
-    <path android:fillColor="#FF000000" android:pathData="M52-884.362h29v71H52z"/>
-    <path android:fillColor="#FF000000" android:pathData="M52-884.362h29v71H52z"/>
-    <path android:fillColor="#FF000000" android:pathData="M52-884.362h29v71H52z"/>
-    <path android:pathData="M54.826 27.893c-6.851 0-13.701 2.581-18.924 7.745-10.445 10.328-10.413 27.062 0 37.423l36.218 36.036 37.879 0.902-0.07-38.363-36.18-35.998c-5.207-5.18-12.073-7.745-18.924-7.745z" android:strokeWidth="8.60725021" android:fillColor="#000000" android:fillAlpha="0.1254902"/>
-    <path android:pathData="M28.001 54.118a26.525 26.227 0 1 0 53.049 0 26.525 26.227 0 1 0-53.049 0z" android:strokeWidth="4" android:fillColor="#ffffff"/>
-    <path android:pathData="M39.26 54.988a14.509 14.346 0 1 0 29.019 0 14.509 14.346 0 1 0-29.019 0z" android:strokeWidth="4" android:fillColor="#000000"/>
-    <path android:pathData="M54.034 44.513a9.535 9.428 0 1 0 19.07 0 9.535 9.428 0 1 0-19.07 0z" android:strokeWidth="10" android:fillColor="#ffffff"/>
+    <path android:pathData="M54.723 28.295c-6.85 0-13.701 2.581-18.923 7.745-10.446 10.328-10.414 27.062 0 37.423l36.218 36.036L108 108l1.827-35.962-36.18-35.998c-5.207-5.18-12.073-7.745-18.924-7.745z" android:strokeWidth="8.60725021" android:fillColor="#000000" android:fillAlpha="0.1254902"/>
+    <path android:pathData="M80.5 54a26.5 26.5 0 1 1-53 0 26.5 26.5 0 1 1 53 0" android:strokeWidth="4" android:fillColor="#FFFFFF"/>
+    <path android:pathData="M35.179 54c0-4.605 1.656-8.824 4.402-12.095v24.19c-2.746-3.271-4.402-7.49-4.402-12.095zM54 35.181c0.539 0 1.074 0.023 1.601 0.066v37.506c-0.527 0.044-1.062 0.066-1.601 0.066-0.54 0-1.074-0.022-1.602-0.066V35.247c0.528-0.043 1.062-0.066 1.602-0.066zM72.819 54c0 4.605-1.654 8.824-4.401 12.095v-24.19c2.747 3.271 4.401 7.49 4.401 12.095zM45.99 36.965c1.02-0.481 2.093-0.873 3.204-1.166v36.402c-1.111-0.293-2.184-0.685-3.204-1.166v-34.07zm12.816-1.166c2.347 0.619 4.514 1.679 6.408 3.086v30.23c-1.894 1.408-4.061 2.467-6.408 3.086V35.799z" android:strokeWidth="4" android:fillColor="#000000"/>
 </vector>

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

@@ -0,0 +1,5 @@
+<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="M27 45a18 18 0 1 1 36 0 18 18 0 1 1-36 0" android:strokeWidth="4"/>
+    <path android:pathData="M31.738 45a13.262 13.262 0 1 1 26.524 0 13.262 13.262 0 1 1-26.524 0" android:strokeWidth="4" android:fillColor="#ffffff"/>
+    <path android:pathData="M54.41 45c0 2.303-0.827 4.412-2.201 6.048V38.952c1.374 1.636 2.201 3.745 2.201 6.048zM45 54.41c-0.27 0-0.537-0.012-0.801-0.034V35.624C44.463 35.602 44.73 35.59 45 35.59s0.537 0.012 0.801 0.034v18.752C45.537 54.398 45.27 54.41 45 54.41zM35.59 45c0-2.303 0.827-4.412 2.201-6.048v12.096C36.417 49.412 35.59 47.303 35.59 45zm13.415 8.517c-0.511 0.241-1.046 0.437-1.602 0.583V35.9c0.556 0.146 1.091 0.342 1.602 0.583v17.034zM42.597 54.1c-1.173-0.309-2.257-0.839-3.204-1.542V37.442c0.947-0.703 2.031-1.233 3.204-1.542v18.2z" android:strokeWidth="4" android:fillColor="#000000"/>
+</vector>

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

@@ -1,7 +1,5 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:drawable="@color/selected_row"
+	<item android:drawable="@color/pressed_row"
 		android:state_pressed="true"/>
-	<item android:drawable="@color/selected_row"
-		android:state_selected="true"/>
 	<item android:drawable="@android:color/transparent"/>
 </selector>

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

@@ -17,10 +17,12 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_gravity="bottom|start"
-			android:layout_marginBottom="8dp"
-			android:layout_marginRight="80dp"
-			android:layout_marginEnd="80dp"
-			android:padding="16dp"/>
+			android:layout_marginBottom="16dp"
+			android:layout_marginRight="88dp"
+			android:layout_marginEnd="88dp"
+			android:layout_marginLeft="16dp"
+			android:layout_marginStart="16dp"
+			android:padding="24dp"/>
 		<android.support.design.widget.FloatingActionButton
 			style="@style/FAB"
 			android:id="@+id/flash"

app/src/main/res/layout/fragment_decode.xml

@@ -8,18 +8,15 @@
 		android:clipToPadding="false"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent">
-		<RelativeLayout
+		<LinearLayout
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content">
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			android:padding="16dp">
 			<EditText
 				android:id="@+id/content"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_marginTop="16dp"
-				android:layout_marginStart="16dp"
-				android:layout_marginLeft="16dp"
-				android:layout_marginEnd="16dp"
-				android:layout_marginRight="16dp"
 				android:gravity="start|top"
 				android:hint="@string/content"
 				android:imeOptions="flagNoExtractUi"
@@ -32,43 +29,42 @@
 				android:id="@+id/format"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_below="@+id/content"
-				android:layout_marginEnd="16dp"
-				android:layout_marginRight="16dp"
 				android:layout_marginBottom="16dp"
 				android:gravity="end|top"/>
 			<TableLayout
 				android:id="@+id/data"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_below="@+id/format"
-				android:layout_marginEnd="16dp"
-				android:layout_marginStart="16dp"
-				android:layout_marginLeft="16dp"
-				android:layout_marginRight="16dp"/>
+				android:layout_marginBottom="16dp"/>
 			<TableLayout
 				android:id="@+id/meta"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_below="@+id/data"
-				android:layout_marginEnd="16dp"
-				android:layout_marginStart="16dp"
-				android:layout_marginLeft="16dp"
-				android:layout_marginRight="16dp"/>
+				android:layout_marginBottom="16dp"/>
 			<TextView
 				android:id="@+id/hex"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_below="@+id/meta"
-				android:layout_marginStart="16dp"
-				android:layout_marginLeft="16dp"
-				android:layout_marginEnd="16dp"
-				android:layout_marginRight="16dp"
 				android:layout_marginBottom="16dp"
 				android:typeface="monospace"
 				android:textSize="12sp"
 				tools:text="54 65 73 74 20 51 52 20  Test QR\n43 6F 64 65              Code"/>
-		</RelativeLayout>
+			<TextView
+				android:id="@+id/stamp"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="16dp"
+				android:textSize="12sp"
+				android:typeface="monospace"/>
+			<ImageView
+				android:id="@+id/recreation"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="16dp"
+				android:layout_gravity="center"
+				android:adjustViewBounds="true"
+				android:contentDescription="@string/view_barcode"/>
+		</LinearLayout>
 	</de.markusfisch.android.binaryeye.widget.ConfinedScrollView>
 	<android.support.design.widget.CoordinatorLayout
 		android:id="@+id/inset_layout"

app/src/main/res/layout/fragment_history.xml

@@ -6,7 +6,7 @@
 		android:id="@+id/scans"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:choiceMode="singleChoice"
+		android:choiceMode="multipleChoice"
 		android:clipToPadding="false"
 		android:divider="@color/separator"
 		android:dividerHeight="1px"/>

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

@@ -15,14 +15,17 @@
 	<string name="error_correction_level_m" formatted="false">মধ্যম (~১৫&#37; ঠিককরণ)</string>
 	<string name="error_correction_level_q" formatted="false">বেশি (~২৫&#37; ঠিককরণ)</string>
 	<string name="error_correction_level_h" formatted="false">অনেক বেশি (~৩০&#37; ঠিককরণ)</string>
-	<string name="issue_number">সমস্যা ক্রম</string>
-	<string name="orientation">দিক</string>
-	<string name="other_meta_data">মেটাতথ্য</string>
-	<string name="pdf417_extra_metadata">পিডিএফ৪১৭ মেটাতথ্য</string>
-	<string name="possible_country">তৈরির সম্ভাব্য দেশ</string>
-	<string name="suggested_price">প্রস্তসবিত দাম</string>
-	<string name="upc_ean_extension">ইউপিসি ইএএন বর্ধিত</string>
+	<string name="sequence_size">Sequence size</string>
+	<string name="sequence_index">Sequence index</string>
+	<string name="sequence_id">Sequence ID</string>
+	<string name="gtin_issue_number">সমস্যা ক্রম</string>
+	<string name="gtin_country">তৈরির সম্ভাব্য দেশ</string>
+	<string name="gtin_price">প্রস্তসবিত দাম</string>
+	<string name="gtin_add_on">ইউপিসি ইএএন বর্ধিত</string>
+	<string name="barcode_version_number">Version</string>
+	<string name="qr_version_and_modules">%1$d (%2$d modules)</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 +48,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>
@@ -82,6 +88,8 @@
 	<string name="show_meta_data_summary">সনাক্তকৃত বারকোড নিয়ে অতিরিক্ত তথ্য দেখাও।</string>
 	<string name="show_hex_dump">ষড়(hex) সংকেত দেখাও</string>
 	<string name="show_hex_dump_summary">পড়া তথ্যের ষড় সংকেত দেখাও</string>
+	<string name="show_recreation">Show recreated barcode</string>
+	<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</string>
 	<string name="close_automatically">অনুলিপি/ভাগ করার পরে পিছনে যাও</string>
 	<string name="close_automatically_summary">তথ্য অনুলিপি/ভাগ করার পরে স্বয়ংক্রিয়ভাবে পিছনে যাও।</string>
 	<string name="default_search_engine">Open unknown data in</string>
@@ -93,12 +101,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

@@ -1,7 +1,7 @@
 <resources>
 	<string name="no_camera_no_fun">Bez oprávnění k fotoaparátu tato aplikace nemá smysl. Na viděnou.</string>
 	<string name="camera_error">Nepodařilo se otevřít fotoaparát, prosím zkuste to znovu</string>
-	<string name="scan_code">Skenovat kód</string>
+	<string name="scan_code">Naskenovat kód</string>
 	<string name="compose_barcode">Vytvořit čárový kód</string>
 	<string name="decode_barcode">Dekódovat čárový kód</string>
 	<string name="content">Obsah</string>
@@ -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>
@@ -16,14 +17,17 @@
 	<string name="error_correction_level_m" formatted="false">Střední (~15&#37; korekce)</string>
 	<string name="error_correction_level_q" formatted="false">Čtvrtinový (~25&#37; korekce)</string>
 	<string name="error_correction_level_h" formatted="false">Vysoký (~30&#37; korekce)</string>
-	<string name="issue_number">Issue number</string>
-	<string name="orientation">Orientace</string>
-	<string name="other_meta_data">Metadata</string>
-	<string name="pdf417_extra_metadata">PDF417 metadata</string>
-	<string name="possible_country">Možná země původu</string>
-	<string name="suggested_price">Doporučená cena</string>
-	<string name="upc_ean_extension">rozšíření UPC EAN</string>
+	<string name="sequence_size">Sequence size</string>
+	<string name="sequence_index">Sequence index</string>
+	<string name="sequence_id">Sequence ID</string>
+	<string name="gtin_issue_number">Číslo edice</string>
+	<string name="gtin_country">Možná země původu</string>
+	<string name="gtin_price">Doporučená cena</string>
+	<string name="gtin_add_on">rozšíření UPC EAN</string>
+	<string name="barcode_version_number">Version</string>
+	<string name="qr_version_and_modules">%1$d (%2$d modules)</string>
 	<string name="toggle_flash">Zap/vyp blesk</string>
+	<string name="error_flash">Zapnutí/vypnutí blesku selhalo</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>
@@ -31,7 +35,7 @@
 	<string name="copy_password">Zkopírovat heslo do schránky</string>
 	<string name="copied_password_to_clipboard">Heslo zkopírováno do schránky</string>
 	<string name="open_url">Otevřít URL</string>
-	<string name="cannot_resolve_action">Nemáte aplikaci, která by to uměla otevřít</string>
+	<string name="cannot_resolve_action">Nemáte aplikaci, která by toto uměla otevřít</string>
 	<string name="pick_search_engine">Zvolte vyhledávač</string>
 	<string name="format">Formát</string>
 	<string name="size">Velikost v pixelech</string>
@@ -44,31 +48,34 @@
 	<string name="info">Info</string>
 	<string name="switch_camera">Přepnout kameru</string>
 	<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="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">Vždy začít v módu nepřetržitého skenování.</string>
+	<string name="bulk_mode_delay">Prodleva mezi skeny</string>
+	<string name="restrict_format">Omezit na formát</string>
+	<string name="remove_restriction">Zrušit omezení formátu</string>
+	<string name="scan_format">Naskenovat %s</string>
+	<string name="quarter_second">Čtvrt sekundy</string>
+	<string name="half_second">Půl sekundy</string>
+	<string name="a_second">Jedna sekunda</string>
+	<string name="two_seconds">Dvě sekundy</string>
+	<string name="five_seconds">Pět sekund</string>
 	<string name="history">Historie</string>
 	<string name="preferences">Nastavení</string>
 	<string name="scan_category">Skenování</string>
 	<string name="content_category">Obsah</string>
 	<string name="locale_category">Jazyk</string>
-	<string name="custom_locale">Zvolit jazyk</string>
-	<string name="follow_system_settings">Řídit se nastavením systému</string>
+	<string name="custom_locale">Nastavit jazyk</string>
+	<string name="follow_system_settings">Podle systému</string>
 	<string name="show_crop_handle">Zobrazovat hrany výřezu</string>
 	<string name="show_crop_handle_summary">Omezí skenování na zvolenou oblast.</string>
-	<string name="barcode_formats">Barcode formats</string>
+	<string name="barcode_formats">Formáty čárových kódů</string>
 	<string name="zoom_by_swiping">Potáhnutím nahoru/dolů přiblížit</string>
 	<string name="zoom_by_swiping_summary">Přetáhnutím nahoru nebo dolů se zvětší / zmenší úroveň přiblížení.</string>
 	<string name="auto_rotate">Rozpoznávat otočené 1D čárové kódy</string>
 	<string name="auto_rotate_summary">Automaticky otočí obraz a tak detekuje 1D čárové kódy na výšku. Na některých zařízeních může snížit výkonnost.</string>
 	<string name="try_harder">Optimalizovat pro přesnost</string>
 	<string name="try_harder_summary">Použijte pro velmi nečitelné kódy. Sníží výkonnost.</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">Zobrazovat data v módu nepřetržitého skenování</string>
+	<string name="show_toast_in_bulk_mode_summary">Krátce zobrazit data v módu nepřetržitého skenování.</string>
 	<string name="vibrate">Zavibrovat při detekování</string>
 	<string name="vibrate_summary">Zařízení zavibruje, když rozpozná čárový kód.</string>
 	<string name="use_history">Ukládat historii skenování</string>
@@ -83,23 +90,28 @@
 	<string name="show_meta_data_summary">Zobrazí další data o naskenovaném čárovém kódu.</string>
 	<string name="show_hex_dump">Zobrazit hex dump</string>
 	<string name="show_hex_dump_summary">Zobrazí hex dump naskenovaného obsahu.</string>
+	<string name="show_recreation">Show recreated barcode</string>
+	<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</string>
 	<string name="close_automatically">Vrátit se po zkopírování/sdílení</string>
 	<string name="close_automatically_summary">Po zkopírovaní či sdílení se automaticky vrátí na skenovací obrazovku.</string>
-	<string name="default_search_engine">Open unknown data in</string>
-	<string name="always_ask">Always ask</string>
-	<string name="open_with_url">Otevřít neznámá data pomocí 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">Přesměrování</string>
+	<string name="default_search_engine">Nerozpoznaná data otevřít v</string>
+	<string name="always_ask">Vždy se zeptat</string>
+	<string name="open_with_url">Otevřít nerozpoznaná data pomocí URL</string>
+	<string name="clear_network_suggestions">Smazat navrhované sítě</string>
+	<string name="clear_network_suggestions_summary">Smazat všechny sítě, které byly navrženy touto aplikací.</string>
+	<string name="really_remove_all_networks">Opravdu smazat všechny sítě?</string>
+	<string name="clear_network_suggestions_success">Navrhované sítě smazány</string>
+	<string name="clear_network_suggestions_nothing_to_remove">Nic k smazání</string>
+	<string name="send_category">Předávání</string>
+	<string name="send_scan_active">Předávat skeny</string>
+	<string name="send_scan_active_summary">Zapnout předávání skenů na danou 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">Otevřít v prohlížeči</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>
@@ -142,20 +154,20 @@
 	<string name="export_database">SQLite databáze</string>
 	<string name="saved_in_downloads">Uloženo do složky Stahování</string>
 	<string name="rotate_image_cw">Otočit obrázek po směru hodinových ručiček</string>
-	<string name="pick_file">Zvolte obrázek</string>
-	<string name="pick_code_to_scan">Zvolte kód k naskenování</string>
+	<string name="pick_file">Vybrat obrázek</string>
+	<string name="pick_code_to_scan">Vyberte kód k naskenování</string>
 	<string name="shortcut_decode">Skenovat čárový kód</string>
 	<string name="shortcut_encode">Vytvořit čárový kód</string>
 	<string name="shortcut_preferences">Nastavení</string>
 	<string name="background_request_failed">Požadavek na pozadí selhal</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">Typ</string>
+	<string name="wifi_network">Wi-Fi síť</string>
+	<string name="wifi_ssid">Název</string>
+	<string name="wifi_type">Zabezpečení</string>
+	<string name="wifi_password">Heslo</string>
+	<string name="wifi_hidden">Skrytá síť</string>
+	<string name="wifi_eap">Metoda EAP</string>
+	<string name="wifi_anonymous_identity">Anonymní identita</string>
+	<string name="wifi_identity">Identita</string>
+	<string name="wifi_phase2">Ověření Phase 2</string>
 </resources>

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

@@ -0,0 +1,30 @@
+<resources>
+	<string-array name="search_engines_names">
+		<item>@string/always_ask</item>
+		<item>Google</item>
+		<item>DuckDuckGo</item>
+		<item>Qwant</item>
+		<item>Bing</item>
+		<item>Yandex</item>
+		<item>ebay</item>
+		<item>Amazon</item>
+		<item>OpenFoodFacts.org</item>
+		<item>OpenBeautyFacts.org</item>
+		<item>OpenPetFoodFacts.org</item>
+		<item>Barcode Lookup</item>
+	</string-array>
+	<string-array name="search_engines_values">
+		<item></item>
+		<item>https://www.google.de/search?q=</item>
+		<item>https://duckduckgo.com/?q=</item>
+		<item>https://www.qwant.com/?q=</item>
+		<item>https://bing.com/?q=</item>
+		<item>https://yandex.com/?q=</item>
+		<item>https://www.ebay.de/sch/i.html?_nkw=</item>
+		<item>https://www.amazon.de/s?k=</item>
+		<item>https://world.openfoodfacts.org/cgi/search.pl?search_terms=</item>
+		<item>https://world.openbeautyfacts.org/cgi/search.pl?search_terms=</item>
+		<item>https://world.openpetfoodfacts.org/cgi/search.pl?search_terms=</item>
+		<item>https://www.barcodelookup.com/</item>
+	</string-array>
+</resources>

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

@@ -15,14 +15,17 @@
 	<string name="error_correction_level_m" formatted="false">Medium (~15&#37; wiederherstellbar)</string>
 	<string name="error_correction_level_q" formatted="false">Quartile (~25&#37; wiederherstellbar)</string>
 	<string name="error_correction_level_h" formatted="false">High (~30&#37; wiederherstellbar)</string>
-	<string name="issue_number">Ausgabe Nummer</string>
-	<string name="orientation">Orientierung</string>
-	<string name="other_meta_data">Metadaten</string>
-	<string name="pdf417_extra_metadata">PDF417 Metadaten</string>
-	<string name="possible_country">Mögliches Ursprungsland</string>
-	<string name="suggested_price">Preisvorschlag</string>
-	<string name="upc_ean_extension">UPC EAN Erweiterung</string>
+	<string name="sequence_size">Sequence size</string>
+	<string name="sequence_index">Sequence index</string>
+	<string name="sequence_id">Sequence ID</string>
+	<string name="gtin_issue_number">Ausgabe Nummer</string>
+	<string name="gtin_country">Mögliches Ursprungsland</string>
+	<string name="gtin_price">Preisvorschlag</string>
+	<string name="gtin_add_on">UPC EAN Erweiterung</string>
+	<string name="barcode_version_number">Version</string>
+	<string name="qr_version_and_modules">%1$d (%2$d Module)</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 +48,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 +73,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>
@@ -82,6 +88,8 @@
 	<string name="show_meta_data_summary">Zusätzliche Daten über den eingelesenen Barcode anzeigen.</string>
 	<string name="show_hex_dump">Hex Dump anzeigen</string>
 	<string name="show_hex_dump_summary">Zeigt einen Hexdump des eingelesenen Inhalts an.</string>
+	<string name="show_recreation">Wiederhergestellten Barcode anzeigen</string>
+	<string name="show_recreation_summary">Barcode aus dem gelesenen Inhalt wiederherstellen und anzeigen, wenn möglich.</string>
 	<string name="close_automatically">Automatisch zurückkehren</string>
 	<string name="close_automatically_summary">Nach dem Kopieren/Teilen automatisch zum Scanbildschirm zurückkehren.</string>
 	<string name="default_search_engine">Unbekannte Daten öffnen mit</string>
@@ -93,12 +101,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

@@ -1,5 +1,5 @@
 <resources>
-	<string name="no_camera_no_fun">Esta aplicación no tiene sentido usar sin acceso a la cámara. Adiós.</string>
+	<string name="no_camera_no_fun">No tiene sentido usar esta aplicación sin acceso a la cámara. Adiós.</string>
 	<string name="camera_error">No se puede acceder a la cámara, por favor, inténtelo de nuevo</string>
 	<string name="scan_code">Escanear código de barras</string>
 	<string name="compose_barcode">Componer código de barras</string>
@@ -15,14 +15,17 @@
 	<string name="error_correction_level_m" formatted="false">Medio (~15&#37; de correción)</string>
 	<string name="error_correction_level_q" formatted="false">Cuartil (~25&#37; de correción)</string>
 	<string name="error_correction_level_h" formatted="false">Alto (~30&#37; de correción)</string>
-	<string name="issue_number">Número de emisión</string>
-	<string name="orientation">Orientación</string>
-	<string name="other_meta_data">Metadatos</string>
-	<string name="pdf417_extra_metadata">Metadatos PDF417</string>
-	<string name="possible_country">Posible país de fabricación</string>
-	<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="sequence_size">Sequence size</string>
+	<string name="sequence_index">Sequence index</string>
+	<string name="sequence_id">Sequence ID</string>
+	<string name="gtin_issue_number">Número de emisión</string>
+	<string name="gtin_country">Posible país de fabricación</string>
+	<string name="gtin_price">Precio sugerido</string>
+	<string name="gtin_add_on">Extensión UPC EAN</string>
+	<string name="barcode_version_number">Version</string>
+	<string name="qr_version_and_modules">%1$d (%2$d modules)</string>
+	<string name="toggle_flash">Activar el flash</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>
@@ -44,12 +47,15 @@
 	<string name="switch_camera">Cambiar cámara</string>
 	<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="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">Demora entre escaneos continuos</string>
+	<string name="restrict_format">Restringir formato</string>
+	<string name="remove_restriction">Eliminar restricción</string>
+	<string name="scan_format">Escanear %s</string>
+	<string name="quarter_second">Un cuarto de segundo</string>
+	<string name="half_second">Medio segundo</string>
+	<string name="a_second">Un segundo</string>
+	<string name="two_seconds">Dos segundos</string>
+	<string name="five_seconds">Cinco segundos</string>
 	<string name="history">Historial</string>
 	<string name="preferences">Configuración</string>
 	<string name="scan_category">Escanear</string>
@@ -82,6 +88,8 @@
 	<string name="show_meta_data_summary">Mostrar datos adicionales del código escaneado.</string>
 	<string name="show_hex_dump">Mostrar dump hexadecimal</string>
 	<string name="show_hex_dump_summary">Mostrar un dump hexadecimal del contenido escaneado.</string>
+	<string name="show_recreation">Show recreated barcode</string>
+	<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</string>
 	<string name="close_automatically">Retroceder luego de Copiar/Compartir</string>
 	<string name="close_automatically_summary">Regresar automáticamente a la pantalla de escaneo luego de copiar o compartir el contenido leído.</string>
 	<string name="default_search_engine">Abrir datos desconocidos en</string>
@@ -93,12 +101,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">Abrir en el navegador</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>
@@ -148,13 +159,13 @@
 	<string name="shortcut_preferences">Ajustes</string>
 	<string name="background_request_failed">Solicitud de fondo fallida</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_network">Red wi-fi</string>
+	<string name="wifi_ssid">Nombre</string>
+	<string name="wifi_type">Tipo de autenticación</string>
+	<string name="wifi_password">Contraseña</string>
+	<string name="wifi_hidden">Red oculta</string>
+	<string name="wifi_eap">Método EAP</string>
+	<string name="wifi_anonymous_identity">Identidad anónima</string>
+	<string name="wifi_identity">Identidad</string>
 	<string name="wifi_phase2">Phase 2 method</string>
 </resources>

app/src/main/res/values-fa/search_engines.xml

@@ -0,0 +1,30 @@
+<resources>
+	<string-array name="search_engines_names">
+		<item>@string/always_ask</item>
+		<item>گوگل</item>
+		<item>داک‌داک‌گو</item>
+		<item>Qwant</item>
+		<item>بینگ</item>
+		<item>یاندکس</item>
+		<item>ebay</item>
+		<item>Amazon</item>
+		<item>OpenFoodFacts.org</item>
+		<item>OpenBeautyFacts.org</item>
+		<item>OpenPetFoodFacts.org</item>
+		<item>Barcode Lookup</item>
+	</string-array>
+	<string-array name="search_engines_values">
+		<item></item>
+		<item>https://www.google.com/search?q=</item>
+		<item>https://duckduckgo.com/?q=</item>
+		<item>https://www.qwant.com/?q=</item>
+		<item>https://bing.com/?q=</item>
+		<item>https://yandex.com/?q=</item>
+		<item>https://www.ebay.com/sch/i.html?_nkw=</item>
+		<item>https://www.amazon.com/s?k=</item>
+		<item>https://world.openfoodfacts.org/cgi/search.pl?search_terms=</item>
+		<item>https://world.openbeautyfacts.org/cgi/search.pl?search_terms=</item>
+		<item>https://world.openpetfoodfacts.org/cgi/search.pl?search_terms=</item>
+		<item>https://www.barcodelookup.com/</item>
+	</string-array>
+</resources>

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

@@ -0,0 +1,171 @@
+<resources>
+	<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="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>
+	<string name="error_correction_level_l" formatted="false">کم (⁦~۷٪⁩ تصحیح)</string>
+	<string name="error_correction_level_m" formatted="false">متوسط (⁦~۱۵٪⁩ تصحیح)</string>
+	<string name="error_correction_level_q" formatted="false">یک‌چهارم (⁦~۲۵٪⁩ تصحیح)</string>
+	<string name="error_correction_level_h" formatted="false">زیاد (⁦~۳۰٪⁩ تصحیح)</string>
+	<string name="sequence_size">Sequence size</string>
+	<string name="sequence_index">Sequence index</string>
+	<string name="sequence_id">Sequence ID</string>
+	<string name="gtin_issue_number">شمارهٔ اشکال</string>
+	<string name="gtin_country">کشور احتمالی سازنده</string>
+	<string name="gtin_price">قیمت پیشنهادی</string>
+	<string name="gtin_add_on">UPC EAN extension</string>
+	<string name="barcode_version_number">Version</string>
+	<string name="qr_version_and_modules">%1$d (%2$d modules)</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>
+	<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">هیچ برنامه‌ای نمی‌تواند آن را بگشاید</string>
+	<string name="pick_search_engine">یک موتور جست‌وجو برگزینید</string>
+	<string name="format">قالب</string>
+	<string name="size">اندازه به پیکسل</string>
+	<string name="width_by_height">%1$d×%2$d</string>
+	<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="info">اطّلاعات</string>
+	<string name="switch_camera">تغییر دوربین</string>
+	<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>
+	<string name="two_seconds">دو ثانیه</string>
+	<string name="five_seconds">پنج ثانیه</string>
+	<string name="history">تاریخچه</string>
+	<string name="preferences">ترجیحات</string>
+	<string name="scan_category">پویش</string>
+	<string name="content_category">محتویات</string>
+	<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_summary">پویش را به یک منطقه قابل تنظیم محدود می‌کند.</string>
+	<string name="barcode_formats">قالب‌های بارکد</string>
+	<string name="zoom_by_swiping">برای بزرگنمایی به بالا یا پایین بکشید</string>
+	<string name="zoom_by_swiping_summary">برای کنترل بزرگنمایی دوربین، در صفحهٔ دوربین به بالا یا پایین بکشید.</string>
+	<string name="auto_rotate">تشخیص بارکدهای یک بعدی عمودی</string>
+	<string name="auto_rotate_summary">قاب دوربین را به صورت خودکار بچرخانید تا بارکدهای یک بعدی عمودی را تشخیص دهید. بسته به دستگاه، این ممکن است بر عملکرد تأثیر بگذارد.</string>
+	<string name="try_harder">بهینه کردن خواننده برای دقت بیشتر</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="use_history">ذخیرهٔ تاریخچهٔ پویش</string>
+	<string name="use_history_summary">کدهای شناسایی شده را در همین دستگاه ذخیره می‌کند.</string>
+	<string name="ignore_consecutive_duplicates">نادیده گرفتن موارد تکراری</string>
+	<string name="ignore_consecutive_duplicates_summary">موارد تکراری متوالی را در تاریخچهٔ پویش ذخیره نمی‌کند.</string>
+	<string name="open_immediately">گشودن بلافاصله</string>
+	<string name="open_immediately_summary">بازرسی را رها کنید و محتویات را فورا باز کنید. در صورت فعال بودن ممکن است محتوای مضر را باز کند.</string>
+	<string name="copy_immediately">قرار دادن در تخته‌گیره</string>
+	<string name="copy_immediately_summary">به طور خودکار محتوای پویش شده را در تخته‌گیره رونوشت می‌کند. لطفاً توجه داشته باشید که برنامه‌های دیگر ممکن است در پس‌زمینه تخته‌گیرهٔ شما را شنود کنند.</string>
+	<string name="show_meta_data">نمایش فراداده</string>
+	<string name="show_meta_data_summary">نمایش داده‌های اضافی در مورد بارکد پویش شده.</string>
+	<string name="show_hex_dump">نمایش کد هگز استخراج شده</string>
+	<string name="show_hex_dump_summary">نمایش کد هگز استخراج شده از محتویات پویش شده.</string>
+	<string name="show_recreation">Show recreated barcode</string>
+	<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</string>
+	<string name="close_automatically">بازگشت پس از رونوشت یا هم‌رسانی</string>
+	<string name="close_automatically_summary">پس از رونوشت یا هم‌رسانی مطالب خوانده شده، به طور خودکار به صفحهٔ پویش بازگردید.</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_active">هدایت پویش‌ها</string>
+	<string name="send_scan_active_summary">برای هدایت پویش‌ها به نشانی مشخص شده، آن را به کار بیاندازید.</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">گشودن در مرورگر خارجی</string>
+	<string name="test_url">آزمودن نشانی</string>
+	<string name="really_remove_scan">برای برداشتن پویش مطمئنید؟</string>
+	<string name="really_remove_all_scans">برای برداشتن همهٔ پویش‌ها مطمئنید؟</string>
+	<string name="really_remove_selected_scans">برای برداشتن پویش‌های برگزیده شده مطمئنید؟</string>
+	<string name="clear_history">پاک کردن تاریخچه</string>
+	<string name="copy_scan">رونوشت پویش</string>
+	<string name="edit_scan">ویرایش عنوان</string>
+	<string name="remove_scan">برداشتن پویش</string>
+	<string name="enter_name">یک نام برای توضیح پویش وارد کنید</string>
+	<string name="enter_name_hint">نام پویش</string>
+	<string name="no_barcode_found">بارکدی یافت نشد</string>
+	<string name="pick_list_separator">چگونه موارد فهرست را جدا کنیم؟</string>
+	<string name="separator_line_break">خط بعدی</string>
+	<string name="separator_ruler">خط كش</string>
+	<string name="save_as_file_name">به عنوان پرونده در بارگیری‌ها ذخیره شود؟</string>
+	<string name="file_name">نام پرونده</string>
+	<string name="error_saving_file">نمی‌توان پرونده را ذخیره کرد</string>
+	<string name="error_file_exists">پرونده هم‌اکنون وجود دارد</string>
+	<string name="connect_to_wifi">اتّصال به وای‌فای</string>
+	<string name="wifi_config_failed">نمی‌توان وای‌فای را پیکربندی کرد</string>
+	<string name="wifi_added">وای‌فای اضافه شد</string>
+	<string name="sms_send">ارسال اس‌ام‌اس</string>
+	<string name="sms_error">نمی‌توان اس‌ام‌اس فرستاد</string>
+	<string name="tel_dial">تماس با شماره</string>
+	<string name="tel_error">نمی‌توان با شماره تماس گرفت</string>
+	<string name="mail_send">ارسال رایانامه</string>
+	<string name="mail_error">نمی‌توان رایانامه فرستاد</string>
+	<string name="vcard_add">افزودن به مخاطبین</string>
+	<string name="vcard_failed">نمی‌توان به مخاطبین اضافه کرد</string>
+	<string name="vevent_add">افزودن به تقویم</string>
+	<string name="vevent_failed">نمی‌توان به تقویم اضافه کرد</string>
+	<string name="otpauth_add">افزودن احراز هویت چندعاملی(2FA)</string>
+	<string name="search_web">جست‌وجوی وب</string>
+	<string name="search_scan">جست‌وجوی پویش</string>
+	<string name="export_to_file">برون‌ریزی به پرونده</string>
+	<string name="export_as">برون‌ریزی به عنوان؟</string>
+	<string name="export_csv_comma">پروندهٔ سی‌اس‌وی با ویرگول</string>
+	<string name="export_csv_semicolon">پروندهٔ سی‌اس‌وی با نقطه‌ویرگول</string>
+	<string name="export_json">پروندهٔ جی‌سون</string>
+	<string name="export_database">پایگاه‌دادهٔ اس‌کیولایت</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_preferences">تنظیمات</string>
+	<string name="background_request_failed">درخواست پس‌زمینه انجام نشد</string>
+	<string name="entry_type">گونه</string>
+	<string name="wifi_network">شبکهٔ وای‌فای</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">روش دو مرحله‌ای</string>
+</resources>

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>
@@ -15,14 +16,17 @@
 	<string name="error_correction_level_m" formatted="false">Moyen (~15% de correction)</string>
 	<string name="error_correction_level_q" formatted="false">Quartile (~25% de correction)</string>
 	<string name="error_correction_level_h" formatted="false">Élevé (~30% de correction)</string>
-	<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="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="sequence_size">Sequence size</string>
+	<string name="sequence_index">Sequence index</string>
+	<string name="sequence_id">Sequence ID</string>
+	<string name="gtin_issue_number">Numéro du problème</string>
+	<string name="gtin_country">Pays de fabrication possible</string>
+	<string name="gtin_price">Prix suggéré</string>
+	<string name="gtin_add_on">Extension UPC EAN</string>
+	<string name="barcode_version_number">Version</string>
+	<string name="qr_version_and_modules">%1$d (%2$d modules)</string>
 	<string name="toggle_flash">Activer le flash</string>
+	<string name="error_flash">Erreur de basculement du 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 +47,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">Démarre toujours en scan continu.</string>
+	<string name="bulk_mode_delay">Délai entre les scans continus</string>
+	<string name="restrict_format">Restreindre le format</string>
+	<string name="remove_restriction">Supprimer la 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>
@@ -58,47 +65,52 @@
 	<string name="custom_locale">Langue personnalisée</string>
 	<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="show_crop_handle_summary">Restreint le scan à une région personnalisée.</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="auto_rotate_summary">Tourne 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="vibrate_summary">Fait vibrer l\'appareil lorsqu\'un code est reconnu.</string>
 	<string name="use_history">Sauvegarder l\'historique des scans</string>
-	<string name="use_history_summary">Sauvegarder les codes reconnus sur votre appareil.</string>
+	<string name="use_history_summary">Sauvegarde les codes reconnus sur votre appareil.</string>
 	<string name="ignore_consecutive_duplicates">Ignorer les doublons</string>
-	<string name="ignore_consecutive_duplicates_summary">Ne pas sauvegarder les doublons dans l\'historique des scans.</string>
+	<string name="ignore_consecutive_duplicates_summary">Ne sauvegarde pas les doublons dans l\'historique des scans.</string>
 	<string name="open_immediately">Ouvrir immédiatement</string>
-	<string name="open_immediately_summary">Sauter l\'inspection et ouvrir le contenu immédiatement. Si activé, cela peut ouvrir un contenu nocif.</string>
+	<string name="open_immediately_summary">Saute l\'inspection et ouvre le contenu immédiatement. Si activé, cela peut ouvrir un contenu nocif.</string>
 	<string name="copy_immediately">Mettre dans le presse-papiers</string>
-	<string name="copy_immediately_summary">Copier automatiquement les contenus scannés dans le presse-papiers. Veuillez noter que les autres applications peuvent fouiner dans votre presse-papiers en arrière-plan.</string>
+	<string name="copy_immediately_summary">Copie automatiquement les contenus scannés dans le presse-papiers. Veuillez noter que les autres applications peuvent fouiner dans votre presse-papiers en arrière-plan.</string>
 	<string name="show_meta_data">Afficher les méta-données</string>
-	<string name="show_meta_data_summary">Afficher les données supplémentaires sur le code-barres scanné.</string>
+	<string name="show_meta_data_summary">Affiche les données supplémentaires sur le code-barres scanné.</string>
 	<string name="show_hex_dump">Afficher le dump hexa</string>
-	<string name="show_hex_dump_summary">Affiche un dump hexadécimal du contenu scanné.</string>
+	<string name="show_hex_dump_summary">Affiche le dump hexadécimal du contenu scanné.</string>
+	<string name="show_recreation">Show recreated barcode</string>
+	<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</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">Supprime 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_url">Envoyer chaque scan vers une URL</string>
-	<string name="send_scan_type">Type de requête pour chaque scan</string>
+	<string name="send_scan_active">Transférer les scans</string>
+	<string name="send_scan_active_summary">Transfère les scans vers une URL donnée.</string>
+	<string name="send_scan_url">URL de transfert</string>
+	<string name="send_scan_type">Type de requête</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 +160,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>
-