Advance version number to 1.62.1

To make it selectable, too.

CHANGELOG.md

@@ -1,5 +1,302 @@
 # Change Log
 
+## 1.62.1
+* Make rMQR Code selectable
+
+## 1.62.0
+* Add support for rMQR (rectangular Micro QR) Code
+* Share history as a file
+* Only share selected scans from history
+
+## 1.61.2
+* Fix quick settings tile for Android 14
+* Fix Xiaomi MIUI lockscreen barcode shortcut
+* Update French translation
+* Update Czech translation
+* Update Russian translation
+
+## 1.61.1
+* Share scanned contents as a file
+* Recreate binary barcodes too
+* Add Bulgarian translation and Brave search engine
+* Update Russian translation
+* Fix general format restriction from preferences
+
+## 1.61.0
+* Support encoding binary data
+* Add margin parameter for encoding
+* Add copying binary data as hex dump
+* Fix parsing TYPE argument in VCARDs
+* Update Russian translation
+* Update Brazilian Portuguese translation
+* Update Ukrainian translation
+* Update Chinese translation
+
+## 1.60.3
+* Fix saving custom language
+* Update Brazilian Portuguese translation
+* Update Chinese translation
+* Update Czech localisation
+* Update Russian translation
+* Update Italian language
+
+## 1.60.2
+* Expand escape sequences in encoding input
+* Update Taiwan translation
+
+## 1.60.1
+* Support sending scans via bluetooth
+* Fix resolving error correction level for recreation
+* Improve asset image compression
+* Update ZXing C++
+* Update Italian translation
+* Update Russian translation
+
+## 1.59.0
+* Add setting error correction for AZTEC/PDF417
+* Fix setting error correction level for QR Codes
+* Make error beeps follow beep settings too
+* Don't close the app when cameras is unavailable
+
+## 1.58.2
+* Fix parsing WiFi network suggestions
+
+## 1.58.1
+* Update zh-rCn translation
+* Fix monochrome launcher icon
+
+## 1.58.0
+* Improve detection of inverted barcodes
+* Optionally allow duplicates in bulk scan
+* Add Danish translation
+* Update Italian translation
+* Update Japanese translation
+* Update Russian translation
+* Fix charset decoding for PDF 417
+* Fix monochrome icon
+
+## 1.57.0
+* Add optional audio feedback for scanning
+* Allow removing individual WiFi network suggestions
+* Recognize incomplete and malformed WiFi barcodes
+* Fix using shared text for encoding
+* Add Korean language
+* Update Chinese translation
+* Update Português/Brasil translation
+* Update Russian translation
+
+## 1.56.3
+* Fix parsing URLs in barcodes
+* Update French, Portuguese, Turkish and Taiwan translation
+
+## 1.56.2
+* Fix generating 1D barcode text output
+
+## 1.56.1
+* Allow pinching a barcode to its generated size
+* Fix view/frame transformation matrix
+* Fix handling of tab characters
+* Update Indonesian translation
+* Update Russian translation
+
+## 1.56.0
+* Add an action item to lock/unlock free rotation
+* Support setting fore and background colors when creating barcodes
+* Fix creating barcodes with UTF-8 content
+
+## 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
+
+## 1.46.1
+* Use cropping limiter settings for image picking too
+* Remove extra link on result screen
+* Update Turkish translation
+
+## 1.46.0
+* Support deep links
+* Support "A:" in WIFI codes
+* Allow multiple query arguments in custom URL
+* Add Wi-Fi info data section
+* Add Vietnamese translation
+* Update Brazilian Portuguese translation
+* Update Hungarian translation
+* Update Ukrainian translation
+* Update Russian translation
+
+## 1.45.0
+* Add a setting to set the delay for bulk mode
+* Add support for MECARD contact format
+* Remove unused permissions on Android Q
+
+## 1.44.1
+* Update Spanish translation
+* Update Japanese translation
+* Fix in-app language switching for App Bundles
+
+## 1.44.0
+* Add a setting to choose barcode formats to scan
+* Ask before removing network suggestions
+* Update Traditional Chinese Translation
+* Update Russian language
+* Update Dutch translation
+
+## 1.43.0
+* Add a preference item to remove WiFi network suggestions
+* Update Traditional Chinese Translation
+* Update Russian language
+
+## 1.42.0
+* Add a setting to pick a default search engine
+* Update Traditional Chinese
+* Update Dutch translation
+
+## 1.41.1
+* Update Bengali translation
+* Update Simplified Chinese
+
+## 1.41.0
+* Use cropping limiter by default for new installations
+* Truncate all toasts with strings from the outside
+* Add Bangla translation
+* Add missing Japanese locale
+* Update Hungarian translation
+* Update Russian app description
+
+## 1.40.0
+* Add a setting to show/hide scanned data when scanning continuously
+* Only show the first 50 characters when scanning continuously
+* Share binary data as hex dump
+* Update Russian language
+
+## 1.39.0
+* Fix adding contacts and calendar entries on Android 11+
+* Add a setting to always start in bulk mode
+* Add Czech translation
+* Update Spanish translation
+* Update Czech translation
+
+## 1.38.0
+* Add a quick settings tile to scan from settings
+* Make custom background requests time out after 5 seconds
+* Add Japanese translation
+* Updated French translation
+
+## 1.37.0
+* Improve formatting date and time in history listing
+* Add haptic and audible feedback for background request errors
+
+## 1.36.0
+* Add a setting to automatically return to scanning screen after copying
+* Add a button to test the background request
+* Show HTTP response for background requests
+* Improve SVG export
+* Automatically continue with an action after granting a permission
+* Update Chinese translation
+* Update French translation
+* Update Indonesian translation
+* Update Turkish translation
+* Update Ukrainian translation
+
 ## 1.35.0
 * Put images with transparent pixels on white/black
 * Use cropping limiter when scanning from images too

CONTRIBUTING.md

@@ -17,4 +17,4 @@ Then write a [good commit message][commit_messages] to keep the history
 meaningful and useful. One feature, one commit.
 
 [android_best_practices]: https://developer.android.com/distribute/best-practices/develop/
-[commit_messages]: https://juffalow.com/other/write-good-git-commit-message
+[commit_messages]: https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project#_commit_guidelines

Makefile

@@ -20,8 +20,23 @@ infer: clean
 test:
 	./gradlew test
 
-cat:
-	./gradlew test cAT
+testview:
+	adb shell am start -W -a android.intent.action.VIEW -d 'binaryeye://scan'
+
+testscan:
+	adb shell am start -a android.intent.action.VIEW \
+		-c android.intent.category.BROWSABLE \
+		-d 'binaryeye://scan/?ret=http%3A%2F%2Fmarkusfisch.de%2F%3Fresult%3D{RESULT}'
+
+testurl:
+	adb shell am start -a android.intent.action.VIEW \
+		-c android.intent.category.BROWSABLE \
+		-d 'http://markusfisch.de/BinaryEye?ret=http%3A%2F%2Fmarkusfisch.de%2F%3Fresult%3D{RESULT}'
+
+testxiaomi:
+	adb shell am start -a android.intent.action.VIEW \
+		-c android.intent.category.BROWSABLE \
+		-d 'market://details?id=com.xiaomi.scanner'
 
 install:
 	adb $(TARGET) install -r app/build/outputs/apk/debug/app-debug.apk

PRIVACY.md

@@ -7,33 +7,40 @@ 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).
 
 Before Android Q, this feature requires using
-[WifiManager.getConfiguredNetworks][configuredNetworks]
+[WifiManager.getConfiguredNetworks][getConfiguredNetworks]
 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)
+### [BLUETOOTH][BLUETOOTH], [BLUETOOTH_ADMIN][BLUETOOTH_ADMIN] and [BLUETOOTH_CONNECT][BLUETOOTH_CONNECT]
+
+Required to optionally forward scans to a Bluetooth device.
+
+[BLUETOOTH][BLUETOOTH] and [BLUETOOTH_ADMIN][BLUETOOTH_ADMIN] are required
+before Android S. [BLUETOOTH_CONNECT][BLUETOOTH_CONNECT] from Android S on.
+
+### [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,13 +48,28 @@ 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).
 
 Before Android Q, this feature requires using
-[WifiManager.getConfiguredNetworks][configuredNetworks]
+[WifiManager.getConfiguredNetworks][getConfiguredNetworks]
 which requires `ACCESS_WIFI_STATE`.
 
-[configuredNetworks]: https://developer.android.com/reference/android/net/wifi/WifiManager#getConfiguredNetworks()
+From Android R, `ACCESS_WIFI_STATE` is required for
+[WifiManager.getNetworkSuggestions][getNetworkSuggestions]
+which is used to remove individual network suggestions.
+
+[ACCESS_FINE_LOCATION]: https://developer.android.com/reference/android/Manifest.permission#ACCESS_FINE_LOCATION
+[BLUETOOTH]: https://developer.android.com/reference/android/Manifest.permission#BLUETOOTH
+[BLUETOOTH_ADMIN]: https://developer.android.com/reference/android/Manifest.permission#BLUETOOTH_ADMIN
+[BLUETOOTH_CONNECT]: https://developer.android.com/reference/android/Manifest.permission#BLUETOOTH_CONNECT
+[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
+[getConfiguredNetworks]: 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)
+[getNetworkSuggestions]: https://developer.android.com/reference/android/net/wifi/WifiManager#getNetworkSuggestions()

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,11 @@ 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]
+* [rMQR Code][rmqr_code]
 * [RSS 14][rss]
 * [RSS EXPANDED][rss]
 * [UPC A][upc_a]
@@ -64,37 +65,78 @@ ZXing can generate the following barcode formats:
 * [QR CODE][qr_code]
 * [UPC A][upc_a]
 
-## RenderScript
+## Deep Links and Intents
 
-This app uses [RenderScript][rs] to resize and rotate the camera image.
-Unfortunately, RenderScript has some nasty gotchas.
+### Deep Links
 
-### RenderScript.forceCompat()
+You can invoke Binary Eye with a web URI intent from anything that can
+open URIs. There are two options:
 
-It's necessary to call `RenderScript.forceCompat()` on some devices/roms.
+1. [binaryeye://scan](binaryeye://scan)
+2. [http(s)://markusfisch.de/BinaryEye](http://markusfisch.de/BinaryEye)
 
-`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 you want to get the scanned contents, you can add a `ret` query
+argument with a (URL encoded) URI template. For example:
 
-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.
+[http://markusfisch.de/BinaryEye?ret=http%3A%2F%2Fexample.com%2F%3Fresult%3D{RESULT}](http://markusfisch.de/BinaryEye?ret=http%3A%2F%2Fexample.com%2F%3Fresult%3D{RESULT})
 
-Calling `RenderScript.forceCompat()` means the processing is done in
-software so you probably don't want to enable it by default.
+Supported symbols are:
 
-### 2D barcodes
+* `RESULT` - scanned content
+* `RESULT_BYTES` - raw result as a hex string
+* `FORMAT` - barcode format
 
-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.
+### SCAN Intent
 
-This will make your app a bit simpler and saves you from compiling a
-custom RenderScript kernel for each architecture you want to support.
+You can also use Binary Eye from other apps by using the
+`com.google.zxing.client.android.SCAN` Intent with
+[startActivityForResult()][start_activity] like this:
+
+```kotlin
+startActivityForResult(
+	Intent("com.google.zxing.client.android.SCAN"),
+	SOME_NUMBER
+)
+```
+
+And process the result in [onActivityResult()][on_activity_result] of your
+`Activity`:
+
+```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")
+			…
+		}
+	}
+
+	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
@@ -108,9 +150,12 @@ 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
+[rmqr_code]: https://www.qrcode.com/en/codes/rmqr.html
 [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,18 @@ 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 74
-		versionName '1.35.0'
-
-		// 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 125
+		versionName '1.62.1'
 	}
 
 	signingConfigs {
-		config {
+		release {
 			keyAlias System.getenv('ANDROID_KEY_ALIAS')
 			keyPassword System.getenv('ANDROID_KEY_PASSWORD')
 			storePassword System.getenv('ANDROID_STORE_PASSWORD')
@@ -46,36 +37,40 @@ android {
 			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 			minifyEnabled true
 			shrinkResources true
-			signingConfig signingConfigs.config
+			signingConfig signingConfigs.release
 		}
 	}
 
-	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'
+	bundle {
+		language {
+			// To make the app bundle contain all language resources
+			// so the in-app language setting works. Another solution
+			// would be to use the PlayCore API to download language
+			// resources on demand, but it makes much more sense to
+			// simply include the ~60 kb than adding fragile code and
+			// dependencies.
+			enableSplit = false
+		}
+	}
+
+
+	compileOptions {
+		// Required for Gradle 8.
+		sourceCompatibility = 17
+		targetCompatibility = 17
 	}
 }
 
 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.4"
 	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:CameraView:1.9.2'
+	implementation 'com.github.markusfisch:ScalingImageView:1.4.1'
+	implementation 'com.github.markusfisch:zxing-cpp:v2.2.0.1'
 }

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,3 @@
 -dontwarn android.support.v8.**
 
 -keep class android.support.v7.widget.SearchView { *; }
--keep class android.support.v8.renderscript.** { *; }

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,15 +1,21 @@
 <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"
 		android:xlargeScreens="true"/>
-	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"
+		android:maxSdkVersion="28"/>
+	<uses-permission android:name="android.permission.BLUETOOTH"
+		android:maxSdkVersion="30"/>
+	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"
+		android:maxSdkVersion="30"/>
+	<uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>
 	<uses-permission android:name="android.permission.CAMERA"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<uses-permission android:name="android.permission.VIBRATE"/>
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+		android:maxSdkVersion="28"/>
 	<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
 	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
 	<uses-feature android:name="android.hardware.camera"/>
@@ -31,6 +37,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"
@@ -38,8 +45,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"/>
@@ -50,7 +57,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"/>
@@ -64,15 +72,20 @@
 				<action android:name="android.intent.action.VIEW"/>
 				<category android:name="android.intent.category.DEFAULT"/>
 				<category android:name="android.intent.category.BROWSABLE"/>
-				<data
-					android:host="www.markusfisch.de"
-					android:pathPrefix="/BinaryEye"
-					android:scheme="http"/>
+				<data android:host="details" android:scheme="market"
+					android:pathSuffix="id=com.xiaomi.scanner"/>
+			</intent-filter>
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW"/>
+				<category android:name="android.intent.category.DEFAULT"/>
+				<category android:name="android.intent.category.BROWSABLE"/>
+				<data android:scheme="binaryeye" android:host="scan"/>
 			</intent-filter>
 		</activity>
 		<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"/>
@@ -87,8 +100,17 @@
 		</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"/>
+			</intent-filter>
+		</service>
 		<provider
 			android:name="android.support.v4.content.FileProvider"
 			android:authorities="${applicationId}.provider"

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.execShareIntent
-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
-		)
-		execShareIntent(context, 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))
-		execShareIntent(context, 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,15 +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.execShareIntent
-import de.markusfisch.android.binaryeye.app.parseAndNormalizeUri
 import de.markusfisch.android.binaryeye.app.prefs
-import de.markusfisch.android.binaryeye.widget.toast
-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
@@ -18,28 +15,39 @@ object OpenOrSearchAction : IAction {
 	override fun canExecuteOn(data: ByteArray): Boolean = false
 
 	override suspend fun execute(context: Context, data: ByteArray) {
-		val intent = openUri(context, String(data)) ?: return
-		execShareIntent(context, intent)
+		view(context, String(data), true)
 	}
 
-	private suspend fun openUri(context: Context, data: String, search: Boolean = true): Intent? {
-		val uri = parseAndNormalizeUri(data)
-		val intent = Intent(Intent.ACTION_VIEW, uri)
-		when {
-			intent.resolveActivity(context.packageManager) != null -> return intent
-			search -> return getSearchIntent(context, data)
-			else -> context.toast(R.string.cannot_resolve_action)
+	private suspend fun view(
+		context: Context,
+		url: String,
+		search: Boolean
+	) {
+		if (!context.openUrl(url, silent = true) && search) {
+			openSearch(context, url)
 		}
-		return null
 	}
 
-	private suspend fun getSearchIntent(context: Context, query: String): Intent? {
+	private suspend fun openSearch(context: Context, query: String) {
+		val defaultSearchUrl = prefs.defaultSearchUrl
+		if (defaultSearchUrl.isNotEmpty()) {
+			view(
+				context,
+				defaultSearchUrl + query.urlEncode(),
+				false
+			)
+			return
+		}
 		val names = context.resources.getStringArray(
 			R.array.search_engines_names
 		).toMutableList()
 		val urls = context.resources.getStringArray(
 			R.array.search_engines_values
 		).toMutableList()
+		// Remove the "Always ask" entry. The arrays search_engines_*
+		// are used in the preferences too.
+		names.removeFirst()
+		urls.removeFirst()
 		if (prefs.openWithUrl.isNotEmpty()) {
 			names.add(prefs.openWithUrl)
 			urls.add(prefs.openWithUrl)
@@ -47,9 +55,9 @@ 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 null
-		return openUri(context, queryUri, false)
+		} ?: 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/VType.kt

@@ -1,6 +1,6 @@
 package de.markusfisch.android.binaryeye.actions.vtype
 
-import java.util.*
+import java.util.Locale
 
 object VTypeParser {
 	private const val BACKSLASH_R_LEGACY =
@@ -15,7 +15,7 @@ object VTypeParser {
 
 	fun parseVType(data: String): String? = vTypeRegex.matchEntire(
 		data
-	)?.groupValues?.get(1)?.toUpperCase(Locale.US)
+	)?.groupValues?.get(1)?.uppercase(Locale.US)
 
 	fun parseMap(
 		data: String
@@ -26,7 +26,7 @@ object VTypeParser {
 				it.groupValues[2]
 			)
 		}
-	}.groupBy({ it.first.toUpperCase(Locale.US) }) { it.second }
+	}.groupBy({ it.first.uppercase(Locale.US) }) { it.second }
 }
 
 data class VTypeProperty(
@@ -39,6 +39,6 @@ data class VTypeProperty(
 		} ?: this.info.firstOrNull()
 
 	companion object {
-		private val typeRegex = """^(?:TYPE=)(.+?)[:;]?.*$""".toRegex(RegexOption.IGNORE_CASE)
+		private val typeRegex = """^TYPE=([A-Z_]+)[:;]?.*$""".toRegex(RegexOption.IGNORE_CASE)
 	}
 }

app/src/main/kotlin/de/markusfisch/android/binaryeye/actions/vtype/vcard/VCardAction.kt

@@ -8,8 +8,7 @@ import android.provider.ContactsContract
 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
+import java.util.Locale
 
 object VCardAction : IntentAction() {
 	override val iconResId: Int
@@ -20,10 +19,19 @@ object VCardAction : IntentAction() {
 		get() = R.string.vcard_failed
 
 	override fun canExecuteOn(data: ByteArray): Boolean {
-		return VTypeParser.parseVType(String(data)) == "VCARD"
+		var stringData = String(data)
+		// Quick & dirty MECARD support: simply make it a VCARD.
+		if (stringData.startsWith("MECARD:")) {
+			stringData = stringData
+				.trim()
+				.replace("MECARD:", "BEGIN:VCARD\n")
+				.replace(";;", "\nEND:VCARD\n")
+				.replace(";", "\n")
+		}
+		return VTypeParser.parseVType(stringData) == "VCARD"
 	}
 
-	override suspend fun createIntent(context: Context, data: ByteArray): Intent? {
+	override suspend fun createIntent(context: Context, data: ByteArray): Intent {
 		val info = VTypeParser.parseMap(String(data))
 
 		return Intent(Intent.ACTION_INSERT_OR_EDIT).apply {
@@ -37,10 +45,13 @@ object VCardAction : IntentAction() {
 				val (extraPhoneType, extraPhone) = when (index) {
 					0 -> ContactsContract.Intents.Insert.PHONE_TYPE to
 							ContactsContract.Intents.Insert.PHONE
+
 					1 -> ContactsContract.Intents.Insert.SECONDARY_PHONE_TYPE to
 							ContactsContract.Intents.Insert.SECONDARY_PHONE
+
 					2 -> ContactsContract.Intents.Insert.TERTIARY_PHONE_TYPE to
 							ContactsContract.Intents.Insert.TERTIARY_PHONE_TYPE
+
 					else -> return@forEachIndexed
 				}
 				phoneProperty.firstTypeOrFirstInfo?.also {
@@ -50,17 +61,20 @@ object VCardAction : IntentAction() {
 				}
 				putExtra(
 					extraPhone,
-					phoneProperty.value.toLowerCase(Locale.US).removePrefix("tel:")
+					phoneProperty.value.lowercase(Locale.US).removePrefix("tel:")
 				)
 			}
 			info["EMAIL"]?.forEachIndexed { index, mailProperty ->
 				val (extraMailType, extraMail) = when (index) {
 					0 -> ContactsContract.Intents.Insert.EMAIL_TYPE to
 							ContactsContract.Intents.Insert.EMAIL
+
 					1 -> ContactsContract.Intents.Insert.SECONDARY_EMAIL_TYPE to
 							ContactsContract.Intents.Insert.SECONDARY_EMAIL
+
 					2 -> ContactsContract.Intents.Insert.TERTIARY_EMAIL_TYPE to
 							ContactsContract.Intents.Insert.TERTIARY_EMAIL
+
 					else -> return@forEachIndexed
 				}
 				mailProperty.firstTypeOrFirstInfo?.also {
@@ -142,7 +156,7 @@ object VCardAction : IntentAction() {
 			} ?: this
 
 	private val String.mailType: Int?
-		get() = when (this.toUpperCase(Locale.US)) {
+		get() = when (this.uppercase(Locale.US)) {
 			"HOME" -> ContactsContract.CommonDataKinds.Email.TYPE_HOME
 			"WORK" -> ContactsContract.CommonDataKinds.Email.TYPE_WORK
 			"OTHER" -> ContactsContract.CommonDataKinds.Email.TYPE_OTHER
@@ -151,7 +165,7 @@ object VCardAction : IntentAction() {
 		}
 
 	private val String.phoneType: Int?
-		get() = when (this.toUpperCase(Locale.US)) {
+		get() = when (this.uppercase(Locale.US)) {
 			"HOME" -> ContactsContract.CommonDataKinds.Phone.TYPE_HOME
 			"MOBILE", "CELL" -> ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE
 			"WORK" -> ContactsContract.CommonDataKinds.Phone.TYPE_WORK
@@ -176,7 +190,7 @@ object VCardAction : IntentAction() {
 		}
 
 	private val String.addressType: Int?
-		get() = when (this.toUpperCase(Locale.US)) {
+		get() = when (this.uppercase()) {
 			"HOME" -> ContactsContract.CommonDataKinds.StructuredPostal.TYPE_HOME
 			"WORK" -> ContactsContract.CommonDataKinds.StructuredPostal.TYPE_WORK
 			"OTHER" -> ContactsContract.CommonDataKinds.StructuredPostal.TYPE_OTHER

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,37 +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
+					)
 				}
 			}
 		}
 	}
-
-	@SuppressLint("SimpleDateFormat") // we definitely don't wan't the local format
-	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,26 @@
 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-Za-z0-9]{3,}\\.[A-Za-z]{2,}[^ \t\r\n]*$".toRegex()
 
-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/actions/wifi/WifiAction.kt

@@ -22,10 +22,9 @@ object WifiAction : IAction {
 		context: Context,
 		data: ByteArray
 	) = withContext(Dispatchers.IO) {
-		val wifiConfig = WifiConnector.parse(
-			String(data)
-		) ?: return@withContext
-		val message = WifiConnector.addNetwork(context, wifiConfig)
+		val message = WifiConnector.parse(String(data))?.let {
+			WifiConnector.addNetwork(context, it)
+		} ?: R.string.wifi_config_failed
 		withContext(Dispatchers.Main) {
 			context.toast(message)
 		}

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

@@ -44,12 +44,21 @@ object WifiConnector {
 		passwordBlock?.apply {
 			invoke(parsedData.password)
 		}
-		return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-			// WifiConfiguration is deprecated in Android Q
-			@Suppress("DEPRECATION")
-			WifiConfiguration().apply(parsedData)
-		} else {
-			WifiNetworkSuggestion.Builder().apply(parsedData)
+		return try {
+			if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
+				// WifiConfiguration is deprecated in Android Q but
+				// because it's only possible in R to query network
+				// suggestions, we still use the deprecated API on Q.
+				@Suppress("DEPRECATION")
+				WifiConfiguration().apply(parsedData)
+			} else {
+				WifiNetworkSuggestion.Builder().apply(parsedData)
+			}
+		} catch (e: IllegalArgumentException) {
+			// Some arguments may be out of range, e.g. SSIDs cannot
+			// be longer than 32 characters in some versions of Android.
+			// See: https://github.com/markusfisch/BinaryEye/issues/402
+			null
 		}
 	}
 
@@ -57,44 +66,34 @@ object WifiConnector {
 		val wifiManager = context.applicationContext.getSystemService(
 			Context.WIFI_SERVICE
 		) as WifiManager
-		return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-			// WifiConfiguration is deprecated in Android Q
-			@Suppress("DEPRECATION")
-			val wifiConfig = config as WifiConfiguration
-			if (wifiManager.enableWifi() &&
-				wifiManager.removeOldNetwork(wifiConfig) &&
-				wifiManager.enableNewNetwork(wifiConfig)
-			) {
-				R.string.wifi_added
-			} else {
-				R.string.wifi_config_failed
-			}
+		// WifiConfiguration is deprecated in Android Q.
+		@Suppress("DEPRECATION")
+		return if ((config is WifiConfiguration &&
+					wifiManager.enableWifi() &&
+					wifiManager.removeOldNetwork(config) &&
+					wifiManager.enableNewNetwork(config)) ||
+			(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q &&
+					config is WifiNetworkSuggestion.Builder &&
+					wifiManager.addNetworkFromBuilder(config))
+		) {
+			R.string.wifi_added
 		} else {
-			val suggestion = (config as WifiNetworkSuggestion.Builder).build()
-			val suggestions = listOf(suggestion)
-			// remove previous conflicting network suggestion
-			wifiManager.removeNetworkSuggestions(suggestions)
-			val result = wifiManager.addNetworkSuggestions(suggestions)
-			if (result == WifiManager.STATUS_NETWORK_SUGGESTIONS_SUCCESS) {
-				R.string.wifi_added
-			} else {
-				R.string.wifi_config_failed
-			}
+			R.string.wifi_config_failed
 		}
 	}
 
-	internal fun parseMap(string: String): Map<String, String>? {
-		// normally those codes should have the last semicolon, but many
-		// generators don't add it
+	internal fun parseMap(input: String): Map<String, String>? {
+		// Normally those codes should have the last semicolon, but many
+		// generators don't add it.
 		val wifiRegex = """^WIFI:((?:.+?:(?:[^\\;]|\\.)*;)+);?$""".toRegex()
-		// should be: ^(.+):((?:[^\\;,":]|\\.)*);$ but allows unescaped , "
-		// and : because many QR Code creators don't escape properly
+		// Should be: ^(.+):((?:[^\\;,":]|\\.)*);$ but allows unescaped , "
+		// and : because many QR Code creators don't escape properly.
 		val pairRegex = """(.+?):((?:[^\\;]|\\.)*);""".toRegex()
 		return wifiRegex.matchEntire(
-			string
+			input.trimAndTerminate()
 		)?.groupValues?.get(1)?.let { pairs ->
 			pairRegex.findAll(pairs).map { pair ->
-				pair.groupValues[1].toUpperCase(Locale.US) to pair.groupValues[2]
+				pair.groupValues[1].uppercase(Locale.US) to pair.groupValues[2]
 			}.toMap()
 		}
 	}
@@ -102,7 +101,7 @@ object WifiConnector {
 	internal class SimpleDataAccessor private constructor(
 		private val inputMap: Map<String, String>
 	) {
-		// this should be private but because of testing it isn't possible
+		// This should be private but because of testing it isn't possible.
 		internal val ssid: String
 			get() = inputMap.getValue("S").unescape
 		internal val securityType: String
@@ -112,7 +111,7 @@ object WifiConnector {
 		internal val hidden: Boolean
 			get() = inputMap["H"]?.unescape == "true"
 		internal val anonymousIdentity: String
-			get() = inputMap["AI"]?.unescape ?: ""
+			get() = inputMap["AI"]?.unescape ?: inputMap["A"]?.unescape ?: ""
 		internal val identity: String
 			get() = inputMap["I"]?.unescape ?: ""
 		internal val eapMethod: Int?
@@ -120,7 +119,7 @@ object WifiConnector {
 				requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) {
 					WifiEnterpriseConfig.Eap.NONE
 				}
-			} else when (inputMap["E"]) {
+			} else when (inputMap["E"]?.uppercase()) {
 				"AKA" -> requireSdk(Build.VERSION_CODES.LOLLIPOP) { WifiEnterpriseConfig.Eap.AKA }
 				"AKA_PRIME" -> requireSdk(Build.VERSION_CODES.M) { WifiEnterpriseConfig.Eap.AKA_PRIME }
 				"NONE" -> requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) { WifiEnterpriseConfig.Eap.NONE }
@@ -137,7 +136,7 @@ object WifiConnector {
 				requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) {
 					WifiEnterpriseConfig.Phase2.NONE
 				}
-			} else when (inputMap["PH2"]) {
+			} else when (inputMap["PH2"]?.uppercase()) {
 				"AKA" -> requireSdk(Build.VERSION_CODES.O) { WifiEnterpriseConfig.Phase2.AKA }
 				"AKA_PRIME" -> requireSdk(Build.VERSION_CODES.O) { WifiEnterpriseConfig.Phase2.AKA_PRIME }
 				"GTC" -> requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) { WifiEnterpriseConfig.Phase2.GTC }
@@ -164,7 +163,7 @@ object WifiConnector {
 	): WifiNetworkSuggestion.Builder? {
 		fun WifiNetworkSuggestion.Builder.applyCommon(
 			data: SimpleDataAccessor
-		): WifiNetworkSuggestion.Builder? {
+		): WifiNetworkSuggestion.Builder {
 			setSsid(data.ssid)
 			return this
 		}
@@ -172,47 +171,47 @@ object WifiConnector {
 		fun WifiNetworkSuggestion.Builder.applySecurity(
 			data: SimpleDataAccessor
 		): WifiNetworkSuggestion.Builder? {
-			when (data.securityType) {
-				"WPA", "WPA2" -> {
-					data.password?.let {
-						setWpa2Passphrase(it)
+			try {
+				when (data.securityType.uppercase()) {
+					"WPA", "WPA2" -> {
+						data.password?.let { setWpa2Passphrase(it) }
+					}
+
+					"WPA2-EAP" -> {
+						setWpa2EnterpriseConfig(WifiEnterpriseConfig().apply {
+							identity = data.identity
+							anonymousIdentity = data.anonymousIdentity
+							password = data.password
+							data.eapMethod?.let { eapMethod = it }
+							data.phase2Method?.let { phase2Method = it }
+						})
+					}
+
+					"WPA3" -> {
+						data.password?.let { setWpa3Passphrase(it) }
+					}
+
+					"WPA3-EAP" -> {
+						setWpa3EnterpriseConfig(WifiEnterpriseConfig().apply {
+							identity = data.identity
+							anonymousIdentity = data.anonymousIdentity
+							password = data.password
+							data.eapMethod?.let { eapMethod = it }
+							data.phase2Method?.let { phase2Method = it }
+						})
 					}
 				}
-				"WPA2-EAP" -> {
-					data.password?.let {
-						setWpa2Passphrase(it)
-					}
-					setWpa2EnterpriseConfig(WifiEnterpriseConfig().apply {
-						identity = data.identity
-						anonymousIdentity = data.anonymousIdentity
-						password = data.password
-						data.eapMethod?.let { eapMethod = it }
-						data.phase2Method?.let { phase2Method = it }
-					})
-				}
-				"WPA3" -> {
-					data.password?.let {
-						setWpa3Passphrase(it)
-					}
-				}
-				"WPA3-EAP" -> {
-					data.password?.let { setWpa3Passphrase(it) }
-					setWpa3EnterpriseConfig(WifiEnterpriseConfig().apply {
-						identity = data.identity
-						anonymousIdentity = data.anonymousIdentity
-						password = data.password
-						data.eapMethod?.let { eapMethod = it }
-						data.phase2Method?.let { phase2Method = it }
-					})
-				}
+			} catch (e: IllegalArgumentException) {
+				// Don't accept passphrases that aren't ASCII encodeable.
+				return null
 			}
 			return this
 		}
 
-		return this.applyCommon(data)?.applySecurity(data)
+		return this.applyCommon(data).applySecurity(data)
 	}
 
-	// WifiConfiguration is deprecated in Android Q
+	// WifiConfiguration is deprecated in Android Q.
 	@Suppress("DEPRECATION")
 	private fun WifiConfiguration.apply(
 		data: SimpleDataAccessor
@@ -222,7 +221,7 @@ object WifiConnector {
 
 		fun WifiConfiguration.applyCommon(
 			data: SimpleDataAccessor
-		): WifiConfiguration? {
+		): WifiConfiguration {
 			allowedAuthAlgorithms.clear()
 			allowedGroupCiphers.clear()
 			allowedKeyManagement.clear()
@@ -237,8 +236,8 @@ object WifiConnector {
 		fun WifiConfiguration.applySecurity(
 			data: SimpleDataAccessor
 		): WifiConfiguration? {
-			when (data.securityType) {
-				"", "nopass" -> allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE)
+			when (data.securityType.uppercase()) {
+				"", "NOPASS" -> allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE)
 				"WEP" -> @Suppress("DEPRECATION") /* WEP as insecure */ {
 					passwordWithQuotes?.let {
 						wepKeys[0] = it
@@ -251,6 +250,7 @@ object WifiConnector {
 					allowedGroupCiphers.set(WifiConfiguration.GroupCipher.WEP40)
 					allowedGroupCiphers.set(WifiConfiguration.GroupCipher.WEP104)
 				}
+
 				"WPA" -> {
 					passwordWithQuotes?.let {
 						preSharedKey = it
@@ -267,6 +267,7 @@ object WifiConnector {
 					allowedGroupCiphers.set(WifiConfiguration.GroupCipher.TKIP)
 					allowedGroupCiphers.set(WifiConfiguration.GroupCipher.CCMP)
 				}
+
 				"WPA2-EAP" -> requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) {
 					passwordWithQuotes?.let {
 						preSharedKey = it
@@ -274,7 +275,7 @@ object WifiConnector {
 					allowedAuthAlgorithms.set(WifiConfiguration.AuthAlgorithm.OPEN)
 					allowedProtocols.set(WifiConfiguration.Protocol.RSN) // WPA2
 					allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_EAP)
-					@Suppress("DEPRECATION") // TKIP is insecure and has bad performance
+					@Suppress("DEPRECATION") // TKIP is insecure and has bad performance.
 					allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.TKIP)
 					allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.CCMP)
 					allowedGroupCiphers.set(WifiConfiguration.GroupCipher.TKIP)
@@ -292,7 +293,7 @@ object WifiConnector {
 			return this
 		}
 
-		return this.applyCommon(data)?.applySecurity(data)
+		return this.applyCommon(data).applySecurity(data)
 	}
 
 	private inline fun <T> requireSdk(version: Int, block: () -> T): T? {
@@ -300,11 +301,32 @@ object WifiConnector {
 	}
 }
 
-// keep possibility of wrongly unescaped \ by explicitly searching
-// for special chars
+@RequiresApi(Build.VERSION_CODES.Q)
+private fun WifiManager.addNetworkFromBuilder(
+	builder: WifiNetworkSuggestion.Builder
+): Boolean {
+	val suggestion = builder.build()
+	val suggestions = listOf(suggestion)
+	// Remove previous conflicting network suggestion.
+	removeNetworkSuggestions(suggestions)
+	val result = addNetworkSuggestions(suggestions)
+	return result == WifiManager.STATUS_NETWORK_SUGGESTIONS_SUCCESS
+}
+
+// Make sure the string ends with a semicolon.
+private fun String.trimAndTerminate(): String {
+	var trimmed = trim()
+	if (trimmed.isNotEmpty() && trimmed.last() != ';') {
+		trimmed += ";"
+	}
+	return trimmed
+}
+
+// Keep possibility of wrongly unescaped \ by explicitly searching
+// for special chars.
 private val escapedRegex = """\\([\\;,":])""".toRegex()
 private val String.unescape: String
-	get() = this.replace(escapedRegex) { escaped ->
+	get() = replace(escapedRegex) { escaped ->
 		escaped.groupValues[1]
 	}
 
@@ -327,12 +349,12 @@ private fun String.isHex() = length == 64 && matches(hexRegex)
 
 private fun WifiManager.enableWifi(): Boolean {
 	// setWifiEnabled() will always return false for Android Q
-	// because Q doesn't allow apps to enable/disable Wi-Fi anymore
+	// because Q doesn't allow apps to enable/disable Wi-Fi anymore.
 	@Suppress("DEPRECATION")
 	return isWifiEnabled || setWifiEnabled(true)
 }
 
-// WifiConfiguration is deprecated in Android Q
+// WifiConfiguration is deprecated in Android Q.
 @Suppress("DEPRECATION")
 private fun WifiManager.removeOldNetwork(
 	wifiConfig: WifiConfiguration
@@ -345,13 +367,13 @@ private fun WifiManager.removeOldNetwork(
 			removeNetwork(it)
 		}
 	} catch (e: SecurityException) {
-		// the user didn't allow ACCESS_FINE_LOCATION which is
-		// required to access configuredNetworks and that's fine
+		// The user didn't allow ACCESS_FINE_LOCATION which is
+		// required to access configuredNetworks and that's fine.
 	}
 	return true
 }
 
-// WifiConfiguration is deprecated in Android Q
+// WifiConfiguration is deprecated in Android Q.
 @Suppress("DEPRECATION")
 private fun WifiManager.enableNewNetwork(
 	wifiConfig: WifiConfiguration

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

@@ -1,74 +1,73 @@
 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.net.Uri
 import android.os.Bundle
-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 com.google.zxing.ResultPointCallback
 import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.adapter.prettifyFormatName
 import de.markusfisch.android.binaryeye.app.*
-import de.markusfisch.android.binaryeye.database.Scan
-import de.markusfisch.android.binaryeye.graphics.Mapping
-import de.markusfisch.android.binaryeye.graphics.frameToView
-import de.markusfisch.android.binaryeye.graphics.isPortrait
+import de.markusfisch.android.binaryeye.bluetooth.sendBluetoothAsync
+import de.markusfisch.android.binaryeye.content.copyToClipboard
+import de.markusfisch.android.binaryeye.content.execShareIntent
+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.media.releaseToneGenerators
 import de.markusfisch.android.binaryeye.net.sendAsync
-import de.markusfisch.android.binaryeye.rs.Preprocessor
+import de.markusfisch.android.binaryeye.net.urlEncode
+import de.markusfisch.android.binaryeye.view.errorFeedback
+import de.markusfisch.android.binaryeye.view.initSystemBars
+import de.markusfisch.android.binaryeye.view.scanFeedback
 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 de.markusfisch.android.zxingcpp.ZxingCpp
+import de.markusfisch.android.zxingcpp.ZxingCpp.Binarizer
+import de.markusfisch.android.zxingcpp.ZxingCpp.ReaderOptions
+import de.markusfisch.android.zxingcpp.ZxingCpp.BarcodeFormat
+import de.markusfisch.android.zxingcpp.ZxingCpp.Result
 import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.roundToInt
 
 class CameraActivity : AppCompatActivity() {
-	private val zxing = Zxing(ResultPointCallback { point ->
-		point?.let {
-			getMapping()?.map(it)?.let {
-				detectorView.post {
-					detectorView.mark(listOf(it))
-				}
-			}
-		}
-	})
+	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 nativeMapping: Mapping? = null
-	private var rotatedMapping: Mapping? = null
-	private var recreatePreprocessor = false
-	private var rotate = false
-	private var invert = false
-	private var flash = false
+	private var formatsToRead = setOf<BarcodeFormat>()
+	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 = false
+	private var bulkMode = prefs.bulkMode
+	private var restrictFormat: String? = null
 	private var ignoreNext: String? = null
 	private var fallbackBuffer: IntArray? = null
 
@@ -81,8 +80,7 @@ class CameraActivity : AppCompatActivity() {
 			PERMISSION_CAMERA -> if (grantResults.isNotEmpty() &&
 				grantResults[0] != PackageManager.PERMISSION_GRANTED
 			) {
-				toast(R.string.no_camera_no_fun)
-				finish()
+				toast(R.string.camera_error)
 			}
 		}
 	}
@@ -113,12 +111,10 @@ class CameraActivity : AppCompatActivity() {
 		super.onCreate(state)
 		setContentView(R.layout.activity_camera)
 
-		// necessary to get the right translation after setting a custom locale
+		// Necessary to get the right translation after setting a
+		// custom locale.
 		setTitle(R.string.scan_code)
 
-		rs = RenderScript.create(this)
-		vibrator = getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
-
 		initSystemBars(this)
 		setSupportActionBar(findViewById(R.id.toolbar) as Toolbar)
 
@@ -140,26 +136,52 @@ class CameraActivity : AppCompatActivity() {
 
 	override fun onDestroy() {
 		super.onDestroy()
-		resetPreProcessor()
 		fallbackBuffer = null
 		saveZoom()
-		saveCropHandlePos()
-		rs.destroy()
+		detectorView.saveCropHandlePos()
+		releaseToneGenerators()
 	}
 
 	override fun onResume() {
 		super.onResume()
 		System.gc()
-		zxing.updateHints(prefs.tryHarder)
-		returnResult = "com.google.zxing.client.android.SCAN" == intent.action
-		if (hasCameraPermission(this)) {
+		updateHints()
+		if (prefs.bulkMode && bulkMode != prefs.bulkMode) {
+			bulkMode = prefs.bulkMode
+			invalidateOptionsMenu()
+			ignoreNext = null
+		}
+		setReturnTarget(intent)
+		if (hasCameraPermission()) {
 			openCamera()
 		}
 	}
 
-	private fun resetPreProcessor() {
-		preprocessor?.destroy()
-		preprocessor = null
+	private fun updateHints() {
+		val restriction = restrictFormat
+		formatsToRead = if (restriction != null) {
+			title = getString(
+				R.string.scan_format,
+				prettifyFormatName(restriction)
+			)
+			setOf(restriction)
+		} else {
+			setTitle(R.string.scan_code)
+			prefs.barcodeFormats
+		}.toFormatSet()
+	}
+
+	private fun setReturnTarget(intent: Intent?) {
+		when {
+			intent?.action == "com.google.zxing.client.android.SCAN" -> {
+				returnResult = true
+			}
+
+			intent?.dataString?.isReturnUrl() == true -> {
+				finishAfterShowingResult = true
+				returnUrlTemplate = intent.data?.getQueryParameter("ret")
+			}
+		}
 	}
 
 	private fun openCamera() {
@@ -182,8 +204,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) {
@@ -192,6 +212,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) {
@@ -199,12 +220,13 @@ 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)
 	}
 
 	override fun dispatchTouchEvent(ev: MotionEvent): Boolean {
-		// always give crop handle precedence over other controls
-		// because it can easily overlap and would then be inaccessible
+		// Always give crop handle precedence over other controls
+		// because it can easily overlap and would then be inaccessible.
 		if (detectorView.onTouchEvent(ev)) {
 			return true
 		}
@@ -223,39 +245,52 @@ class CameraActivity : AppCompatActivity() {
 				createBarcode()
 				true
 			}
+
 			R.id.history -> {
 				startActivity(MainActivity.getHistoryIntent(this))
 				true
 			}
+
 			R.id.pick_file -> {
-				val chooseFile = Intent(Intent.ACTION_GET_CONTENT)
-				chooseFile.type = "image/*"
 				startActivityForResult(
 					Intent.createChooser(
-						chooseFile,
-						getString(R.string.pick_file)
+						Intent(Intent.ACTION_GET_CONTENT).apply {
+							type = "image/*"
+						},
+						getString(R.string.pick_image_file)
 					),
 					PICK_FILE_RESULT_CODE
 				)
 				true
 			}
+
 			R.id.switch_camera -> {
 				switchCamera()
 				true
 			}
+
 			R.id.bulk_mode -> {
 				bulkMode = bulkMode xor true
 				item.isChecked = bulkMode
+				ignoreNext = null
 				true
 			}
+
+			R.id.restrict_format -> {
+				showRestrictionDialog()
+				true
+			}
+
 			R.id.preferences -> {
 				startActivity(MainActivity.getPreferencesIntent(this))
 				true
 			}
+
 			R.id.info -> {
 				openReadme()
 				true
 			}
+
 			else -> super.onOptionsItemSelected(item)
 		}
 	}
@@ -270,16 +305,33 @@ 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,
 			Uri.parse(getString(R.string.project_url))
 		)
-		if (intent.resolveActivity(packageManager) != null) {
-			startActivity(intent)
-		} else {
-			toast(R.string.project_url)
-		}
+		execShareIntent(intent)
 	}
 
 	private fun handleSendText(intent: Intent) {
@@ -307,6 +359,7 @@ class CameraActivity : AppCompatActivity() {
 						progress = zoomBar.progress
 						return true
 					}
+
 					MotionEvent.ACTION_MOVE -> {
 						if (prefs.zoomBySwiping) {
 							v ?: return false
@@ -320,9 +373,10 @@ class CameraActivity : AppCompatActivity() {
 							return true
 						}
 					}
+
 					MotionEvent.ACTION_UP -> {
-						// stop calling focusTo() as soon as it returns false
-						// to avoid throwing and catching future exceptions
+						// Stop calling focusTo() as soon as it returns false
+						// to avoid throwing and catching future exceptions.
 						if (focus) {
 							focus = cameraView.focusTo(v, event.x, event.y)
 							if (focus) {
@@ -340,7 +394,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
@@ -348,8 +402,9 @@ class CameraActivity : AppCompatActivity() {
 						saveZoom()
 					}
 					parameters.zoom = zoomBar.progress
+					View.VISIBLE
 				} else {
-					zoomBar.visibility = View.GONE
+					View.GONE
 				}
 				val sceneModes = parameters.supportedSceneModes
 				sceneModes?.let {
@@ -366,27 +421,48 @@ class CameraActivity : AppCompatActivity() {
 
 			override fun onCameraError() {
 				this@CameraActivity.toast(R.string.camera_error)
-				finish()
 			}
 
 			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
+				// These settings can't change while the camera is open.
+				val options = ReaderOptions(
+					tryHarder = prefs.tryHarder,
+					tryRotate = prefs.autoRotate,
+					tryInvert = true,
+					tryDownscale = true,
+					maxNumberOfSymbols = 1
+				)
+				var useLocalAverage = false
 				camera.setPreviewCallback { frameData, _ ->
 					if (decoding) {
-						decodeFrame(
+						useLocalAverage = useLocalAverage xor true
+						ZxingCpp.readByteArray(
 							frameData,
-							frameWidth,
-							frameHeight,
-							frameOrientation
-						)?.let { result ->
+							frameMetrics.width,
+							frameRoi.left, frameRoi.top,
+							frameRoi.width(), frameRoi.height(),
+							frameMetrics.orientation,
+							options.apply {
+								// By default, ZXing uses LOCAL_AVERAGE, but
+								// this does not work well with inverted
+								// barcodes on low-contrast backgrounds.
+								binarizer = if (useLocalAverage) {
+									Binarizer.LOCAL_AVERAGE
+								} else {
+									Binarizer.GLOBAL_HISTOGRAM
+								}
+								formats = formatsToRead
+							}
+						)?.let { results ->
+							val result = results.first()
 							if (result.text != ignoreNext) {
 								postResult(result)
 								decoding = false
@@ -413,7 +489,7 @@ class CameraActivity : AppCompatActivity() {
 				progress: Int,
 				fromUser: Boolean
 			) {
-				setZoom(progress)
+				cameraView.camera?.setZoom(progress)
 			}
 
 			override fun onStartTrackingTouch(seekBar: SeekBar) {}
@@ -424,16 +500,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.
 		}
 	}
 
@@ -458,25 +531,21 @@ class CameraActivity : AppCompatActivity() {
 		}
 		detectorView.onRoiChanged = {
 			decoding = true
-			recreatePreprocessor = true
+			updateFrameRoiAndMappingMatrix()
 		}
 		detectorView.setPaddingFromWindowInsets()
-		restoreCropHandlePos()
+		detectorView.restoreCropHandlePos()
 	}
 
-	private fun saveCropHandlePos() {
-		val pos = detectorView.getCropHandlePos()
-		prefs.cropHandleX = pos.x
-		prefs.cropHandleY = pos.y
-		prefs.cropHandleOrientation = detectorView.currentOrientation
-	}
-
-	private fun restoreCropHandlePos() {
-		detectorView.setCropHandlePos(
-			prefs.cropHandleX,
-			prefs.cropHandleY,
-			prefs.cropHandleOrientation
-		)
+	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) {
@@ -491,265 +560,173 @@ 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
-		}
-		nativeMapping = frameToView(
-			pp.outWidth,
-			pp.outHeight,
-			frameOrientation,
-			viewRect
-		)
-		rotatedMapping = frameToView(
-			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
-			if (isPortrait(frameOrientation)) {
-				Rect(
-					(normalizedRoi.top * frameWidth.toFloat()).roundToInt(),
-					(normalizedRoi.left * frameHeight.toFloat()).roundToInt(),
-					(normalizedRoi.bottom * frameWidth.toFloat()).roundToInt(),
-					(normalizedRoi.right * frameHeight.toFloat()).roundToInt()
-				)
-			} else {
-				Rect(
-					(normalizedRoi.left * frameWidth.toFloat()).roundToInt(),
-					(normalizedRoi.top * frameHeight.toFloat()).roundToInt(),
-					(normalizedRoi.right * frameWidth.toFloat()).roundToInt(),
-					(normalizedRoi.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 mapping for the current rotate value
-		val mapping = getMapping()
 		cameraView.post {
-			val rp = result.resultPoints
-			if (mapping != null && rp != null && rp.isNotEmpty()) {
-				detectorView.mark(mapping.map(rp))
-			}
-			vibrator.vibrate()
-			showResult(
-				this@CameraActivity,
-				result,
-				returnResult,
-				bulkMode
+			detectorView.update(
+				matrix.mapPosition(
+					result.position,
+					detectorView.coordinates
+				)
 			)
+			scanFeedback()
+			val returnUri = returnUrlTemplate?.let {
+				try {
+					completeUrl(it, result)
+				} catch (e: Exception) {
+					e.message?.let { message ->
+						toast(message)
+					}
+					null
+				}
+			}
+			when {
+				returnResult -> {
+					setResult(Activity.RESULT_OK, getReturnIntent(result))
+					finish()
+				}
+
+				returnUri != null -> execShareIntent(
+					Intent(Intent.ACTION_VIEW, returnUri)
+				)
+
+				else -> {
+					showResult(result, 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
-				toast(result.text)
+				if (prefs.ignoreConsecutiveDuplicates) {
+					ignoreNext = result.text
+				}
+				if (prefs.showToastInBulkMode) {
+					toast(result.text)
+				}
 				detectorView.postDelayed({
 					decoding = true
-				}, 500)
+				}, prefs.bulkModeDelay.toLong())
 			}
 		}
 	}
 
-	private fun getMapping() = if (rotate) rotatedMapping else nativeMapping
-
 	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 showResult(
-	activity: Activity,
+fun Set<String>.toFormatSet(): Set<BarcodeFormat> = map {
+	BarcodeFormat.valueOf(it)
+}.toSet()
+
+fun Activity.showResult(
 	result: Result,
-	isResult: Boolean = false,
-	bulkMode: Boolean = false
+	bulkMode: Boolean = false,
 ) {
-	if (isResult) {
-		activity.setResult(Activity.RESULT_OK, getReturnIntent(result))
-		activity.finish()
-		return
-	}
 	if (prefs.copyImmediately) {
-		activity.copyToClipboard(result.text)
-	}
-	val scan = Scan(result)
-	if (prefs.sendScanUrl.isNotEmpty()) {
-		scan.sendAsync(
-			activity.applicationContext,
-			prefs.sendScanUrl,
-			prefs.sendScanType
-		)
+		copyToClipboard(result.text)
 	}
+	val scan = result.toScan()
 	if (prefs.useHistory) {
 		scan.id = db.insertScan(scan)
 	}
+	if (prefs.sendScanActive && prefs.sendScanUrl.isNotEmpty()) {
+		if (prefs.sendScanType == "4") {
+			openUrl(
+				prefs.sendScanUrl + scan.content.urlEncode()
+			)
+			return
+		}
+		scan.sendAsync(
+			prefs.sendScanUrl,
+			prefs.sendScanType
+		) { code, body ->
+			if (code == null || code < 200 || code > 299) {
+				errorFeedback()
+			}
+			if (body != null && body.isNotEmpty()) {
+				toast(body)
+			} else if (code == null || code > 299) {
+				toast(R.string.background_request_failed)
+			}
+		}
+	}
+	if (prefs.sendScanBluetooth &&
+		prefs.sendScanBluetoothHost.isNotEmpty() &&
+		hasBluetoothPermission()
+	) {
+		scan.sendBluetoothAsync(
+			prefs.sendScanBluetoothHost
+		) { connected, sent ->
+			toast(
+				when {
+					!connected -> {
+						errorFeedback()
+						R.string.bluetooth_connect_fail
+					}
+
+					!sent -> {
+						errorFeedback()
+						R.string.bluetooth_send_fail
+					}
+
+					else -> R.string.bluetooth_send_success
+				}
+			)
+		}
+	}
 	if (!bulkMode) {
-		activity.startActivity(
-			MainActivity.getDecodeIntent(activity, scan)
+		startActivity(
+			MainActivity.getDecodeIntent(this, scan)
 		)
 	}
 }
 
-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 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}", result.text.urlEncode())
+		.replace("{RESULT_BYTES}", result.rawBytes.toHexString())
+		.replace("{FORMAT}", result.format.name.urlEncode())
+		// And support {CODE} from the old ZXing app, too.
+		.replace("{CODE}", result.text.urlEncode())
+)

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

@@ -2,15 +2,17 @@ package de.markusfisch.android.binaryeye.activity
 
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.Toolbar
 import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.app.PERMISSION_LOCATION
+import de.markusfisch.android.binaryeye.app.PERMISSION_WRITE
 import de.markusfisch.android.binaryeye.app.applyLocale
-import de.markusfisch.android.binaryeye.app.colorSystemAndToolBars
-import de.markusfisch.android.binaryeye.app.initSystemBars
+import de.markusfisch.android.binaryeye.app.permissionGrantedCallback
 import de.markusfisch.android.binaryeye.app.prefs
 import de.markusfisch.android.binaryeye.app.setFragment
 import de.markusfisch.android.binaryeye.database.Scan
@@ -18,9 +20,26 @@ import de.markusfisch.android.binaryeye.fragment.DecodeFragment
 import de.markusfisch.android.binaryeye.fragment.EncodeFragment
 import de.markusfisch.android.binaryeye.fragment.HistoryFragment
 import de.markusfisch.android.binaryeye.fragment.PreferencesFragment
+import de.markusfisch.android.binaryeye.view.colorSystemAndToolBars
+import de.markusfisch.android.binaryeye.view.initSystemBars
 import de.markusfisch.android.binaryeye.view.recordToolbarHeight
 
 class MainActivity : AppCompatActivity() {
+	override fun onRequestPermissionsResult(
+		requestCode: Int,
+		permissions: Array<String>,
+		grantResults: IntArray
+	) {
+		when (requestCode) {
+			PERMISSION_LOCATION, PERMISSION_WRITE -> if (grantResults.isNotEmpty() &&
+				grantResults[0] == PackageManager.PERMISSION_GRANTED
+			) {
+				permissionGrantedCallback?.invoke()
+				permissionGrantedCallback = null
+			}
+		}
+	}
+
 	override fun onSupportNavigateUp(): Boolean {
 		val fm = supportFragmentManager
 		if (fm != null && fm.backStackEntryCount > 0) {
@@ -51,7 +70,7 @@ class MainActivity : AppCompatActivity() {
 		}
 
 		if (state == null) {
-			setFragment(supportFragmentManager, getFragmentForIntent(intent))
+			supportFragmentManager?.setFragment(getFragmentForIntent(intent))
 		}
 	}
 
@@ -59,7 +78,7 @@ class MainActivity : AppCompatActivity() {
 		private const val PREFERENCES = "preferences"
 		private const val HISTORY = "history"
 		private const val ENCODE = "encode"
-		private const val DECODED = "decoded"
+		const val DECODED = "decoded"
 
 		private fun getFragmentForIntent(intent: Intent?): Fragment {
 			intent ?: return PreferencesFragment()
@@ -67,11 +86,13 @@ class MainActivity : AppCompatActivity() {
 				intent.hasExtra(PREFERENCES) -> PreferencesFragment()
 				intent.hasExtra(HISTORY) -> HistoryFragment()
 				intent.hasExtra(ENCODE) -> EncodeFragment.newInstance(
-					intent.getStringExtra(ENCODE)!!
+					intent.getStringExtra(ENCODE)
 				)
+
 				intent.hasExtra(DECODED) -> DecodeFragment.newInstance(
 					intent.getParcelableExtra(DECODED)!!
 				)
+
 				else -> PreferencesFragment()
 			}
 		}

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

@@ -3,42 +3,61 @@ 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
 import android.os.Bundle
 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.mapResult
-import de.markusfisch.android.binaryeye.rs.fixTransparency
+import de.markusfisch.android.binaryeye.graphics.mapPosition
+import de.markusfisch.android.binaryeye.media.releaseToneGenerators
+import de.markusfisch.android.binaryeye.view.colorSystemAndToolBars
+import de.markusfisch.android.binaryeye.view.initSystemBars
 import de.markusfisch.android.binaryeye.view.recordToolbarHeight
+import de.markusfisch.android.binaryeye.view.scanFeedback
 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 de.markusfisch.android.zxingcpp.ZxingCpp
+import de.markusfisch.android.zxingcpp.ZxingCpp.Binarizer
+import de.markusfisch.android.zxingcpp.ZxingCpp.ReaderOptions
+import de.markusfisch.android.zxingcpp.ZxingCpp.Result
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+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 val options = ReaderOptions(
+		tryHarder = true,
+		tryRotate = true,
+		tryInvert = true,
+		tryDownscale = true,
+		maxNumberOfSymbols = 1,
+		formats = prefs.barcodeFormats.toFormatSet()
+	)
 
-	private lateinit var rs: RenderScript
-	private lateinit var vibrator: Vibrator
 	private lateinit var cropImageView: CropImageView
 	private lateinit var detectorView: DetectorView
+	private lateinit var freeRotationItem: MenuItem
 
 	private var result: Result? = null
 
@@ -51,13 +70,10 @@ class PickActivity : AppCompatActivity() {
 		super.onCreate(state)
 		setContentView(R.layout.activity_pick)
 
-		// necessary to get the right translation after setting a custom locale
+		// Necessary to get the right translation after setting a custom
+		// locale.
 		setTitle(R.string.pick_code_to_scan)
 
-		zxing.updateHints(true)
-		rs = RenderScript.create(this)
-		vibrator = getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
-
 		initSystemBars(this)
 		val toolbar = findViewById(R.id.toolbar) as Toolbar
 		recordToolbarHeight(toolbar)
@@ -67,11 +83,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()
@@ -80,6 +92,7 @@ class PickActivity : AppCompatActivity() {
 
 		cropImageView = findViewById(R.id.image) as CropImageView
 		cropImageView.restrictTranslation = false
+		cropImageView.freeRotation = prefs.freeRotation
 		cropImageView.setImageBitmap(bitmap)
 		cropImageView.onScan = {
 			scanWithinBounds(bitmap)
@@ -90,6 +103,7 @@ class PickActivity : AppCompatActivity() {
 			scanWithinBounds(bitmap)
 		}
 		detectorView.setPaddingFromWindowInsets()
+		detectorView.restoreCropHandlePos()
 
 		findViewById(R.id.scan).setOnClickListener {
 			showResult()
@@ -111,36 +125,46 @@ 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 {
+			cropped.decode()?.first()?.let {
 				withContext(Dispatchers.Main) {
-					if (!isFinishing) {
-						vibrator.vibrate()
+					if (isFinishing) {
+						return@withContext
 					}
-					val rc = Rect()
-					imageRect.round(rc)
-					rectInView.intersect(rc)
-					detectorView.mark(
-						mapResult(
-							cropped.width,
-							cropped.height,
-							0,
-							rectInView,
-							it
+					result = it
+					scanFeedback()
+					detectorView.update(
+						matrix.mapPosition(
+							it.position,
+							detectorView.coordinates
 						)
 					)
 				}
@@ -148,13 +172,38 @@ class PickActivity : AppCompatActivity() {
 		}
 	}
 
+	// By default, ZXing uses LOCAL_AVERAGE, but this does not work
+	// well with inverted barcodes on low-contrast backgrounds.
+	private fun Bitmap.decode() = ZxingCpp.readBitmap(
+		this,
+		0, 0,
+		width, height,
+		0,
+		options.apply {
+			binarizer = Binarizer.LOCAL_AVERAGE
+		}
+	) ?: ZxingCpp.readBitmap(
+		this,
+		0, 0,
+		width, height,
+		0,
+		options.apply {
+			binarizer = Binarizer.GLOBAL_HISTOGRAM
+		}
+	)
+
 	override fun onDestroy() {
 		super.onDestroy()
-		rs.destroy()
+		detectorView.saveCropHandlePos()
+		parentJob.cancel()
+		releaseToneGenerators()
 	}
 
 	override fun onCreateOptionsMenu(menu: Menu): Boolean {
 		menuInflater.inflate(R.menu.activity_pick, menu)
+		freeRotationItem = menu.findItem(R.id.toggle_free).apply {
+			updateFreeRotationIcon()
+		}
 		return true
 	}
 
@@ -164,10 +213,28 @@ class PickActivity : AppCompatActivity() {
 				rotateClockwise()
 				true
 			}
+
+			R.id.toggle_free -> {
+				prefs.freeRotation = prefs.freeRotation xor true
+				cropImageView.freeRotation = prefs.freeRotation
+				freeRotationItem.updateFreeRotationIcon()
+				true
+			}
+
 			else -> super.onOptionsItemSelected(item)
 		}
 	}
 
+	private fun MenuItem.updateFreeRotationIcon() {
+		setIcon(
+			if (prefs.freeRotation) {
+				R.drawable.ic_action_rotation_unlocked
+			} else {
+				R.drawable.ic_action_rotation_locked
+			}
+		)
+	}
+
 	private fun rotateClockwise() {
 		cropImageView.imageRotation = cropImageView.imageRotation + 90 % 360
 	}
@@ -176,25 +243,26 @@ 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() {
-		result?.let {
-			showResult(this, it)
+		val r = result
+		if (r != null) {
+			showResult(r)
 			finish()
-			return
+		} else {
+			applicationContext.toast(R.string.no_barcode_found)
 		}
-		applicationContext.toast(R.string.no_barcode_found)
 	}
 }
 
-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,17 +3,15 @@ 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?) {
 		super.onCreate(state)
 
-		// it's important _not_ to inflate a layout file here
+		// It's important _not_ to inflate a layout file here
 		// because that would happen after the app is fully
-		// initialized what is too late
+		// 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
@@ -9,39 +10,72 @@ import android.widget.CursorAdapter
 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.Locale
 
 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,
@@ -55,38 +89,47 @@ class ScansAdapter(context: Context, cursor: Cursor) :
 		context: Context,
 		cursor: Cursor
 	) {
-		val holder = getViewHolder(view)
-		holder.timeView.text = 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.isNullOrEmpty() -> 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 = 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(
@@ -95,3 +138,19 @@ class ScansAdapter(context: Context, cursor: Cursor) :
 		val formatView: TextView
 	)
 }
+
+fun prettifyFormatName(format: String) = format.replace("_", " ")
+
+private fun formatDateTime(rfc: String): String {
+	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
@@ -11,7 +11,7 @@ suspend inline fun <T : Any> alertDialog(
 	context: Context,
 	crossinline build: AlertDialog.Builder.(resume: (T?) -> Unit) -> Unit
 ): T? = withContext(Dispatchers.Main) {
-	suspendCoroutine<T?> { continuation ->
+	suspendCoroutine { continuation ->
 		AlertDialog.Builder(context).apply {
 			setOnCancelListener {
 				continuation.resume(null)

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/Clipboard.kt

@@ -1,17 +0,0 @@
-package de.markusfisch.android.binaryeye.app
-
-import android.content.ClipData
-import android.content.Context
-import android.os.Build
-
-fun Context.copyToClipboard(text: String) {
-	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)
-		)
-	}
-}

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

@@ -1,20 +0,0 @@
-package de.markusfisch.android.binaryeye.app
-
-import android.annotation.SuppressLint
-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 addFragment(fm: FragmentManager?, fragment: Fragment) {
-	fm?.let { getTransaction(fm, fragment).addToBackStack(null).commit() }
-}
-
-@SuppressLint("CommitTransaction")
-private fun getTransaction(
-	fm: FragmentManager,
-	fragment: Fragment
-) = fm.beginTransaction().replace(R.id.content_frame, fragment)

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

@@ -0,0 +1,19 @@
+package de.markusfisch.android.binaryeye.app
+
+import android.annotation.SuppressLint
+import android.support.v4.app.Fragment
+import android.support.v4.app.FragmentManager
+import de.markusfisch.android.binaryeye.R
+
+fun FragmentManager.setFragment(fragment: Fragment) {
+	getTransaction(fragment).commit()
+}
+
+fun FragmentManager.addFragment(fragment: Fragment) {
+	getTransaction(fragment).addToBackStack(null).commit()
+}
+
+@SuppressLint("CommitTransaction")
+private fun FragmentManager.getTransaction(
+	fragment: Fragment
+) = beginTransaction().replace(R.id.content_frame, fragment)

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

@@ -5,16 +5,22 @@ import android.os.Build
 import java.util.*
 
 fun Context.applyLocale(localeName: String) {
-	if (localeName.isNotEmpty()) {
-		val locale = Locale(localeName)
-		Locale.setDefault(locale)
-		val conf = resources.configuration
-		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
-			@Suppress("DEPRECATION")
-			conf.locale = locale
-		} else {
-			conf.setLocale(locale)
-		}
-		resources.updateConfiguration(conf, resources.displayMetrics)
+	if (localeName.isEmpty()) {
+		return
 	}
+	val localeParts = localeName.split("-")
+	val locale = if (localeParts.size == 2) {
+		Locale(localeParts[0], localeParts[1])
+	} else {
+		Locale(localeName)
+	}
+	Locale.setDefault(locale)
+	val conf = resources.configuration
+	if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+		@Suppress("DEPRECATION")
+		conf.locale = locale
+	} else {
+		conf.setLocale(locale)
+	}
+	resources.updateConfiguration(conf, resources.displayMetrics)
 }

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

@@ -3,47 +3,58 @@ package de.markusfisch.android.binaryeye.app
 import android.Manifest
 import android.app.Activity
 import android.content.pm.PackageManager
+import android.os.Build
 import android.support.v4.app.ActivityCompat
 import android.support.v4.content.ContextCompat
 
+var permissionGrantedCallback: (() -> Any)? = null
+
 const val PERMISSION_CAMERA = 1
-fun hasCameraPermission(activity: Activity): Boolean {
-	return hasPermission(
-		activity,
-		Manifest.permission.CAMERA,
-		PERMISSION_CAMERA
-	)
-}
+fun Activity.hasCameraPermission() = hasPermission(
+	Manifest.permission.CAMERA,
+	PERMISSION_CAMERA
+)
 
 const val PERMISSION_WRITE = 2
-fun hasWritePermission(activity: Activity): 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): Boolean {
+fun Activity.hasLocationPermission(callback: () -> Any): Boolean {
+	permissionGrantedCallback = callback
 	return hasPermission(
-		activity,
 		Manifest.permission.ACCESS_FINE_LOCATION,
 		PERMISSION_LOCATION
 	)
 }
 
-private fun hasPermission(
-	activity: Activity,
+const val PERMISSION_BLUETOOTH = 4
+fun Activity.hasBluetoothPermission() = if (
+	Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
+) {
+	hasPermission(
+		Manifest.permission.BLUETOOTH_CONNECT,
+		PERMISSION_BLUETOOTH
+	)
+} else {
+	false
+}
+
+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/app/Share.kt

@@ -1,52 +0,0 @@
-package de.markusfisch.android.binaryeye.app
-
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
-import android.support.v4.content.FileProvider
-import de.markusfisch.android.binaryeye.BuildConfig
-import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.widget.toast
-import java.io.File
-
-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
-	execShareIntent(context, intent)
-}
-
-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
-	execShareIntent(context, intent)
-}
-
-fun execShareIntent(context: Context, intent: Intent) {
-	if (intent.resolveActivity(context.packageManager) != null) {
-		context.startActivity(intent)
-	} else {
-		context.toast(R.string.cannot_resolve_action)
-	}
-}
-
-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)
-	} else {
-		FileProvider.getUriForFile(
-			context,
-			BuildConfig.APPLICATION_ID + ".provider",
-			file
-		)
-	}
-}

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

@@ -1,24 +0,0 @@
-package de.markusfisch.android.binaryeye.app
-
-import android.os.Build
-import android.os.VibrationEffect
-import android.os.Vibrator
-
-private const val MILLISECONDS = 100L
-
-fun Vibrator.vibrate() {
-	if (!prefs.vibrate) {
-		return
-	}
-	if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-		@Suppress("DEPRECATION")
-		this.vibrate(MILLISECONDS)
-	} else {
-		this.vibrate(
-			VibrationEffect.createOneShot(
-				MILLISECONDS,
-				VibrationEffect.DEFAULT_AMPLITUDE
-			)
-		)
-	}
-}

app/src/main/kotlin/de/markusfisch/android/binaryeye/bluetooth/BluetoothSender.kt

@@ -0,0 +1,116 @@
+package de.markusfisch.android.binaryeye.bluetooth
+
+import android.bluetooth.BluetoothAdapter
+import android.bluetooth.BluetoothDevice
+import android.bluetooth.BluetoothSocket
+import android.support.v7.preference.ListPreference
+import de.markusfisch.android.binaryeye.database.Scan
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.io.IOException
+import java.io.OutputStreamWriter
+import java.util.UUID
+
+fun Scan.sendBluetoothAsync(
+	host: String,
+	callback: (Boolean, Boolean) -> Unit
+) {
+	CoroutineScope(Dispatchers.IO).launch(Dispatchers.IO) {
+		val connected = if (isConnected) {
+			true
+		} else {
+			connect(host)
+		}
+		val sent = if (connected) {
+			send(content)
+		} else {
+			false
+		}
+		withContext(Dispatchers.Main) {
+			callback(connected, sent)
+		}
+	}
+}
+
+fun setBluetoothHosts(listPref: ListPreference) {
+	val devices = try {
+		BluetoothAdapter.getDefaultAdapter().bondedDevices
+	} catch (e: SecurityException) {
+		// Do nothing, either the user has denied Bluetooth access
+		// or the permission was removed by the system. We're catching
+		// the exception to keep the app from crashing.
+		null
+	} ?: return
+	listPref.entries = devices.map {
+		it.name
+	}.toTypedArray()
+	listPref.entryValues = devices.map {
+		it.address
+	}.toTypedArray()
+	listPref.callChangeListener(listPref.value)
+}
+
+private var socket: BluetoothSocket? = null
+private var writer: OutputStreamWriter? = null
+
+private val blue = BluetoothAdapter.getDefaultAdapter()
+private val uuid = UUID.fromString(
+	"8a8478c9-2ca8-404b-a0de-101f34ab71ae"
+)
+
+private var isConnected = false
+
+private fun connect(deviceName: String): Boolean = try {
+	val device = findByName(deviceName) ?: throw RuntimeException(
+		"Bluetooth device not found"
+	)
+	socket = device.createRfcommSocketToServiceRecord(uuid)
+	socket?.connect()
+	writer = socket?.outputStream?.writer()
+	isConnected = true
+	true
+} catch (e: Exception) {
+	close()
+	false
+}
+
+private fun send(message: String): Boolean = try {
+	writer?.apply {
+		write(message)
+		write("\n")
+		flush()
+	}
+	true
+} catch (e: Exception) {
+	close()
+	false
+}
+
+private fun close() {
+	try {
+		writer?.close()
+	} catch (e: IOException) {
+		// Catch exception if writer wasn't initialized.
+	}
+	try {
+		socket?.close()
+	} catch (e: IOException) {
+		// Nothing we can do about this but keep
+		// the app from crashing.
+	}
+	writer = null
+	socket = null
+	isConnected = false
+}
+
+private fun findByName(findableName: String): BluetoothDevice? {
+	val deviceList = blue.bondedDevices
+	for (device in deviceList) {
+		if (device.address == findableName) {
+			return device
+		}
+	}
+	return null
+}

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

@@ -0,0 +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, 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).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

@@ -0,0 +1,126 @@
+package de.markusfisch.android.binaryeye.content
+
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.support.v4.content.FileProvider
+import de.markusfisch.android.binaryeye.BuildConfig
+import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.widget.toast
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
+
+fun Context.execShareIntent(intent: Intent): Boolean = if (
+	!startIntent(intent)
+) {
+	toast(R.string.cannot_resolve_action)
+	false
+} else {
+	true
+}
+
+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
+	// to list that package/intent in a `<queries>` block in the
+	// Manifest. But since we used `resolveActivity()` only to avoid
+	// an exception if the Intent cannot be resolved, it's much easier
+	// and more robust to just try and catch that exception if
+	// necessary.
+	startActivity(intent)
+	true
+} catch (e: ActivityNotFoundException) {
+	false
+}
+
+fun Context.openUrl(url: String, silent: Boolean = false): Boolean {
+	val intent = Intent(Intent.ACTION_VIEW, url.parseAndNormalizeUri())
+	return if (silent) {
+		startIntent(intent)
+	} else {
+		execShareIntent(intent)
+	}
+}
+
+fun String.parseAndNormalizeUri(): Uri = Uri.parse(this).let {
+	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+		it.normalizeScheme()
+	} else {
+		it
+	}
+}
+
+fun Context.shareText(text: String, mimeType: String = "text/plain") {
+	execShareIntent(Intent(Intent.ACTION_SEND).apply {
+		putExtra(Intent.EXTRA_TEXT, text)
+		type = mimeType
+	})
+}
+
+private var lastShareFile: File? = null
+fun wipeLastShareFile() {
+	lastShareFile?.let {
+		it.delete()
+		lastShareFile = null
+	}
+}
+
+fun <T> Context.shareAsFile(content: T, fileName: String) {
+	val (bytes, mimeType) = when (content) {
+		is ByteArray -> Pair(
+			content,
+			"text/plain"
+		)
+
+		is String -> Pair(
+			content.toByteArray(),
+			"application/octet-stream"
+		)
+
+		else -> throw IllegalArgumentException(
+			"Unsupported content text for shareAsFile()"
+		)
+	}
+	wipeLastShareFile()
+	val file = File(externalCacheDir, fileName)
+	try {
+		FileOutputStream(file).use {
+			it.write(bytes)
+		}
+	} catch (e: IOException) {
+		toast(R.string.error_saving_file)
+		return
+	}
+	lastShareFile = file
+	shareFile(file, 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.app.writeExternalFile
+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,
+		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)
@@ -87,6 +87,8 @@ private fun Cursor.toCsvRecord(
 	return sb.toString().toByteArray()
 }
 
-private fun String.quoteAndEscape() = "\"${this
-	.replace("\n", " ")
-	.replace("\"", "\"\"")}\""
+private fun String.quoteAndEscape() = "\"${
+	this
+		.replace("\n", " ")
+		.replace("\"", "\"\"")
+}\""

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,8 +5,8 @@ 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
+import de.markusfisch.android.zxingcpp.ZxingCpp.BarcodeFormat
 
 class Database {
 	private lateinit var db: SQLiteDatabase
@@ -25,7 +25,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 +37,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,
+			$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(
@@ -69,6 +70,29 @@ class Database {
 		null
 	}
 
+	fun getScansDetailed(ids: LongArray): Cursor? = db.rawQuery(
+		"""SELECT
+			$SCANS_ID,
+			$SCANS_DATETIME,
+			$SCANS_NAME,
+			$SCANS_CONTENT,
+			$SCANS_RAW,
+			$SCANS_FORMAT,
+			$SCANS_ERROR_CORRECTION_LEVEL,
+			$SCANS_VERSION,
+			$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 IN (?)
+			ORDER BY $SCANS_DATETIME DESC
+		""".trimMargin(), arrayOf(ids.joinToString(","))
+	)
+
 	fun getScan(id: Long): Scan? = db.rawQuery(
 		"""SELECT
 			$SCANS_ID,
@@ -78,30 +102,32 @@ 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,
+			$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(
 				it.getString(SCANS_CONTENT),
 				it.getBlob(SCANS_RAW),
-				it.getString(SCANS_FORMAT),
+				BarcodeFormat.valueOf(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.getString(SCANS_VERSION),
+				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 +136,46 @@ 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)
+			put(SCANS_CONTENT, scan.content)
+			if (scan.raw != null) {
+				put(SCANS_RAW, scan.raw)
+			}
+			put(SCANS_FORMAT, scan.format.name)
+			scan.errorCorrectionLevel?.let {
+				put(SCANS_ERROR_CORRECTION_LEVEL, it)
+			}
+			put(SCANS_VERSION, scan.version)
+			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,
+					get(SCANS_RAW) as ByteArray?,
+					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
+		format: BarcodeFormat
+	): Long = db.rawQuery(
+		"""SELECT
 				$SCANS_ID,
 				$SCANS_CONTENT,
 				$SCANS_RAW,
@@ -158,21 +183,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.name
+		) {
+			it.getLong(SCANS_ID)
+		} else {
+			0L
+		}
+	} ?: 0L
 
 	fun removeScan(id: Long) {
 		db.delete(SCANS, "$SCANS_ID = ?", arrayOf("$id"))
@@ -189,9 +213,9 @@ class Database {
 	}
 
 	private class OpenHelper(context: Context) :
-		SQLiteOpenHelper(context, FILE_NAME, null, 4) {
+		SQLiteOpenHelper(context, FILE_NAME, null, 6) {
 		override fun onCreate(db: SQLiteDatabase) {
-			createScans(db)
+			db.createScans()
 		}
 
 		override fun onUpgrade(
@@ -200,13 +224,19 @@ class Database {
 			newVersion: Int
 		) {
 			if (oldVersion < 2) {
-				addRawColumn(db)
+				db.addRawColumn()
 			}
 			if (oldVersion < 3) {
-				addMetaDataColumns(db)
+				db.addMetaDataColumns()
 			}
 			if (oldVersion < 4) {
-				addNameColumn(db)
+				db.addNameColumn()
+			}
+			if (oldVersion < 5) {
+				db.migrateToZxingCpp()
+			}
+			if (oldVersion < 6) {
+				db.migrateToVersionString()
 			}
 		}
 	}
@@ -221,6 +251,8 @@ 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_VERSION = "version"
 		const val SCANS_ISSUE_NUMBER = "issue_number"
 		const val SCANS_ORIENTATION = "orientation"
 		const val SCANS_OTHER_META_DATA = "other_meta_data"
@@ -228,10 +260,17 @@ 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(
+		private fun SQLiteDatabase.createScans() {
+			execSQL("DROP TABLE IF EXISTS $SCANS".trimMargin())
+			execSQL(
 				"""CREATE TABLE $SCANS (
 					$SCANS_ID INTEGER PRIMARY KEY AUTOINCREMENT,
 					$SCANS_DATETIME DATETIME NOT NULL,
@@ -240,46 +279,57 @@ 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 TEXT,
+					$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")
+		private fun SQLiteDatabase.addRawColumn() {
+			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")
+		private fun SQLiteDatabase.addMetaDataColumns() {
+			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")
+		private fun SQLiteDatabase.addNameColumn() {
+			execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_NAME TEXT".trimMargin())
+		}
+
+		private fun SQLiteDatabase.migrateToZxingCpp() {
+			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 SQLiteDatabase.migrateToVersionString() {
+			execSQL("ALTER TABLE $SCANS ADD $SCANS_VERSION TEXT")
+			execSQL("UPDATE $SCANS SET $SCANS_VERSION = $SCANS_VERSION_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

@@ -2,20 +2,19 @@ package de.markusfisch.android.binaryeye.database
 
 import android.app.Activity
 import android.os.Environment
-import de.markusfisch.android.binaryeye.app.writeExternalFile
+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.app.writeExternalFile
+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,
+		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.BarcodeFormat
+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 format: BarcodeFormat,
+	val errorCorrectionLevel: String? = null,
+	val version: String? = null,
+	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
+				version == other.version &&
+				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 + version.hashCode()
+		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),
-		format = parcel.readString() ?: "",
+		raw = parcel.readSizedByteArray(),
+		format = BarcodeFormat.valueOf(parcel.readString() ?: ""),
 		errorCorrectionLevel = parcel.readString(),
+		version = parcel.readString(),
+		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.name)
+			writeString(errorCorrectionLevel)
+			writeString(version)
+			writeInt(sequenceSize)
+			writeInt(sequenceIndex)
+			writeString(sequenceId)
+			writeString(country)
+			writeString(addOn)
+			writeString(price)
+			writeString(issueNumber)
+			writeString(dateTime)
+			writeLong(id)
+		}
 	}
 
 	override fun describeContents() = 0
@@ -125,43 +122,86 @@ data class Scan(
 	}
 }
 
-private fun getDateTime(time: Long = System.currentTimeMillis()) = DateFormat.format(
-	"yyyy-MM-dd HH:mm:ss",
+fun Result.toScan(): Scan {
+	return Scan(
+		when (contentType) {
+			ContentType.GS1,
+			ContentType.ISO15434,
+			ContentType.TEXT -> text
+
+			else -> ""
+		},
+		rawBytes,
+		format,
+		ecLevel,
+		version,
+		sequenceSize,
+		sequenceIndex,
+		sequenceId,
+		gtin?.country,
+		gtin?.addOn,
+		gtin?.price,
+		gtin?.issueNumber
+	)
+}
+
+data class Recreation(
+	val format: BarcodeFormat,
+	val ecLevel: Int,
+	val size: Int,
+	val margin: Int
+) {
+	fun <T> encode(content: T): Bitmap? = try {
+		ZxingCpp.encodeAsBitmap(
+			content, format, size, size, margin, ecLevel
+		)
+	} catch (_: RuntimeException) {
+		null
+	}
+}
+
+fun Scan.toRecreation(
+	size: Int = 128,
+	margin: Int = -1
+) = Recreation(
+	format,
+	when (errorCorrectionLevel) {
+		"L" -> 0
+		"M" -> 4
+		"Q" -> 6
+		"H" -> 8
+		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
-	}
-	// byte segments can never be shorter than the text.
-	// Zxing cuts off content 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

@@ -4,39 +4,44 @@ import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.content.Context
 import android.graphics.Bitmap
+import android.os.Build
 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.qrcode.decoder.ErrorCorrectionLevel
 import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.app.*
+import de.markusfisch.android.binaryeye.app.hasWritePermission
+import de.markusfisch.android.binaryeye.content.copyToClipboard
+import de.markusfisch.android.binaryeye.content.shareFile
+import de.markusfisch.android.binaryeye.content.shareText
+import de.markusfisch.android.binaryeye.graphics.COLOR_BLACK
+import de.markusfisch.android.binaryeye.graphics.COLOR_WHITE
+import de.markusfisch.android.binaryeye.io.addSuffixIfNotGiven
+import de.markusfisch.android.binaryeye.io.toSaveResult
+import de.markusfisch.android.binaryeye.io.writeExternalFile
 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.Zxing
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Dispatchers.Main
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
+import de.markusfisch.android.zxingcpp.ZxingCpp
+import de.markusfisch.android.zxingcpp.ZxingCpp.BarcodeFormat
+import kotlinx.coroutines.*
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
 import java.io.OutputStream
 import java.util.*
+import kotlin.math.min
 
 class BarcodeFragment : Fragment() {
 	private enum class FileType {
 		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)
@@ -57,20 +62,16 @@ 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 ecl = args.getSerializable(
-			ERROR_CORRECTION_LEVEL
-		) as ErrorCorrectionLevel?
-		val size = args.getInt(SIZE)
+		val bitmap: Bitmap
 		try {
-			barcodeBitmap = Zxing.encodeAsBitmap(content, format, size, size, ecl)
-			barcodeSvg = Zxing.encodeAsSvg(content, format, size, size, ecl)
-			barcodeTxt = Zxing.encodeAsTxt(content, format, ecl)
+			barcode = arguments?.toBarcode() ?: throw IllegalArgumentException(
+				"Illegal arguments"
+			)
+			// Catch exceptions from encoding.
+			bitmap = barcode.bitmap()
 		} catch (e: Exception) {
 			var message = e.message
-			if (message == null || message.isEmpty()) {
+			if (message.isNullOrEmpty()) {
 				message = getString(R.string.error_encoding_barcode)
 			}
 			message?.let {
@@ -79,21 +80,24 @@ 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
+			// Make sure to invoke this after ScalingImageView.onLayout().
+			imageView.minWidth = min(
+				imageView.minWidth / 2f,
+				barcode.size.toFloat()
+			)
 		}
 
 		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)
+				}
 			}
 		}
 
@@ -105,6 +109,26 @@ class BarcodeFragment : Fragment() {
 		return view
 	}
 
+	private fun Bundle.toBarcode() = Barcode(
+		getString(CONTENT_TEXT) ?: getByteArray(CONTENT_RAW) ?: throw IllegalArgumentException(
+			"content cannot be null"
+		),
+		BarcodeFormat.valueOf(
+			getString(FORMAT) ?: throw IllegalArgumentException(
+				"format cannot be null"
+			)
+		),
+		getInt(SIZE),
+		getInt(MARGIN),
+		getInt(EC_LEVEL),
+		Colors.values()[getInt(COLORS)]
+	)
+
+	override fun onDestroyView() {
+		super.onDestroyView()
+		parentJob.cancel()
+	}
+
 	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
 		inflater.inflate(R.menu.fragment_barcode, menu)
 	}
@@ -112,29 +136,30 @@ 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
 			}
+
 			else -> super.onOptionsItemSelected(item)
 		}
 	}
 
-	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])
@@ -142,16 +167,21 @@ class BarcodeFragment : Fragment() {
 			.show()
 	}
 
-	// dialogs do not have a parent view
+	// Dialogs do not have a parent view.
 	@SuppressLint("InflateParams")
 	private fun askForFileNameAndSave(fileType: FileType) {
 		val ac = activity ?: return
-		if (!hasWritePermission(ac)) {
+		// Write permission is only required before Android Q.
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&
+			!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) { _, _ ->
@@ -161,23 +191,21 @@ 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())
 					}
 				}
 			}
@@ -192,26 +220,26 @@ class BarcodeFragment : Fragment() {
 		write: (outputStream: OutputStream) -> Unit
 	) {
 		val ac = activity ?: return
-		GlobalScope.launch {
-			val message = writeExternalFile(ac, fileName, mimeType, write).toSaveResult()
-			GlobalScope.launch(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) {
-		GlobalScope.launch(Dispatchers.IO) {
+	private fun Context.share(bitmap: Bitmap) {
+		scope.launch(Dispatchers.IO) {
 			val file = File(
-				context.externalCacheDir,
+				externalCacheDir,
 				"shared_barcode.png"
 			)
 			val success = try {
@@ -222,38 +250,57 @@ class BarcodeFragment : Fragment() {
 			} catch (e: IOException) {
 				false
 			}
-			GlobalScope.launch(Main) {
+			withContext(Dispatchers.Main) {
 				if (success) {
-					shareFile(context, file, "image/png")
+					shareFile(file, "image/png")
 				} else {
-					activity?.toast(R.string.error_saving_file)
+					toast(R.string.error_saving_file)
 				}
 			}
 		}
 	}
 
 	companion object {
-		private const val CONTENT = "content"
+		private const val CONTENT_TEXT = "content_text"
+		private const val CONTENT_RAW = "content_raw"
 		private const val FORMAT = "format"
-		private const val ERROR_CORRECTION_LEVEL = "error_correction_level"
 		private const val SIZE = "size"
+		private const val MARGIN = "margin"
+		private const val EC_LEVEL = "ec_level"
+		private const val COLORS = "colors"
 		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,
+		fun <T> newInstance(
+			content: T,
 			format: BarcodeFormat,
 			size: Int,
-			errorCorrectionLevel: ErrorCorrectionLevel? = null
+			margin: Int,
+			ecLevel: Int = -1,
+			colors: Int = 0
 		): Fragment {
 			val args = Bundle()
-			args.putString(CONTENT, content)
-			args.putSerializable(FORMAT, format)
-			errorCorrectionLevel?.let {
-				args.putSerializable(ERROR_CORRECTION_LEVEL, it)
+			when (content) {
+				is String -> {
+					args.putString(CONTENT_TEXT, content)
+				}
+
+				is ByteArray -> {
+					args.putByteArray(CONTENT_RAW, content)
+				}
+
+				else -> {
+					throw IllegalArgumentException(
+						"content must be a String of a ByteArray"
+					)
+				}
 			}
+			args.putString(FORMAT, format.name)
 			args.putInt(SIZE, size)
+			args.putInt(MARGIN, margin)
+			args.putInt(EC_LEVEL, ecLevel)
+			args.putInt(COLORS, colors)
 			val fragment = BarcodeFragment()
 			fragment.arguments = args
 			return fragment
@@ -261,10 +308,70 @@ class BarcodeFragment : Fragment() {
 	}
 }
 
-private fun Bitmap.saveAsPng(outputStream: OutputStream, quality: Int = 90) {
-	this.compress(Bitmap.CompressFormat.PNG, quality, outputStream)
+private data class Barcode<T>(
+	val content: T,
+	val format: BarcodeFormat,
+	val size: Int,
+	val margin: Int,
+	val ecLevel: Int,
+	val colors: Colors
+) {
+	private var _bitmap: Bitmap? = null
+	fun bitmap(): Bitmap {
+		val b = _bitmap ?: ZxingCpp.encodeAsBitmap(
+			content, format, size, size, margin, ecLevel,
+			setColor = colors.foregroundColor(),
+			unsetColor = colors.backgroundColor()
+		)
+		_bitmap = b
+		return b
+	}
+
+	private var _svg: String? = null
+	fun svg(): String {
+		val s = _svg ?: ZxingCpp.encodeAsSvg(
+			content, format, margin, ecLevel
+		)
+		_svg = s
+		return s
+	}
+
+	private var _text: String? = null
+	fun text(): String {
+		val t = _text ?: ZxingCpp.encodeAsText(
+			content, format, margin, ecLevel,
+			inverted = colors == Colors.BLACK_ON_WHITE
+		)
+		_text = t
+		return t
+	}
 }
 
+private enum class Colors {
+	BLACK_ON_WHITE,
+	WHITE_ON_BLACK,
+	BLACK_ON_TRANSPARENT,
+	WHITE_ON_TRANSPARENT;
+
+	fun foregroundColor(): Int = when (this) {
+		BLACK_ON_WHITE,
+		BLACK_ON_TRANSPARENT -> COLOR_BLACK
+
+		WHITE_ON_BLACK,
+		WHITE_ON_TRANSPARENT -> COLOR_WHITE
+	}
+
+	fun backgroundColor(): Int = when (this) {
+		BLACK_ON_WHITE -> COLOR_WHITE
+		WHITE_ON_BLACK -> COLOR_BLACK
+		BLACK_ON_TRANSPARENT,
+		WHITE_ON_TRANSPARENT -> 0
+	}
+}
+
+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('_').toLowerCase(Locale.getDefault())
+	fileNameCharacters.replace(name, "_").take(16).trim('_').lowercase(Locale.getDefault())

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

@@ -5,40 +5,59 @@ 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
+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.shareAsFile
+import de.markusfisch.android.binaryeye.content.shareText
+import de.markusfisch.android.binaryeye.content.toHexString
+import de.markusfisch.android.binaryeye.content.wipeLastShareFile
+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
 	private lateinit var formatView: TextView
+	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 originalBytes: ByteArray = ByteArray(0)
 	private var id = 0L
+	private var recreation: Recreation? = null
 
 	override fun onCreate(state: Bundle?) {
 		super.onCreate(state)
@@ -58,67 +77,45 @@ class DecodeFragment : Fragment() {
 			false
 		)
 
-		val scan = arguments?.getParcelable(SCAN) as Scan?
-			?: throw IllegalArgumentException("DecodeFragment needs a Scan")
+		closeAutomatically = prefs.closeAutomatically &&
+				activity?.intent?.hasExtra(MainActivity.DECODED) == true
+
+		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.content.isEmpty()
+		originalBytes = scan.raw ?: originalContent.toByteArray()
+		format = scan.format.name
 		id = scan.id
 
-		val inputContent = scan.content
-		isBinary = hasNonPrintableCharacters(
-			inputContent
-		) or inputContent.isEmpty()
-		val 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)
+		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()
@@ -126,74 +123,186 @@ class DecodeFragment : Fragment() {
 		return view
 	}
 
-	override fun onDestroyView() {
+	override fun onDestroy() {
+		super.onDestroy()
 		parentJob.cancel()
-		super.onDestroyView()
+		wipeLastShareFile()
 	}
 
-	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)
 		}
-		formatView.text = resources.getQuantityString(
-			R.plurals.barcode_info,
-			bytes.size,
-			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)
-			}
+			updateFab(action)
 		}
 	}
 
-	private fun fillMetaView(tableLayout: TableLayout, scan: Scan) {
-		val ctx = tableLayout.context
-		val spaceBetween = (16f * ctx.resources.displayMetrics.density).toInt()
-		var hasMeta = false
-		sortedMapOf(
-			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
-		).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)
-				hasMeta = true
+	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.showIf(prefs.showHexDump) { v ->
+			v.text = hexDump(bytes)
+		}
+		recreationView.showIf(prefs.showRecreation) { v ->
+			val r = recreation ?: return@showIf
+			val content = if (isBinary) bytes else text
+			v.setImageBitmap(r.encode(content))
+			v.setOnClickListener {
+				fragmentManager?.addFragment(
+					BarcodeFragment.newInstance(
+						content,
+						r.format,
+						r.size,
+						r.ecLevel
+					)
+				)
 			}
 		}
-		if (hasMeta) {
-			tableLayout.setPadding(0, 0, 0, spaceBetween)
+		dataView.fillDataView(text)
+		stampView.setTrackingLink(bytes, format)
+	}
+
+	private fun TableLayout.fillDataView(text: String) {
+		val items = LinkedHashMap<Int, String?>()
+		if (action is WifiAction) {
+			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"]
+					)
+				)
+			}
+		}
+		fill(items)
+	}
+
+	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.version.isNullOrBlank()) {
+			val versionString = if (scan.format.name == "QR_CODE") {
+				getString(
+					R.string.qr_version_and_modules,
+					scan.version,
+					(scan.version.toIntOrNull() ?: 0) * 4 + 17
+				)
+			} else {
+				scan.version
+			}
+			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) {
 		inflater.inflate(R.menu.fragment_decode, menu)
-		if (isBinary) {
-			menu.findItem(R.id.copy_to_clipboard).isVisible = false
-			menu.findItem(R.id.create).isVisible = false
-		}
 		if (id > 0L) {
 			menu.findItem(R.id.remove).isVisible = true
 		}
@@ -206,51 +315,88 @@ class DecodeFragment : Fragment() {
 		return when (item.itemId) {
 			R.id.copy_password -> {
 				copyPasswordToClipboard()
+				maybeBackOrFinish()
 				true
 			}
+
 			R.id.copy_to_clipboard -> {
-				copyToClipboard(content)
+				copyToClipboard(textOrHex())
+				maybeBackOrFinish()
 				true
 			}
+
 			R.id.share -> {
-				context?.also { shareText(it, content) }
+				context?.apply {
+					shareText(textOrHex())
+					maybeBackOrFinish()
+				}
 				true
 			}
+
+			R.id.share_file -> {
+				context?.apply {
+					val (data, name) = if (isBinary) {
+						Pair(originalBytes, "barcode_content.bin")
+					} else {
+						Pair(content, "barcode_content.txt")
+					}
+					shareAsFile(data, name)
+					maybeBackOrFinish()
+				}
+				true
+			}
+
 			R.id.create -> {
-				addFragment(
-					fragmentManager,
-					EncodeFragment.newInstance(content, format)
+				fragmentManager?.addFragment(
+					EncodeFragment.newInstance(
+						if (isBinary) originalBytes else content,
+						format
+					)
 				)
 				true
 			}
+
 			R.id.remove -> {
 				db.removeScan(id)
 				backOrFinish()
 				true
 			}
+
 			else -> super.onOptionsItemSelected(item)
 		}
 	}
 
+	private fun textOrHex() = if (isBinary) {
+		originalBytes.toHexString()
+	} else {
+		content
+	}
+
 	private fun copyPasswordToClipboard() {
 		val ac = action
 		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)
 		}
 	}
 
+	private fun maybeBackOrFinish() {
+		if (closeAutomatically) {
+			backOrFinish()
+		}
+	}
+
 	private fun backOrFinish() {
 		val fm = fragmentManager
 		if (fm != null && fm.backStackEntryCount > 0) {
@@ -260,36 +406,43 @@ 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)
+				!ac.hasLocationPermission { executeAction(content) }
 			) {
 				return
 			}
 			scope.launch {
-				action.execute(ac, content)
+				action.execute(ac, content.toByteArray())
+				maybeBackOrFinish()
 			}
 		}
 	}
 
 	private fun askForFileNameAndSave(raw: ByteArray) {
 		val ac = activity ?: return
-		if (!hasWritePermission(ac)) {
+		// Write permission is only required before Android Q.
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&
+			!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)
+				}
+			}
 		}
 	}
 
@@ -306,6 +459,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 ""
@@ -319,7 +489,7 @@ private fun hexDump(bytes: ByteArray, charsPerLine: Int = 33): String {
 	while (true) {
 		val ord = bytes[i]
 		hex.append(String.format("%02X ", ord))
-		ascii.append(if (ord > 31) ord.toChar() else " ")
+		ascii.append(if (ord > 31) ord.toInt().toChar() else " ")
 		++i
 		val posInLine = i % itemsPerLine
 		val atEnd = i >= len
@@ -344,3 +514,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

@@ -1,28 +1,52 @@
 package de.markusfisch.android.binaryeye.fragment
 
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.os.Build
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import android.widget.*
-import com.google.zxing.BarcodeFormat
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.CheckBox
+import android.widget.EditText
+import android.widget.SeekBar
+import android.widget.Spinner
+import android.widget.TextView
 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.hideSoftKeyboard
 import de.markusfisch.android.binaryeye.app.prefs
+import de.markusfisch.android.binaryeye.text.unescape
+import de.markusfisch.android.binaryeye.view.hideSoftKeyboard
 import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
+import de.markusfisch.android.binaryeye.widget.toast
+import de.markusfisch.android.zxingcpp.ZxingCpp.BarcodeFormat
+import java.io.InputStream
+import kotlin.math.max
+import kotlin.math.min
 
 class EncodeFragment : Fragment() {
 	private lateinit var formatView: Spinner
-	private lateinit var errorCorrectionLabel: TextView
-	private lateinit var errorCorrectionLevel: Spinner
+	private lateinit var ecLabel: TextView
+	private lateinit var ecSpinner: Spinner
+	private lateinit var colorsLabel: TextView
+	private lateinit var colorsSpinner: Spinner
 	private lateinit var sizeView: TextView
 	private lateinit var sizeBarView: SeekBar
+	private lateinit var marginLayout: View
+	private lateinit var marginView: TextView
+	private lateinit var marginBarView: SeekBar
 	private lateinit var contentView: EditText
+	private lateinit var unescapeCheckBox: CheckBox
 
-	private val writers = arrayListOf(
+	private val formats = arrayListOf(
 		BarcodeFormat.AZTEC,
 		BarcodeFormat.CODABAR,
 		BarcodeFormat.CODE_39,
@@ -36,6 +60,37 @@ class EncodeFragment : Fragment() {
 		BarcodeFormat.UPC_A
 	)
 
+	private var minMargin = 0
+	private var bytes: ByteArray? = null
+
+	override fun onActivityResult(
+		requestCode: Int,
+		resultCode: Int,
+		resultData: Intent?
+	) {
+		when (requestCode) {
+			PICK_FILE_RESULT_CODE -> {
+				if (resultCode == Activity.RESULT_OK &&
+					resultData != null &&
+					resultData.data != null
+				) {
+					val ac = activity ?: return
+					ac.hideSoftKeyboard(contentView)
+					val uri = resultData.data ?: return
+					bytes = ac.contentResolver?.openInputStream(uri)?.use {
+						it.readBytesMax(4096)
+					} ?: return
+					setEncodeByteArray()
+				}
+			}
+		}
+	}
+
+	override fun onCreate(state: Bundle?) {
+		super.onCreate(state)
+		setHasOptionsMenu(true)
+	}
+
 	override fun onCreateView(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
@@ -54,7 +109,7 @@ class EncodeFragment : Fragment() {
 		val formatAdapter = ArrayAdapter(
 			ac,
 			android.R.layout.simple_spinner_item,
-			writers.map { it.name }
+			formats.map { prettifyFormatName(it.name) }
 		)
 		formatAdapter.setDropDownViewResource(
 			android.R.layout.simple_spinner_dropdown_item
@@ -67,38 +122,88 @@ class EncodeFragment : Fragment() {
 				position: Int,
 				id: Long
 			) {
-				val visibility = if (
-					writers[position] == BarcodeFormat.QR_CODE
-				) {
-					View.VISIBLE
-				} else {
-					View.GONE
+				val format = formats[position]
+				val arrayId = when (format) {
+					BarcodeFormat.AZTEC -> R.array.aztec_error_correction_levels
+					BarcodeFormat.QR_CODE -> R.array.qr_error_correction_levels
+					BarcodeFormat.PDF_417 -> R.array.pdf417_error_correction_levels
+					else -> 0
 				}
-				errorCorrectionLabel.visibility = visibility
-				errorCorrectionLevel.visibility = visibility
+				if (arrayId > 0) {
+					ecSpinner.setEntries(arrayId)
+					val idx = format.unpackEcLevel(
+						prefs.indexOfLastSelectedEcLevel
+					)
+					if (idx < ecSpinner.adapter.count) {
+						ecSpinner.setSelection(idx)
+					}
+					true
+				} else {
+					false
+				}.setVisibilityFor(ecLabel, ecSpinner)
+				format.canBeInverted().setVisibilityFor(
+					colorsLabel, colorsSpinner
+				)
+				when (format) {
+					BarcodeFormat.AZTEC -> setMarginBar(4, 4)
+					BarcodeFormat.DATA_MATRIX -> setMarginBar(1, 1)
+					BarcodeFormat.QR_CODE -> setMarginBar(4, 4)
+					BarcodeFormat.PDF_417 -> setMarginBar(0, 30)
+					else -> false
+				}.setVisibilityFor(marginLayout)
 			}
 
 			override fun onNothingSelected(parentView: AdapterView<*>?) {}
 		}
 
-		errorCorrectionLabel = view.findViewById(R.id.error_correction_label)
-		errorCorrectionLevel = view.findViewById(R.id.error_correction_level)
+		ecLabel = view.findViewById(R.id.error_correction_label)
+		ecSpinner = view.findViewById(R.id.error_correction_level)
+		ecSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+			override fun onItemSelected(
+				parentView: AdapterView<*>?,
+				selectedItemView: View?,
+				position: Int,
+				id: Long
+			) {
+				val format = formats[formatView.selectedItemPosition]
+				prefs.indexOfLastSelectedEcLevel = format.packEcLevel(
+					prefs.indexOfLastSelectedEcLevel,
+					position
+				)
+			}
+
+			override fun onNothingSelected(parentView: AdapterView<*>?) {}
+		}
+
+		colorsLabel = view.findViewById(R.id.colors_label)
+		colorsSpinner = view.findViewById(R.id.colors)
 
 		sizeView = view.findViewById(R.id.size_display)
 		sizeBarView = view.findViewById(R.id.size_bar)
 		initSizeBar()
 
+		marginLayout = view.findViewById(R.id.margin)
+		marginView = view.findViewById(R.id.margin_display)
+		marginBarView = view.findViewById(R.id.margin_bar)
+		initMarginBar()
+
 		contentView = view.findViewById(R.id.content)
+		unescapeCheckBox = view.findViewById(R.id.unescape)
+		unescapeCheckBox.isChecked = prefs.expandEscapeSequences
 
 		val args = arguments
-		args?.also {
-			contentView.setText(it.getString(CONTENT))
+		args?.getString(CONTENT_TEXT)?.let {
+			contentView.setText(it)
+		}
+		args?.getByteArray(CONTENT_RAW)?.let {
+			bytes = it
+			setEncodeByteArray()
 		}
 
 		val barcodeFormat = args?.getString(FORMAT)
 		if (barcodeFormat != null) {
 			formatView.setSelection(
-				writers.indexOf(resolveFormat(barcodeFormat))
+				formats.indexOf(barcodeFormat.toFormat())
 			)
 		} else if (state == null) {
 			formatView.post {
@@ -107,7 +212,7 @@ class EncodeFragment : Fragment() {
 		}
 
 		view.findViewById<View>(R.id.encode).setOnClickListener {
-			encode()
+			it.context.encode()
 		}
 
 		(view.findViewById(R.id.inset_layout) as View).setPaddingFromWindowInsets()
@@ -116,38 +221,76 @@ class EncodeFragment : Fragment() {
 		return view
 	}
 
+	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+		inflater.inflate(R.menu.fragment_encode, menu)
+	}
+
+	override fun onOptionsItemSelected(item: MenuItem): Boolean {
+		return when (item.itemId) {
+			R.id.pick_file -> {
+				startActivityForResult(
+					Intent.createChooser(
+						Intent(Intent.ACTION_GET_CONTENT).apply {
+							type = "*/*"
+						},
+						getString(R.string.pick_file)
+					),
+					PICK_FILE_RESULT_CODE
+				)
+				true
+			}
+
+			else -> super.onOptionsItemSelected(item)
+		}
+	}
+
 	override fun onPause() {
 		super.onPause()
 		prefs.indexOfLastSelectedFormat = formatView.selectedItemPosition
+		prefs.expandEscapeSequences = unescapeCheckBox.isChecked
+		prefs.lastMargin = marginBarView.progress
 	}
 
-	private fun encode() {
-		val format = writers[formatView.selectedItemPosition]
-		val ecl = if (format == BarcodeFormat.QR_CODE) {
-			arrayListOf(
-				ErrorCorrectionLevel.L,
-				ErrorCorrectionLevel.M,
-				ErrorCorrectionLevel.Q,
-				ErrorCorrectionLevel.H
-			)[errorCorrectionLevel.selectedItemPosition]
+	private fun Context.encode() {
+		hideSoftKeyboard(contentView)
+		val content = if (bytes != null) {
+			bytes
 		} else {
-			null
+			var text = contentView.text.toString()
+			if (unescapeCheckBox.isChecked) {
+				try {
+					text = text.unescape()
+				} catch (e: IllegalArgumentException) {
+					toast(e.message ?: "Invalid escape sequence")
+					return
+				}
+			}
+			if (text.isEmpty()) {
+				toast(R.string.error_no_content)
+				return
+			}
+			text
 		}
-		val size = getSize(sizeBarView.progress)
-		val content = contentView.text.toString()
-		if (content.isEmpty()) {
-			Toast.makeText(
-				context,
-				R.string.error_no_content,
-				Toast.LENGTH_SHORT
-			).show()
-		} else {
-			activity?.hideSoftKeyboard(contentView)
-			addFragment(
-				fragmentManager,
-				BarcodeFragment.newInstance(content, format, size, ecl)
+		val format = formats[formatView.selectedItemPosition]
+		fragmentManager?.addFragment(
+			BarcodeFragment.newInstance(
+				content,
+				format,
+				getSize(sizeBarView.progress),
+				when (format) {
+					BarcodeFormat.AZTEC,
+					BarcodeFormat.DATA_MATRIX,
+					BarcodeFormat.QR_CODE,
+					BarcodeFormat.PDF_417 -> marginBarView.progress
+
+					else -> -1
+				},
+				format.getErrorCorrectionLevel(ecSpinner.selectedItemPosition),
+				if (format.canBeInverted()) {
+					colorsSpinner.selectedItemPosition
+				} else 0
 			)
-		}
+		)
 	}
 
 	private fun initSizeBar() {
@@ -170,21 +313,77 @@ class EncodeFragment : Fragment() {
 
 	private fun updateSize(power: Int) {
 		val size = getSize(power)
-		sizeView.text = getString(R.string.width_by_height, size, size)
+		sizeView.text = getString(R.string.size_width_by_height, size, size)
 	}
 
-	private fun getSize(power: Int) = 128 * (power + 1)
+	private fun initMarginBar() {
+		updateMargin(marginBarView.progress)
+		marginBarView.setOnSeekBarChangeListener(
+			object : SeekBar.OnSeekBarChangeListener {
+				override fun onProgressChanged(
+					seekBar: SeekBar,
+					progressValue: Int,
+					fromUser: Boolean
+				) {
+					if (progressValue >= minMargin) {
+						updateMargin(progressValue)
+					}
+				}
+
+				override fun onStartTrackingTouch(seekBar: SeekBar) {}
+
+				override fun onStopTrackingTouch(seekBar: SeekBar) {}
+			})
+	}
+
+	private fun updateMargin(margin: Int) {
+		marginView.text = getString(R.string.margin_size, margin)
+	}
+
+	private fun setMarginBar(minimum: Int, value: Int): Boolean {
+		minMargin = minimum
+		marginBarView.apply {
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+				min = minimum
+			}
+			progress = max(
+				minimum, if (prefs.lastMargin > -1) {
+					prefs.lastMargin
+				} else {
+					value
+				}
+			)
+		}
+		return true
+	}
+
+	private fun setEncodeByteArray() {
+		contentView.text = null
+		contentView.hint = getString(R.string.binary_data)
+		contentView.isEnabled = false
+		unescapeCheckBox.isEnabled = false
+	}
 
 	companion object {
-		private const val CONTENT = "content"
+		private const val CONTENT_TEXT = "content_text"
+		private const val CONTENT_RAW = "content_raw"
 		private const val FORMAT = "format"
+		private const val PICK_FILE_RESULT_CODE = 1
 
-		fun newInstance(
-			content: String,
+		fun <T> newInstance(
+			content: T? = null,
 			format: String? = null
 		): Fragment {
 			val args = Bundle()
-			args.putString(CONTENT, content)
+			content?.let {
+				when (content) {
+					is String -> args.putString(CONTENT_TEXT, content)
+					is ByteArray -> args.putByteArray(CONTENT_RAW, content)
+					else -> throw IllegalArgumentException(
+						"content must be a String or a ByteArray"
+					)
+				}
+			}
 			format?.let { args.putString(FORMAT, it) }
 			val fragment = EncodeFragment()
 			fragment.arguments = args
@@ -193,8 +392,73 @@ class EncodeFragment : Fragment() {
 	}
 }
 
-private fun resolveFormat(name: String): BarcodeFormat = try {
-	BarcodeFormat.valueOf(name)
-} catch (_: IllegalArgumentException) {
-	BarcodeFormat.QR_CODE
+private fun Boolean.setVisibilityFor(vararg views: View) {
+	val visibility = if (this) View.VISIBLE else View.GONE
+	for (view in views) {
+		view.visibility = visibility
+	}
+}
+
+private fun BarcodeFormat.packEcLevel(packed: Int, level: Int): Int {
+	val s = ecLevelShift()
+	return (level shl s) or (packed and (15 shl s).inv())
+}
+
+private fun BarcodeFormat.unpackEcLevel(packed: Int) =
+	(packed shr ecLevelShift()) and 15
+
+private fun BarcodeFormat.ecLevelShift() = when (this) {
+	BarcodeFormat.AZTEC -> 0
+	BarcodeFormat.QR_CODE -> 4
+	BarcodeFormat.PDF_417 -> 8
+	else -> throw IllegalArgumentException("$this does not have error levels")
+}
+
+private fun BarcodeFormat.canBeInverted() = when (this) {
+	BarcodeFormat.AZTEC,
+	BarcodeFormat.DATA_MATRIX,
+	BarcodeFormat.QR_CODE -> true
+
+	else -> false
+}
+
+private fun String.toFormat(default: BarcodeFormat = BarcodeFormat.QR_CODE): BarcodeFormat = try {
+	BarcodeFormat.valueOf(this)
+} catch (_: IllegalArgumentException) {
+	default
+}
+
+private fun BarcodeFormat.getErrorCorrectionLevel(position: Int) = when (this) {
+	BarcodeFormat.AZTEC -> position
+	BarcodeFormat.QR_CODE -> (position + 1) * 2
+	BarcodeFormat.PDF_417 -> position
+	else -> 0
+}.coerceIn(0, 8)
+
+private fun Spinner.setEntries(resId: Int) = ArrayAdapter.createFromResource(
+	this.context,
+	resId,
+	android.R.layout.simple_spinner_item
+).also { aa ->
+	aa.setDropDownViewResource(
+		android.R.layout.simple_spinner_dropdown_item
+	)
+	adapter = aa
+}
+
+private fun getSize(power: Int) = 128 * (power + 1)
+
+private fun InputStream.readBytesMax(max: Int): ByteArray {
+	var offset = 0
+	var remaining = min(available(), max)
+	val result = ByteArray(remaining)
+	while (remaining > 0) {
+		val read = read(result, offset, remaining)
+		if (read < 0) {
+			break
+		}
+		remaining -= read
+		offset += read
+	}
+	return result
 }

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

@@ -21,12 +21,14 @@ import android.widget.ListView
 import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.adapter.ScansAdapter
 import de.markusfisch.android.binaryeye.app.*
-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.view.setPaddingFromWindowInsets
-import de.markusfisch.android.binaryeye.view.useVisibility
+import de.markusfisch.android.binaryeye.content.copyToClipboard
+import de.markusfisch.android.binaryeye.content.shareAsFile
+import de.markusfisch.android.binaryeye.content.shareText
+import de.markusfisch.android.binaryeye.content.wipeLastShareFile
+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.*
 import de.markusfisch.android.binaryeye.widget.toast
 import kotlinx.coroutines.*
 
@@ -72,31 +74,36 @@ 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)
 					}
 					closeActionMode()
 					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
 				}
+
 				else -> false
 			}
 		}
@@ -112,6 +119,7 @@ class HistoryFragment : Fragment() {
 	private var filter: String? = null
 	private var clearListMenuItem: MenuItem? = null
 	private var exportHistoryMenuItem: MenuItem? = null
+	private var shareAsFileMenuItem: MenuItem? = null
 
 	override fun onCreate(state: Bundle?) {
 		super.onCreate(state)
@@ -142,8 +150,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
@@ -155,7 +162,7 @@ class HistoryFragment : Fragment() {
 
 		fab = view.findViewById(R.id.share)
 		fab.setOnClickListener { v ->
-			pickListSeparatorAndShare(v.context)
+			v.context.pickListSeparatorAndShare(false)
 		}
 
 		progressView = view.findViewById(R.id.progress_view)
@@ -172,6 +179,7 @@ class HistoryFragment : Fragment() {
 		super.onDestroy()
 		scansAdapter?.changeCursor(null)
 		parentJob.cancel()
+		wipeLastShareFile()
 	}
 
 	override fun onPause() {
@@ -181,10 +189,19 @@ class HistoryFragment : Fragment() {
 
 	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
 		inflater.inflate(R.menu.fragment_history, menu)
-		initSearchView(menu.findItem(R.id.search))
-		menu.setGroupVisible(R.id.scans_available, scansAdapter?.count != 0)
-		clearListMenuItem = menu.findItem(R.id.clear)
-		exportHistoryMenuItem = menu.findItem(R.id.export_history)
+		val searchMenuItem = menu.findItem(R.id.search)
+		initSearchView(searchMenuItem)
+		val visible = scansAdapter?.count != 0
+		searchMenuItem?.isVisible = visible
+		exportHistoryMenuItem = menu.findItem(R.id.export_history)?.apply {
+			isVisible = visible
+		}
+		shareAsFileMenuItem = menu.findItem(R.id.share_as_file)?.apply {
+			isVisible = visible
+		}
+		clearListMenuItem = menu.findItem(R.id.clear)?.apply {
+			isVisible = visible
+		}
 	}
 
 	private fun initSearchView(item: MenuItem?) {
@@ -217,13 +234,20 @@ 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 -> {
-				askToExportToFile(context)
+				askToExportToFile()
 				true
 			}
+
+			R.id.share_as_file -> {
+				context.pickListSeparatorAndShare(true)
+				true
+			}
+
 			else -> super.onOptionsItemSelected(item)
 		}
 	}
@@ -262,7 +286,7 @@ class HistoryFragment : Fragment() {
 					View.GONE
 				}
 				cursor?.let { cursor ->
-					// close previous cursor
+					// Close previous cursor.
 					scansAdapter?.also { it.changeCursor(null) }
 					scansAdapter = ScansAdapter(ac, cursor)
 					listView.adapter = scansAdapter
@@ -277,6 +301,7 @@ class HistoryFragment : Fragment() {
 	private fun enableMenuItems(enabled: Boolean) {
 		clearListMenuItem?.isEnabled = enabled
 		exportHistoryMenuItem?.isEnabled = enabled
+		shareAsFileMenuItem?.isEnabled = enabled
 	}
 
 	private fun closeActionMode() {
@@ -290,29 +315,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
+			// 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
+	// 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()
@@ -323,11 +347,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 {
@@ -339,8 +369,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
@@ -357,88 +387,105 @@ class HistoryFragment : Fragment() {
 			.show()
 	}
 
-	private fun askToExportToFile(context: Context) = scope.launch {
-		val ac = activity ?: return@launch
-		progressView.useVisibility {
-			if (!hasWritePermission(ac)) {
-				return@useVisibility
-			}
-			val options = context.resources.getStringArray(
-				R.array.export_options_values
-			)
-			val delimiter = alertDialog<String>(context) { resume ->
-				setTitle(R.string.export_as)
-				setItems(R.array.export_options_names) { _, which ->
-					resume(options[which])
+	private fun askToExportToFile() {
+		scope.launch {
+			val ac = activity ?: return@launch
+			progressView.useVisibility {
+				// Write permission is only required before Android Q.
+				if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&
+					!ac.hasWritePermission { askToExportToFile() }
+				) {
+					return@useVisibility
 				}
-			} ?: return@useVisibility
-			val name = withContext(Dispatchers.Main) {
-				ac.askForFileName(
-					when (delimiter) {
-						"db" -> ".db"
-						"json" -> ".json"
-						else -> ".csv"
-					}
+				val options = ac.resources.getStringArray(
+					R.array.export_options_values
 				)
-			} ?: return@useVisibility
-			val message = when (delimiter) {
-				"db" -> exportDatabase(ac, name)
-				else -> db.getScansDetailed(filter)?.use {
-					when (delimiter) {
-						"json" -> exportJson(context, name, it)
-						else -> exportCsv(context, name, it, delimiter)
+				val delimiter = alertDialog<String>(ac) { resume ->
+					setTitle(R.string.export_as)
+					setItems(R.array.export_options_names) { _, which ->
+						resume(options[which])
 					}
-				} ?: false
-			}.toSaveResult()
-			withContext(Dispatchers.Main) {
-				ac.toast(message)
+				} ?: return@useVisibility
+				val name = withContext(Dispatchers.Main) {
+					ac.askForFileName(
+						when (delimiter) {
+							"db" -> ".db"
+							"json" -> ".json"
+							else -> ".csv"
+						}
+					)
+				} ?: return@useVisibility
+				val message = when (delimiter) {
+					"db" -> ac.exportDatabase(name)
+					else -> db.getScansDetailed(filter)?.use {
+						when (delimiter) {
+							"json" -> ac.exportJson(name, it)
+							else -> ac.exportCsv(name, it, delimiter)
+						}
+					} ?: false
+				}.toSaveResult()
+				withContext(Dispatchers.Main) {
+					ac.toast(message)
+				}
 			}
 		}
 	}
 
-	private fun pickListSeparatorAndShare(context: Context) {
-		val separators = context.resources.getStringArray(
+	private fun Context.pickListSeparatorAndShare(asFile: Boolean) {
+		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])
+				shareScans(separators[which], asFile)
 			}
 			.show()
 	}
 
-	private fun shareScans(format: String) = scope.launch {
+	private fun shareScans(format: String, asFile: Boolean) = scope.launch {
 		progressView.useVisibility {
-			var text: String? = null
-			db.getScansDetailed(filter)?.use { cursor ->
+			val selectedIds = scansAdapter?.getSelectedIds()
+			if (selectedIds?.isNotEmpty() == true) {
+				db.getScansDetailed(selectedIds.toLongArray())
+			} else {
+				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)
+				when (details[0]) {
+					"text" -> Pair(cursor.exportText(details[1]), "txt")
+					"csv" -> Pair(cursor.exportCsv(details[1]), "csv")
+					else -> Pair(cursor.exportJson(), "json")
 				}
-			}
-			text?.let {
-				withContext(Dispatchers.Main) {
-					shareText(context, it)
+			}?.let { (text, ext) ->
+				text?.let {
+					withContext(Dispatchers.Main) {
+						if (asFile) {
+							context.shareAsFile(
+								it,
+								String.format("scans.%s", ext)
+							)
+						} else {
+							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/NetworkSuggestionsFragment.kt

@@ -0,0 +1,92 @@
+package de.markusfisch.android.binaryeye.fragment
+
+import android.content.Context
+import android.net.wifi.WifiManager
+import android.net.wifi.WifiNetworkSuggestion
+import android.os.Build
+import android.os.Bundle
+import android.support.annotation.RequiresApi
+import android.support.v4.app.Fragment
+import android.view.*
+import android.widget.ArrayAdapter
+import android.widget.ListView
+import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
+import de.markusfisch.android.binaryeye.view.systemBarListViewScrollListener
+import de.markusfisch.android.binaryeye.widget.toast
+
+class NetworkSuggestionsFragment : Fragment() {
+	@RequiresApi(Build.VERSION_CODES.R)
+	override fun onCreateView(
+		inflater: LayoutInflater,
+		container: ViewGroup?,
+		state: Bundle?
+	): View? {
+		val ac = activity ?: return null
+		ac.setTitle(R.string.network_suggestions)
+
+		val view = inflater.inflate(
+			R.layout.fragment_network_suggestions,
+			container,
+			false
+		)
+
+		val wm = ac.applicationContext.getSystemService(
+			Context.WIFI_SERVICE
+		) as WifiManager
+		val suggestionArrayAdapter = ArrayAdapter(
+			ac,
+			android.R.layout.simple_list_item_checked,
+			wm.networkSuggestions.map {
+				Suggestion(
+					it.ssid ?: it.toString(),
+					it
+				)
+			}
+		)
+
+		val listView = view.findViewById<ListView>(R.id.suggestions)
+		listView.emptyView = view.findViewById(R.id.no_suggestions)
+		listView.adapter = suggestionArrayAdapter
+		listView.setOnScrollListener(systemBarListViewScrollListener)
+		(view.findViewById(R.id.inset_layout) as View).setPaddingFromWindowInsets()
+		listView.setPaddingFromWindowInsets()
+
+		view.findViewById<View>(R.id.remove).setOnClickListener {
+			val removeList = ArrayList<WifiNetworkSuggestion>()
+			val removeFromAdapter = ArrayList<Suggestion>()
+			val checked = listView.checkedItemPositions
+			val size = checked.size()
+			for (i in 0 until size) {
+				if (checked.valueAt(i)) {
+					val pos = checked.keyAt(i)
+					listView.setItemChecked(pos, false)
+					val suggestion = listView.getItemAtPosition(
+						pos
+					) as Suggestion
+					removeList.add(suggestion.suggestion)
+					removeFromAdapter.add(suggestion)
+				}
+			}
+			if (removeList.isNotEmpty()) {
+				removeFromAdapter.forEach {
+					suggestionArrayAdapter.remove(it)
+				}
+				wm.removeNetworkSuggestions(removeList)
+			} else {
+				ac.toast(
+					R.string.clear_network_suggestions_nothing_to_remove
+				)
+			}
+		}
+
+		return view
+	}
+}
+
+private data class Suggestion(
+	val label: String,
+	val suggestion: WifiNetworkSuggestion
+) {
+	override fun toString() = label
+}

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

@@ -1,45 +1,130 @@
 package de.markusfisch.android.binaryeye.fragment
 
 import android.app.Activity
+import android.app.AlertDialog
+import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener
+import android.net.wifi.WifiManager
 import android.os.Build
 import android.os.Bundle
+import android.support.annotation.RequiresApi
+import android.support.v14.preference.MultiSelectListPreference
 import android.support.v7.preference.ListPreference
 import android.support.v7.preference.Preference
 import android.support.v7.preference.PreferenceFragmentCompat
 import android.support.v7.preference.PreferenceGroup
 import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.activity.SplashActivity
+import de.markusfisch.android.binaryeye.app.addFragment
+import de.markusfisch.android.binaryeye.app.hasBluetoothPermission
 import de.markusfisch.android.binaryeye.app.prefs
-import de.markusfisch.android.binaryeye.app.systemBarRecyclerViewScrollListener
+import de.markusfisch.android.binaryeye.bluetooth.setBluetoothHosts
+import de.markusfisch.android.binaryeye.media.beepConfirm
 import de.markusfisch.android.binaryeye.preference.UrlPreference
 import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
+import de.markusfisch.android.binaryeye.view.systemBarRecyclerViewScrollListener
+import de.markusfisch.android.binaryeye.widget.toast
 
 class PreferencesFragment : PreferenceFragmentCompat() {
 	private val changeListener = object : OnSharedPreferenceChangeListener {
 		override fun onSharedPreferenceChanged(
-			sharedPreferences: SharedPreferences,
-			key: String
+			sharedPreferences: SharedPreferences?,
+			key: String?
 		) {
+			key ?: return
 			val preference = findPreference(key) ?: return
 			prefs.update()
-			if (preference.key == "custom_locale") {
-				activity?.restartApp()
-			} else {
-				setSummary(preference)
+			when (preference.key) {
+				"custom_locale" -> activity?.restartApp()
+				"beep_tone_name" -> {
+					beepConfirm()
+					setSummary(preference)
+				}
+
+				"send_scan_bluetooth" -> {
+					if (prefs.sendScanBluetooth &&
+						activity?.hasBluetoothPermission() == false
+					) {
+						prefs.sendScanBluetooth = false
+					}
+					setSummary(preference)
+				}
+
+				else -> setSummary(preference)
 			}
 		}
 	}
 
 	override fun onCreatePreferences(state: Bundle?, rootKey: String?) {
 		addPreferencesFromResource(R.xml.preferences)
-		activity?.setTitle(R.string.preferences)
+		setBluetoothResources()
+		wireClearNetworkPreferences()
+	}
+
+	private fun setBluetoothResources() {
+		if (prefs.sendScanBluetooth &&
+			activity?.hasBluetoothPermission() == true
+		) {
+			setBluetoothHosts(
+				findPreference("send_scan_bluetooth_host") as ListPreference
+			)
+		}
+	}
+
+	private fun wireClearNetworkPreferences() {
+		findPreference("clear_network_suggestions").apply {
+			if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) {
+				// From R+ we can query past network suggestions and
+				// make them editable.
+				setOnPreferenceClickListener {
+					fragmentManager.addFragment(NetworkSuggestionsFragment())
+					true
+				}
+			} else if (Build.VERSION.SDK_INT == Build.VERSION_CODES.Q) {
+				// On Q, we can only clear *all* suggestions.
+				// Note that previous versions of this app allowed
+				// adding network suggestions on Q as well, so we
+				// need to keep this option.
+				setOnPreferenceClickListener {
+					context.askToClearNetworkSuggestions()
+					true
+				}
+			} else {
+				// There are no network suggestions below Q.
+				isVisible = false
+			}
+		}
+	}
+
+	@RequiresApi(Build.VERSION_CODES.Q)
+	private fun Context.askToClearNetworkSuggestions() {
+		AlertDialog.Builder(this)
+			.setMessage(R.string.really_remove_all_networks)
+			.setPositiveButton(android.R.string.ok) { _, _ ->
+				clearNetworkSuggestions()
+			}
+			.setNegativeButton(android.R.string.cancel) { _, _ -> }
+			.show()
+	}
+
+	@RequiresApi(Build.VERSION_CODES.Q)
+	private fun Context.clearNetworkSuggestions() {
+		toast(
+			if (removeAllNetworkSuggestions() ==
+				WifiManager.STATUS_NETWORK_SUGGESTIONS_SUCCESS
+			) {
+				R.string.clear_network_suggestions_success
+			} else {
+				R.string.clear_network_suggestions_nothing_to_remove
+			}
+		)
 	}
 
 	override fun onResume() {
 		super.onResume()
+		activity?.setTitle(R.string.preferences)
 		listView.setPaddingFromWindowInsets()
 		listView.removeOnScrollListener(systemBarRecyclerViewScrollListener)
 		listView.addOnScrollListener(systemBarRecyclerViewScrollListener)
@@ -61,6 +146,12 @@ class PreferencesFragment : PreferenceFragmentCompat() {
 				setTargetFragment(this@PreferencesFragment, 0)
 				show(fm, null)
 			}
+		} else if (preference.key == "send_scan_bluetooth_host") {
+			val ac = activity ?: return
+			if (ac.hasBluetoothPermission()) {
+				setBluetoothHosts(preference as ListPreference)
+			}
+			super.onDisplayPreferenceDialog(preference)
 		} else {
 			super.onDisplayPreferenceDialog(preference)
 		}
@@ -78,9 +169,19 @@ class PreferencesFragment : PreferenceFragmentCompat() {
 			is UrlPreference -> {
 				preference.setSummary(preference.getUrl())
 			}
+
 			is ListPreference -> {
 				preference.setSummary(preference.entry)
 			}
+
+			is MultiSelectListPreference -> {
+				preference.setSummary(
+					preference.values.joinToString(", ") {
+						it.replace(Regex("_"), " ")
+					}
+				)
+			}
+
 			is PreferenceGroup -> {
 				setSummaries(preference)
 			}
@@ -98,6 +199,12 @@ private fun Activity.restartApp() {
 	}
 	startActivity(intent)
 	finish()
-	// restart to begin with an unmodified Locale to follow system settings
+	// Restart to begin with an unmodified Locale to follow system settings.
 	Runtime.getRuntime().exit(0)
 }
+
+@RequiresApi(Build.VERSION_CODES.Q)
+private fun Context.removeAllNetworkSuggestions(): Int =
+	(applicationContext.getSystemService(
+		Context.WIFI_SERVICE
+	) as WifiManager).removeNetworkSuggestions(listOf())

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

@@ -5,31 +5,62 @@ import android.support.v7.preference.PreferenceDialogFragmentCompat
 import android.view.View
 import android.widget.TextView
 import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.preference.Preferences
+import de.markusfisch.android.binaryeye.app.prefs
+import de.markusfisch.android.binaryeye.database.Scan
+import de.markusfisch.android.binaryeye.net.sendAsync
 import de.markusfisch.android.binaryeye.preference.UrlPreference
+import de.markusfisch.android.zxingcpp.ZxingCpp.BarcodeFormat
 
 class UrlDialogFragment : PreferenceDialogFragmentCompat() {
 	private var urlView: TextView? = null
+	private var testButton: TextView? = null
 
 	override fun onBindDialogView(view: View?) {
 		super.onBindDialogView(view)
 		urlView = view?.findViewById(R.id.url)
-		val urlPref = urlPreference()
-		urlView?.text = urlPref.getUrl()
-		urlView?.hint = getString(when (urlPref.key) {
-			Preferences.OPEN_WITH_URL -> R.string.url_hint_add_content
-			else -> R.string.url_hint
-		})
+		testButton = view?.findViewById(R.id.test_url)
+		testButton?.setOnClickListener {
+			testUrl(testButton)
+		}
+		urlView?.text = urlPreference().getUrl()
+		urlView?.hint = getString(
+			when (prefs.sendScanType) {
+				"0" -> R.string.url_hint_add_content
+				else -> R.string.url_hint
+			}
+		)
 	}
 
 	override fun onDialogClosed(positiveResult: Boolean) {
 		if (positiveResult) {
-			urlPreference().setUrl(urlView?.text.toString())
+			urlPreference().setUrl(getUrl())
 		}
 	}
 
+	private fun getUrl() = completeUrl(urlView?.text.toString())
+
 	private fun urlPreference() = preference as UrlPreference
 
+	private fun testUrl(textView: TextView?) {
+		val url = getUrl()
+		if (url.isEmpty()) {
+			return
+		}
+		textView ?: return
+		textView.text = "…"
+		Scan(
+			"test",
+			null,
+			BarcodeFormat.NONE
+		).sendAsync(url, prefs.sendScanType) { code, body ->
+			textView.text = when {
+				code != null -> "$code"
+				body != null -> body
+				else -> getString(R.string.background_request_failed)
+			}
+		}
+	}
+
 	companion object {
 		fun newInstance(key: String): UrlDialogFragment {
 			val args = Bundle()
@@ -40,3 +71,19 @@ class UrlDialogFragment : PreferenceDialogFragmentCompat() {
 		}
 	}
 }
+
+private fun completeUrl(template: String): String {
+	var s = template.trim()
+	if (s.isEmpty()) {
+		return ""
+	}
+	if (!s.startsWith("http")) {
+		s = "http://${s}"
+	}
+	if (prefs.sendScanType == "0" &&
+		!s.matches(".*/[a-zA-Z._-]*\\?[a-zA-Z0-9&=_-]+=$".toRegex())
+	) {
+		s = "${s}?content="
+	}
+	return s
+}

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/Colors.kt

@@ -0,0 +1,4 @@
+package de.markusfisch.android.binaryeye.graphics
+
+const val COLOR_BLACK = 0xff000000.toInt()
+const val COLOR_WHITE = 0xffffffff.toInt()

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

@@ -1,29 +0,0 @@
-package de.markusfisch.android.binaryeye.graphics
-
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.graphics.Point
-import android.support.v4.content.ContextCompat
-import de.markusfisch.android.binaryeye.R
-
-class Dots(context: Context) {
-	private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
-	private val radius = 8f * context.resources.displayMetrics.density
-
-	init {
-		paint.color = ContextCompat.getColor(context, R.color.dot)
-		paint.style = Paint.Style.FILL
-	}
-
-	fun draw(canvas: Canvas, points: List<Point>) {
-		for (point in points) {
-			canvas.drawCircle(
-				point.x.toFloat(),
-				point.y.toFloat(),
-				radius,
-				paint
-			)
-		}
-	}
-}

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

@@ -1,85 +1,88 @@
 package de.markusfisch.android.binaryeye.graphics
 
-import android.graphics.Point
+import android.graphics.Matrix
 import android.graphics.Rect
-import com.google.zxing.Result
-import com.google.zxing.ResultPoint
+import android.graphics.RectF
+import de.markusfisch.android.zxingcpp.ZxingCpp.Position
 import kotlin.math.roundToInt
 
-fun mapResult(
-	frameWidth: Int,
-	frameHeight: Int,
-	frameOrientation: Int,
+data class FrameMetrics(
+	var width: Int = 0,
+	var height: Int = 0,
+	var orientation: Int = 0
+)
+
+fun Rect.setFrameRoi(
+	frameMetrics: FrameMetrics,
 	viewRect: Rect,
-	result: Result
-): List<Point> = frameToView(
-	frameWidth,
-	frameHeight,
-	frameOrientation,
-	viewRect
-).map(
-	result.resultPoints
-)
-
-fun frameToView(
-	frameWidth: Int,
-	frameHeight: Int,
-	frameOrientation: Int,
-	viewRect: Rect
-) = Mapping(
-	frameWidth,
-	frameHeight,
-	frameOrientation,
-	viewRect.width().toFloat(),
-	viewRect.height().toFloat(),
-	viewRect.left,
-	viewRect.top
-)
-
-fun isPortrait(orientation: Int) = orientation == 90 || orientation == 270
-
-data class Mapping(
-	val frameWidth: Int,
-	val frameHeight: Int,
-	val frameOrientation: Int,
-	val viewWidth: Float,
-	val viewHeight: Float,
-	val offsetX: Int,
-	val offsetY: Int
+	viewRoi: Rect
 ) {
-	fun map(resultPoint: ResultPoint): Point {
-		val point = Point(
-			resultPoint.x.roundToInt(),
-			resultPoint.y.roundToInt()
+	Matrix().apply {
+		// Map ROI from view coordinates to frame coordinates.
+		setTranslate(-viewRect.left.toFloat(), -viewRect.top.toFloat())
+		postScale(1f / viewRect.width(), 1f / viewRect.height())
+		postRotate(-frameMetrics.orientation.toFloat(), .5f, .5f)
+		postScale(frameMetrics.width.toFloat(), frameMetrics.height.toFloat())
+		val frameRoiF = RectF()
+		val viewRoiF = RectF(
+			viewRoi.left.toFloat(),
+			viewRoi.top.toFloat(),
+			viewRoi.right.toFloat(),
+			viewRoi.bottom.toFloat()
 		)
-		rotate(point)
-		val w: Int
-		val h: Int
-		if (isPortrait(frameOrientation)) {
-			w = frameHeight
-			h = frameWidth
-		} else {
-			w = frameWidth
-			h = frameHeight
-		}
-		val ratioX = viewWidth / w.toFloat()
-		val ratioY = viewHeight / h.toFloat()
-		point.set(
-			(point.x * ratioX).roundToInt() + offsetX,
-			(point.y * ratioY).roundToInt() + offsetY
+		mapRect(frameRoiF, viewRoiF)
+		set(
+			frameRoiF.left.roundToInt(),
+			frameRoiF.top.roundToInt(),
+			frameRoiF.right.roundToInt(),
+			frameRoiF.bottom.roundToInt()
 		)
-		return point
-	}
-
-	fun map(points: Array<ResultPoint?>): List<Point> =
-		// because ZXing apparently returns null in this array sometimes
-		points.filterNotNull().map { map(it) }
-
-	private fun rotate(point: Point) = when (frameOrientation) {
-		90 -> point.set(frameHeight - point.y, point.x)
-		180 -> point.set(frameWidth - point.x, frameHeight - point.y)
-		270 -> point.set(point.y, frameWidth - point.x)
-		else -> {
-		}
 	}
 }
+
+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
+		}
+
+		else -> {
+			uprightWidth = frameMetrics.width
+			uprightHeight = frameMetrics.height
+		}
+	}
+	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) {
+			COLOR_BLACK
+		} else {
+			COLOR_WHITE
+		}
+	)
+}
+
+private data class Result(
+	val hasTransparentPixels: Boolean,
+	val backgroundColor: Int
+)

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

@@ -1,4 +1,4 @@
-package de.markusfisch.android.binaryeye.app
+package de.markusfisch.android.binaryeye.io
 
 import android.app.Activity
 import android.content.ContentValues
@@ -9,6 +9,7 @@ import android.provider.MediaStore
 import android.support.annotation.MainThread
 import android.widget.EditText
 import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.app.alertDialog
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
@@ -45,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) {
@@ -74,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/media/Beeps.kt

@@ -0,0 +1,33 @@
+package de.markusfisch.android.binaryeye.media
+
+import android.media.AudioManager
+import android.media.ToneGenerator
+import de.markusfisch.android.binaryeye.app.prefs
+
+private var confirmToneGenerator: ToneGenerator? = null
+private var errorToneGenerator: ToneGenerator? = null
+
+fun beepConfirm() {
+	val tg = confirmToneGenerator ?: ToneGenerator(
+		AudioManager.STREAM_NOTIFICATION,
+		ToneGenerator.MAX_VOLUME
+	)
+	confirmToneGenerator = tg
+	tg.startTone(prefs.beepTone())
+}
+
+fun beepError() {
+	val tg = errorToneGenerator ?: ToneGenerator(
+		AudioManager.STREAM_ALARM,
+		ToneGenerator.MAX_VOLUME
+	)
+	errorToneGenerator = tg
+	tg.startTone(ToneGenerator.TONE_SUP_ERROR)
+}
+
+fun releaseToneGenerators() {
+	confirmToneGenerator?.release()
+	confirmToneGenerator = null
+	errorToneGenerator?.release()
+	errorToneGenerator = null
+}

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

@@ -1,36 +1,39 @@
 package de.markusfisch.android.binaryeye.net
 
-import android.content.Context
-import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.app.toHexString
+import de.markusfisch.android.binaryeye.content.toHexString
 import de.markusfisch.android.binaryeye.database.Scan
-import de.markusfisch.android.binaryeye.widget.toast
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.json.JSONObject
+import java.io.BufferedReader
 import java.io.IOException
+import java.io.InputStream
+import java.io.InputStreamReader
 import java.net.HttpURLConnection
+import java.net.ProtocolException
 import java.net.URL
-import java.net.URLEncoder
 
-fun Scan.sendAsync(context: Context, url: String, type: String) {
+fun Scan.sendAsync(
+	url: String,
+	type: String,
+	callback: (Int?, String?) -> Unit
+) {
 	CoroutineScope(Dispatchers.IO).launch(Dispatchers.IO) {
-		val code = send(url, type)
+		val response = send(url, type)
 		withContext(Dispatchers.Main) {
-			if (code < 200 || code > 299) {
-				context.toast(R.string.background_request_failed)
-			}
+			callback(response.code, response.body)
 		}
 	}
 }
 
-private fun Scan.send(url: String, type: String): Int {
+private fun Scan.send(url: String, type: String): Response {
 	return when (type) {
 		"1" -> request(
 			url + "?" + asUrlArguments()
 		)
+
 		"2" -> request(url) { con ->
 			con.requestMethod = "POST"
 			con.setRequestProperty("Content-Type", "application/x-www-form-urlencoded")
@@ -39,7 +42,8 @@ private fun Scan.send(url: String, type: String): Int {
 				close()
 			}
 		}
-		"3" -> request(url) {  con ->
+
+		"3" -> request(url) { con ->
 			con.requestMethod = "POST"
 			con.setRequestProperty("Content-Type", "application/json")
 			con.outputStream.apply {
@@ -47,35 +51,35 @@ private fun Scan.send(url: String, type: String): Int {
 				close()
 			}
 		}
+
 		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,
+	"format" to format.name,
 	"errorCorrectionLevel" to errorCorrectionLevel,
+	"version" to version,
+	"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() =
@@ -84,15 +88,40 @@ private fun Map<String, String?>.filterNullValues() =
 private fun request(
 	url: String,
 	writer: ((HttpURLConnection) -> Any)? = null
-): Int {
+): Response {
 	var con: HttpURLConnection? = null
 	return try {
 		con = URL(url).openConnection() as HttpURLConnection
+		con.connectTimeout = 5000
 		writer?.invoke(con)
-		con.responseCode
+		val body = con.inputStream.readHead()
+		Response(con.responseCode, body)
+	} catch (e: ProtocolException) {
+		Response(null, e.message)
 	} catch (e: IOException) {
-		-1
+		try {
+			val body = con?.errorStream?.readHead() ?: e.message
+			Response(con?.responseCode, body)
+		} catch (e: IOException) {
+			Response(null, e.message)
+		}
 	} finally {
 		con?.disconnect()
 	}
 }
+
+private fun InputStream.readHead(): String {
+	val sb = StringBuilder()
+	val br = BufferedReader(InputStreamReader(this))
+	var line = br.readLine()
+	var i = 0
+	while (line != null && sb.length < 240) {
+		sb.append(line)
+		line = br.readLine()
+		++i
+	}
+	br.close()
+	return sb.toString()
+}
+
+private data class Response(val code: Int?, val body: String?)

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

@@ -0,0 +1,66 @@
+package de.markusfisch.android.binaryeye.os
+
+import android.content.Context
+import android.os.Build
+import android.os.VibrationEffect
+import android.os.Vibrator
+
+private const val DURATION_IN_MS = 250L
+
+private val beforeO = Build.VERSION.SDK_INT < Build.VERSION_CODES.O
+private val errorPatternTimings = longArrayOf(
+	50L, 100L, 50L, 100L, 50L
+)
+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 (beforeO) {
+		@Suppress("DEPRECATION")
+		vibrate(DURATION_IN_MS)
+	} else {
+		vibrate(
+			VibrationEffect.createOneShot(
+				DURATION_IN_MS,
+				VibrationEffect.DEFAULT_AMPLITUDE
+			)
+		)
+	}
+}
+
+fun Vibrator.error() {
+	if (beforeO) {
+		@Suppress("DEPRECATION")
+		vibrate(errorPatternTimings, -1)
+	} else {
+		vibrate(
+			VibrationEffect.createWaveform(
+				errorPatternTimings,
+				errorPatternAmplitudes,
+				-1
+			)
+		)
+	}
+}

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

@@ -1,18 +1,48 @@
 package de.markusfisch.android.binaryeye.preference
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
+import android.media.ToneGenerator
+import android.os.Build
 import android.preference.PreferenceManager
+import android.support.annotation.RequiresApi
+import de.markusfisch.android.zxingcpp.ZxingCpp.BarcodeFormat
 
 class Preferences {
 	lateinit var preferences: SharedPreferences
 
-	var cropHandleX = -1
+	var barcodeFormats = setOf(
+		BarcodeFormat.AZTEC.name,
+		BarcodeFormat.CODABAR.name,
+		BarcodeFormat.CODE_39.name,
+		BarcodeFormat.CODE_93.name,
+		BarcodeFormat.CODE_128.name,
+		BarcodeFormat.DATA_BAR.name,
+		BarcodeFormat.DATA_BAR_EXPANDED.name,
+		BarcodeFormat.DATA_MATRIX.name,
+		BarcodeFormat.EAN_8.name,
+		BarcodeFormat.EAN_13.name,
+		BarcodeFormat.ITF.name,
+		BarcodeFormat.MAXICODE.name,
+		BarcodeFormat.PDF_417.name,
+		BarcodeFormat.QR_CODE.name,
+		BarcodeFormat.MICRO_QR_CODE.name,
+		BarcodeFormat.RMQR_CODE.name,
+		BarcodeFormat.UPC_A.name,
+		BarcodeFormat.UPC_E.name,
+	)
+		@RequiresApi(Build.VERSION_CODES.HONEYCOMB)
+		set(value) {
+			apply(BARCODE_FORMATS, value)
+			field = value
+		}
+	var cropHandleX = -2 // -2 means set default roi.
 		set(value) {
 			apply(CROP_HANDLE_X, value)
 			field = value
 		}
-	var cropHandleY = -1
+	var cropHandleY = -2
 		set(value) {
 			apply(CROP_HANDLE_Y, value)
 			field = value
@@ -32,18 +62,29 @@ 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
-			commit(AUTO_ROTATE, value)
+			apply(AUTO_ROTATE, value)
 			field = value
 		}
 	var tryHarder = false
 		set(value) {
-			// immediately save this setting because it's only ever read
-			// before the camera is opened
-			commit(TRY_HARDER, value)
+			apply(TRY_HARDER, value)
+			field = value
+		}
+	var bulkMode = false
+		set(value) {
+			apply(BULK_MODE, value)
+			field = value
+		}
+	var bulkModeDelay = "500"
+		set(value) {
+			apply(BULK_MODE_DELAY, value)
+			field = value
+		}
+	var showToastInBulkMode = true
+		set(value) {
+			apply(SHOW_TOAST_IN_BULK_MODE, value)
 			field = value
 		}
 	var vibrate = true
@@ -51,6 +92,16 @@ class Preferences {
 			apply(VIBRATE, value)
 			field = value
 		}
+	var beep = false
+		set(value) {
+			apply(BEEP, value)
+			field = value
+		}
+	var beepToneName = "tone_prop_beep"
+		set(value) {
+			apply(BEEP_TONE_NAME, value)
+			field = value
+		}
 	var useHistory = false
 		set(value) {
 			apply(USE_HISTORY, value)
@@ -81,11 +132,31 @@ 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)
+			field = value
+		}
+	var defaultSearchUrl = ""
+		set(value) {
+			apply(DEFAULT_SEARCH_URL, value)
+			field = value
+		}
 	var openWithUrl: String = ""
 		set(value) {
 			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)
@@ -96,9 +167,21 @@ class Preferences {
 			apply(SEND_SCAN_TYPE, value)
 			field = value
 		}
+	var sendScanBluetooth = false
+		set(value) {
+			apply(SEND_SCAN_BLUETOOTH, value)
+			field = value
+		}
+	var sendScanBluetoothHost: String = ""
+		set(value) {
+			apply(SEND_SCAN_BLUETOOTH_HOST, value)
+			field = value
+		}
 	var customLocale: String = ""
 		set(value) {
-			apply(CUSTOM_LOCALE, value)
+			// Make sure this setting is written immediately because
+			// the app is about to restart.
+			commit(CUSTOM_LOCALE, value)
 			field = value
 		}
 	var indexOfLastSelectedFormat: Int = 0
@@ -106,11 +189,24 @@ class Preferences {
 			apply(INDEX_OF_LAST_SELECTED_FORMAT, value)
 			field = value
 		}
-	var forceCompat: Boolean = false
+	var indexOfLastSelectedEcLevel: Int = 0
 		set(value) {
-			// since the app may be about to crash when forceCompat is set,
-			// it's necessary to `commit()` this synchronously
-			commit(FORCE_COMPAT, value)
+			apply(INDEX_OF_LAST_SELECTED_EC_LEVEL, value)
+			field = value
+		}
+	var lastMargin: Int = -1
+		set(value) {
+			apply(LAST_MARGIN, value)
+			field = value
+		}
+	var freeRotation = true
+		set(value) {
+			apply(FREE_ROTATION, value)
+			field = value
+		}
+	var expandEscapeSequences = true
+		set(value) {
+			apply(EXPAND_ESCAPE_SEQUENCES, value)
 			field = value
 		}
 
@@ -120,17 +216,38 @@ class Preferences {
 	}
 
 	fun update() {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+			preferences.getStringSet(BARCODE_FORMATS, barcodeFormats)?.let {
+				barcodeFormats = it
+			}
+		}
 		cropHandleX = preferences.getInt(CROP_HANDLE_X, cropHandleX)
 		cropHandleY = preferences.getInt(CROP_HANDLE_Y, cropHandleY)
 		cropHandleOrientation = preferences.getInt(
 			CROP_HANDLE_ORIENTATION,
 			cropHandleOrientation
 		)
-		showCropHandle = preferences.getBoolean(SHOW_CROP_HANDLE, showCropHandle)
+		showCropHandle = preferences.getBoolean(
+			SHOW_CROP_HANDLE,
+			showCropHandle
+		)
 		zoomBySwiping = preferences.getBoolean(ZOOM_BY_SWIPING, zoomBySwiping)
 		autoRotate = preferences.getBoolean(AUTO_ROTATE, autoRotate)
 		tryHarder = preferences.getBoolean(TRY_HARDER, tryHarder)
+		bulkMode = preferences.getBoolean(BULK_MODE, bulkMode)
+		bulkModeDelay = preferences.getString(
+			BULK_MODE_DELAY,
+			bulkModeDelay
+		) ?: bulkModeDelay
+		showToastInBulkMode = preferences.getBoolean(
+			SHOW_TOAST_IN_BULK_MODE,
+			showToastInBulkMode
+		)
 		vibrate = preferences.getBoolean(VIBRATE, vibrate)
+		beep = preferences.getBoolean(BEEP, beep)
+		preferences.getString(BEEP_TONE_NAME, beepToneName)?.also {
+			beepToneName = it
+		}
 		useHistory = preferences.getBoolean(USE_HISTORY, useHistory)
 		ignoreConsecutiveDuplicates = preferences.getBoolean(
 			IGNORE_CONSECUTIVE_DUPLICATES,
@@ -146,15 +263,37 @@ 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
+		)
+		preferences.getString(DEFAULT_SEARCH_URL, defaultSearchUrl)?.also {
+			defaultSearchUrl = it
+		}
 		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
 		}
 		preferences.getString(SEND_SCAN_TYPE, sendScanType)?.also {
 			sendScanType = it
 		}
+		sendScanBluetooth = preferences.getBoolean(
+			SEND_SCAN_BLUETOOTH,
+			sendScanBluetooth
+		)
+		preferences.getString(
+			SEND_SCAN_BLUETOOTH_HOST,
+			sendScanBluetoothHost
+		)?.also {
+			sendScanBluetoothHost = it
+		}
 		preferences.getString(CUSTOM_LOCALE, customLocale)?.also {
 			customLocale = it
 		}
@@ -162,15 +301,35 @@ class Preferences {
 			INDEX_OF_LAST_SELECTED_FORMAT,
 			indexOfLastSelectedFormat
 		)
-		forceCompat = preferences.getBoolean(FORCE_COMPAT, forceCompat)
+		indexOfLastSelectedEcLevel = preferences.getInt(
+			INDEX_OF_LAST_SELECTED_EC_LEVEL,
+			indexOfLastSelectedEcLevel
+		)
+		lastMargin = preferences.getInt(
+			LAST_MARGIN,
+			lastMargin
+		)
+		freeRotation = preferences.getBoolean(FREE_ROTATION, freeRotation)
+		expandEscapeSequences = preferences.getBoolean(
+			EXPAND_ESCAPE_SEQUENCES,
+			expandEscapeSequences
+		)
+	}
+
+	fun beepTone() = when (beepToneName) {
+		"tone_cdma_confirm" -> ToneGenerator.TONE_CDMA_CONFIRM
+		"tone_sup_radio_ack" -> ToneGenerator.TONE_SUP_RADIO_ACK
+		"tone_prop_ack" -> ToneGenerator.TONE_PROP_ACK
+		"tone_prop_beep" -> ToneGenerator.TONE_PROP_BEEP
+		"tone_prop_beep2" -> ToneGenerator.TONE_PROP_BEEP2
+		else -> ToneGenerator.TONE_PROP_BEEP
 	}
 
 	private fun put(label: String, value: Boolean) =
 		preferences.edit().putBoolean(label, value)
 
-	private fun commit(label: String, value: Boolean) {
-		put(label, value).commit()
-	}
+	private fun put(label: String, value: String) =
+		preferences.edit().putString(label, value)
 
 	private fun apply(label: String, value: Boolean) {
 		put(label, value).apply()
@@ -184,26 +343,51 @@ class Preferences {
 		preferences.edit().putInt(label, value).apply()
 	}
 
+	@SuppressLint("ApplySharedPref")
+	private fun commit(label: String, value: String) {
+		preferences.edit().putString(label, value).commit()
+	}
+
+	@RequiresApi(Build.VERSION_CODES.HONEYCOMB)
+	private fun apply(label: String, value: Set<String>) {
+		preferences.edit().putStringSet(label, value).apply()
+	}
+
 	companion object {
-		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 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_HEX_DUMP = "show_hex_dump"
-		const val SHOW_META_DATA = "show_meta_data"
-		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 BEEP = "beep"
+		private const val BEEP_TONE_NAME = "beep_tone_name"
+		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 SEND_SCAN_BLUETOOTH = "send_scan_bluetooth"
+		private const val SEND_SCAN_BLUETOOTH_HOST = "send_scan_bluetooth_host"
+		private const val CUSTOM_LOCALE = "custom_locale"
+		private const val INDEX_OF_LAST_SELECTED_FORMAT = "index_of_last_selected_format"
+		private const val INDEX_OF_LAST_SELECTED_EC_LEVEL = "index_of_last_selected_ec_level"
+		private const val LAST_MARGIN = "last_margin"
+		private const val FREE_ROTATION = "free_rotation"
+		private const val EXPAND_ESCAPE_SEQUENCES = "expand_escape_sequences"
 	}
 }

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

@@ -0,0 +1,34 @@
+package de.markusfisch.android.binaryeye.service
+
+import android.annotation.SuppressLint
+import android.app.PendingIntent
+import android.content.Intent
+import android.os.Build
+import android.service.quicksettings.TileService
+import android.support.annotation.RequiresApi
+import de.markusfisch.android.binaryeye.activity.CameraActivity
+
+@RequiresApi(Build.VERSION_CODES.N)
+class ScanTileService : TileService() {
+	override fun onClick() {
+		super.onClick()
+		val intent = Intent(applicationContext, CameraActivity::class.java)
+		intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+		// TileService#startActivityAndCollapse(Intent) is only ever run
+		// below UpsideDownCake, but Lint doesn't understand this yet.
+		@SuppressLint("StartActivityAndCollapseDeprecated")
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+			@Suppress("DEPRECATION")
+			startActivityAndCollapse(intent)
+		} else {
+			startActivityAndCollapse(
+				PendingIntent.getActivity(
+					this,
+					0,
+					intent,
+					PendingIntent.FLAG_IMMUTABLE
+				)
+			)
+		}
+	}
+}

app/src/main/kotlin/de/markusfisch/android/binaryeye/text/Escape.kt

@@ -0,0 +1,76 @@
+package de.markusfisch.android.binaryeye.text
+
+/**
+ * Copyright (c) 2000, Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// This code is based on Google's own implementation:
+// http://www.java2s.com/example/android-utility-method/string-escape/javascriptunescape-string-s-dc359.html
+fun String.unescape(): String {
+	val len = length
+	var i = 0
+	fun String.expand() = when (val ec = get(i++)) {
+		'n' -> '\n'
+		'r' -> '\r'
+		't' -> '\t'
+		'b' -> '\b'
+		'\\', '\"', '\'', '<', '>', '|' -> ec
+		'0', '1', '2', '3', '4', '5', '6', '7' -> {
+			val limit = if (ec < '4') 3 else 2
+			var l = 1
+			--i // Back to index of first digit.
+			while (l < limit &&
+				i + l < len &&
+				get(i + l) in '0'..'7'
+			) {
+				++l
+			}
+			val from = i
+			i += l
+			substring(from, i).toInt(8).toChar()
+		}
+
+		'x', 'u' -> {
+			val l = if (ec == 'u') 4 else 2
+			val hexCode = try {
+				substring(i, i + l)
+			} catch (_: IndexOutOfBoundsException) {
+				throw IllegalArgumentException(
+					"Invalid unicode sequence [${substring(i)}] at index $i"
+				)
+			}
+			val unicodeValue = try {
+				hexCode.toInt(16)
+			} catch (_: NumberFormatException) {
+				throw IllegalArgumentException(
+					"Invalid unicode sequence [$hexCode] at index $i"
+				)
+			}
+			i += l
+			unicodeValue.toChar()
+		}
+
+		else -> throw IllegalArgumentException(
+			"Unknown escape code [$ec] at index $i"
+		)
+	}
+
+	val sb = StringBuilder()
+	while (i < len) {
+		val ch = get(i++)
+		sb.append(if (ch == '\\' && i < len) expand() else ch)
+	}
+	return sb.toString()
+}

app/src/main/kotlin/de/markusfisch/android/binaryeye/view/ScanFeedback.kt

@@ -0,0 +1,38 @@
+package de.markusfisch.android.binaryeye.view
+
+import android.content.Context
+import android.media.AudioManager
+import de.markusfisch.android.binaryeye.app.prefs
+import de.markusfisch.android.binaryeye.media.beepConfirm
+import de.markusfisch.android.binaryeye.media.beepError
+import de.markusfisch.android.binaryeye.os.error
+import de.markusfisch.android.binaryeye.os.getVibrator
+import de.markusfisch.android.binaryeye.os.vibrate
+
+fun Context.scanFeedback() {
+	if (prefs.vibrate) {
+		getVibrator().vibrate()
+	}
+	if (prefs.beep && !isSilent()) {
+		beepConfirm()
+	}
+}
+
+fun Context.errorFeedback() {
+	if (prefs.vibrate) {
+		getVibrator().error()
+	}
+	if (prefs.beep && !isSilent()) {
+		beepError()
+	}
+}
+
+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
+	}
+}

app/src/main/kotlin/de/markusfisch/android/binaryeye/view/SoftKeyboard.kt

@@ -1,4 +1,4 @@
-package de.markusfisch.android.binaryeye.app
+package de.markusfisch.android.binaryeye.view
 
 import android.content.Context
 import android.view.View

app/src/main/kotlin/de/markusfisch/android/binaryeye/view/SystemBars.kt

@@ -1,4 +1,4 @@
-package de.markusfisch.android.binaryeye.app
+package de.markusfisch.android.binaryeye.view
 
 import android.content.Context
 import android.content.ContextWrapper
@@ -20,8 +20,8 @@ val systemBarListViewScrollListener = object : AbsListView.OnScrollListener {
 		visibleItemCount: Int,
 		totalItemCount: Int
 	) {
-		// give Android some time to settle down before running this,
-		// not putting it on the queue makes it only work sometimes
+		// Give Android some time to settle down before running this,
+		// not putting it on the queue makes it only work sometimes.
 		view.post {
 			val scrolled = firstVisibleItem > 0 ||
 					(totalItemCount > 0 && firstChildScrolled(view))
@@ -59,7 +59,7 @@ private fun lastChildOutOfView(listView: AbsListView): Boolean {
 
 fun initSystemBars(activity: AppCompatActivity) {
 	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-		// keeps the soft keyboard from repositioning the layout
+		// Keeps the soft keyboard from repositioning the layout.
 		val window = activity.window
 		window.setSoftInputMode(
 			WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
@@ -109,11 +109,11 @@ fun colorSystemAndToolBars(
 	}
 	activity.supportActionBar?.setBackgroundDrawable(
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-			// avoid allocation on Honeycomb and better
+			// Avoid allocation on Honeycomb and better.
 			actionBarBackground.color = topColor
 			actionBarBackground
 		} else {
-			// ColorDrawable.setColor() doesn't exist pre Honeycomb
+			// ColorDrawable.setColor() doesn't exist pre Honeycomb.
 			ColorDrawable(topColor)
 		}
 	)

app/src/main/kotlin/de/markusfisch/android/binaryeye/view/WindowInsets.kt

@@ -29,10 +29,10 @@ fun View.doOnApplyWindowInsets(f: (View, Rect) -> Unit) {
 			f(v, insetsWithToolbar(insets))
 			insets
 		}
-		// it's important to explicitly request the insets (again) in
+		// It's important to explicitly request the insets (again) in
 		// case the view was created in Fragment.onCreateView() because
 		// setOnApplyWindowInsetsListener() won't fire when the view
-		// isn't attached
+		// isn't attached.
 		requestApplyInsetsWhenAttached()
 	}
 }

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

@@ -4,7 +4,7 @@ import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Rect
 import android.util.AttributeSet
-import de.markusfisch.android.binaryeye.app.colorSystemAndToolBars
+import de.markusfisch.android.binaryeye.view.colorSystemAndToolBars
 import de.markusfisch.android.scalingimageview.widget.ScalingImageView
 
 open class ConfinedScalingImageView : ScalingImageView {

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

@@ -3,7 +3,7 @@ package de.markusfisch.android.binaryeye.widget
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.ScrollView
-import de.markusfisch.android.binaryeye.app.colorSystemAndToolBars
+import de.markusfisch.android.binaryeye.view.colorSystemAndToolBars
 
 class ConfinedScrollView : ScrollView {
 	private var scrollable = false
@@ -23,8 +23,8 @@ class ConfinedScrollView : ScrollView {
 	) {
 		super.onLayout(changed, left, top, right, bottom)
 		if (changed) {
-			// give Android some time to settle down before running this,
-			// not putting it on the queue makes it only work sometimes
+			// Give Android some time to settle down before running this,
+			// not putting it on the queue makes it only work sometimes.
 			post {
 				getChildAt(0)?.also { child ->
 					scrollable = height < child.height + paddingTop + paddingBottom

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

@@ -6,12 +6,12 @@ import android.graphics.*
 import android.os.Build
 import android.os.Parcel
 import android.os.Parcelable
+import android.support.v4.content.ContextCompat
 import android.util.AttributeSet
 import android.view.MotionEvent
 import android.view.View
 import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.app.prefs
-import de.markusfisch.android.binaryeye.graphics.Dots
 import de.markusfisch.android.binaryeye.graphics.getBitmapFromDrawable
 import de.markusfisch.android.binaryeye.graphics.getDashedBorderPaint
 import kotlin.math.abs
@@ -20,18 +20,23 @@ import kotlin.math.min
 import kotlin.math.roundToInt
 
 class DetectorView : View {
-	val currentOrientation = resources.configuration.orientation
+	val coordinates = FloatArray(32)
 	val roi = Rect()
 
 	var onRoiChange: (() -> Unit)? = null
 	var onRoiChanged: (() -> Unit)? = null
 
-	private val dots = Dots(context)
+	private val currentOrientation = resources.configuration.orientation
 	private val invalidateRunnable: Runnable = Runnable {
-		marks = null
+		coordinatesLast = 0
 		invalidate()
 	}
 	private val roiPaint = context.getDashedBorderPaint()
+	private val dotPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+		color = ContextCompat.getColor(context, R.color.dot)
+		style = Paint.Style.FILL
+	}
+	private val dotRadius: Float
 	private val handleBitmap = resources.getBitmapFromDrawable(
 		R.drawable.button_crop
 	)
@@ -47,7 +52,7 @@ class DetectorView : View {
 	private val fabHeight: Int
 	private val padding: Int
 
-	private var marks: List<Point>? = null
+	private var coordinatesLast = 0
 	private var handleGrabbed = false
 	private var handleActive = false
 	private var minY = 0
@@ -57,6 +62,7 @@ class DetectorView : View {
 
 	init {
 		val dp = context.resources.displayMetrics.density
+		dotRadius = 8f * dp
 		distToFull = (24f * dp).roundToInt()
 		val minMoveThreshold = (8f * dp).roundToInt()
 		minMoveThresholdSq = minMoveThreshold * minMoveThreshold
@@ -72,25 +78,41 @@ class DetectorView : View {
 	constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) :
 			super(context, attrs, defStyleAttr)
 
-	fun setCropHandlePos(x: Int, y: Int, orientation: Int) {
-		if (orientation == currentOrientation) {
-			handlePos.set(x, y)
-		} else {
-			handlePos.set(y, x)
-		}
-		if (x > -1) {
-			handleActive = true
-		}
+	fun saveCropHandlePos() {
+		val pos = getCropHandlePos()
+		prefs.cropHandleX = pos.x
+		prefs.cropHandleY = pos.y
+		prefs.cropHandleOrientation = currentOrientation
 	}
 
-	fun getCropHandlePos() = if (handleActive) {
+	private fun getCropHandlePos() = if (handleActive) {
 		handlePos
 	} else {
 		Point(-1, -1)
 	}
 
-	fun mark(points: List<Point>) {
-		marks = points
+	fun restoreCropHandlePos() {
+		setCropHandlePos(
+			prefs.cropHandleX,
+			prefs.cropHandleY,
+			prefs.cropHandleOrientation
+		)
+	}
+
+	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)
+		}
+		handleActive = handlePos.x > -1
+	}
+
+	fun update(numberOfCoordinates: Int) {
+		coordinatesLast = numberOfCoordinates
 		invalidate()
 		removeCallbacks(invalidateRunnable)
 		postDelayed(invalidateRunnable, 500)
@@ -140,11 +162,12 @@ class DetectorView : View {
 					false
 				}
 			}
+
 			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()
@@ -154,6 +177,7 @@ class DetectorView : View {
 					false
 				}
 			}
+
 			MotionEvent.ACTION_CANCEL -> {
 				if (handleGrabbed) {
 					snap(x, y)
@@ -161,11 +185,11 @@ class DetectorView : View {
 				}
 				false
 			}
+
 			MotionEvent.ACTION_UP -> {
 				if (handleGrabbed) {
 					if (!handleActive) {
 						setHandleToDefaultRoi()
-						handleActive = true
 					} else {
 						snap(x, y)
 					}
@@ -178,6 +202,7 @@ class DetectorView : View {
 				}
 				false
 			}
+
 			else -> super.onTouchEvent(event)
 		}
 	}
@@ -188,6 +213,7 @@ class DetectorView : View {
 			(center.x + mn).roundToInt(),
 			(center.y + mn).roundToInt()
 		)
+		handleActive = true
 	}
 
 	private fun snap(x: Int, y: Int) {
@@ -195,10 +221,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)
 		) {
@@ -227,6 +253,9 @@ class DetectorView : View {
 			width - handleXRadius - paddingRight - padding,
 			height - handleYRadius - paddingBottom - fabHeight
 		)
+		if (handlePos.x == -2) {
+			setHandleToDefaultRoi()
+		}
 		if (handleActive) {
 			updateClipRect()
 		} else {
@@ -236,30 +265,35 @@ class DetectorView : View {
 
 	override fun onDraw(canvas: Canvas) {
 		if (handleActive) {
-			drawClip(canvas)
-		}
-		marks?.let {
-			dots.draw(canvas, it)
+			canvas.drawClip()
 		}
+		canvas.drawDots()
 		if (prefs.showCropHandle) {
-			canvas.drawBitmap(
-				handleBitmap,
-				(handlePos.x - handleXRadius).toFloat(),
-				(handlePos.y - handleYRadius).toFloat(),
-				null
+			canvas.drawHandle()
+		}
+	}
+
+	private fun Canvas.drawDots() {
+		var i = 0
+		while (i < coordinatesLast) {
+			drawCircle(
+				coordinates[i++],
+				coordinates[i++],
+				dotRadius,
+				dotPaint
 			)
 		}
 	}
 
-	private fun drawClip(canvas: Canvas) {
+	private fun Canvas.drawClip() {
 		if (minDist < 1) {
 			return
 		}
-		// canvas.clipRect() doesn't work reliably below KITKAT
+		// 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(),
@@ -269,13 +303,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/widget/Toast.kt

@@ -4,13 +4,19 @@ import android.content.Context
 import android.widget.Toast
 
 fun Context.toast(message: Int) = Toast.makeText(
-	this,
+	applicationContext,
 	message,
 	Toast.LENGTH_LONG
 ).show()
 
 fun Context.toast(message: String) = Toast.makeText(
-	this,
-	message,
+	applicationContext,
+	message.ellipsize(128),
 	Toast.LENGTH_LONG
 ).show()
+
+private fun String.ellipsize(max: Int) = if (length < max) {
+	this
+} else {
+	"${take(max)}…"
+}

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

@@ -1,233 +0,0 @@
-package de.markusfisch.android.binaryeye.zxing
-
-import android.graphics.Bitmap
-import com.google.zxing.*
-import com.google.zxing.common.HybridBinarizer
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
-import java.util.*
-
-class Zxing(possibleResultPoint: ResultPointCallback? = null) {
-	private val hints = EnumMap<DecodeHintType, Any>(DecodeHintType::class.java)
-	private val multiFormatReader = MultiFormatReader()
-
-	init {
-		val decodeFormats = EnumSet.noneOf<BarcodeFormat>(
-			BarcodeFormat::class.java
-		)
-		decodeFormats.addAll(
-			EnumSet.copyOf(
-				listOf(
-					BarcodeFormat.AZTEC,
-					BarcodeFormat.CODABAR,
-					BarcodeFormat.CODE_39,
-					BarcodeFormat.CODE_93,
-					BarcodeFormat.CODE_128,
-					BarcodeFormat.DATA_MATRIX,
-					BarcodeFormat.EAN_8,
-					BarcodeFormat.EAN_13,
-					BarcodeFormat.ITF,
-					BarcodeFormat.MAXICODE,
-					BarcodeFormat.PDF_417,
-					BarcodeFormat.QR_CODE,
-					BarcodeFormat.RSS_14,
-					BarcodeFormat.RSS_EXPANDED,
-					BarcodeFormat.UPC_A,
-					BarcodeFormat.UPC_E,
-					BarcodeFormat.UPC_EAN_EXTENSION
-				)
-			)
-		)
-		hints[DecodeHintType.POSSIBLE_FORMATS] = decodeFormats
-		possibleResultPoint?.let {
-			hints[DecodeHintType.NEED_RESULT_POINT_CALLBACK] = it
-		}
-	}
-
-	fun updateHints(tryHarder: Boolean) {
-		if (tryHarder) {
-			hints[DecodeHintType.TRY_HARDER] = java.lang.Boolean.TRUE
-		} else {
-			hints.remove(DecodeHintType.TRY_HARDER)
-		}
-	}
-
-	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: ReaderException) {
-			null
-		} finally {
-			multiFormatReader.reset()
-		}
-	}
-
-	companion object {
-		private const val BLACK = 0xff000000.toInt()
-		private const val WHITE = 0xffffffff.toInt()
-
-		fun encodeAsBitmap(
-			text: String,
-			format: BarcodeFormat,
-			width: Int,
-			height: Int,
-			errorCorrectionLevel: ErrorCorrectionLevel? = null
-		): Bitmap? {
-			val hints = EnumMap<EncodeHintType, Any>(EncodeHintType::class.java)
-			hints[EncodeHintType.CHARACTER_SET] = "utf-8"
-			errorCorrectionLevel?.let {
-				hints[EncodeHintType.ERROR_CORRECTION] = it
-			}
-			val result = MultiFormatWriter().encode(
-				text,
-				format,
-				width,
-				height,
-				hints
-			)
-			val w = result.width
-			val h = result.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 (result.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,
-			width: Int,
-			height: Int,
-			errorCorrectionLevel: ErrorCorrectionLevel? = null
-		): String {
-			val hints = EnumMap<EncodeHintType, Any>(EncodeHintType::class.java)
-			hints[EncodeHintType.CHARACTER_SET] = "utf-8"
-			errorCorrectionLevel?.let {
-				hints[EncodeHintType.ERROR_CORRECTION] = it
-			}
-			val result = MultiFormatWriter().encode(
-				text,
-				format,
-				0,
-				0,
-				hints
-			)
-			val sb = StringBuilder()
-			sb.append("<svg width=\"$width\" height=\"$height\"")
-			sb.append(" viewBox=\"0 0 $width $height\"")
-			sb.append(" xmlns=\"http://www.w3.org/2000/svg\">\n")
-			val w = result.width
-			val h = result.height
-			val xf = width.toFloat() / w
-			val yf = height.toFloat() / h
-			for (y in 0 until h) {
-				for (x in 0 until w) {
-					if (result.get(x, y)) {
-						sb.append("<rect x=\"${x * xf}\" y=\"${y * yf}\"")
-						sb.append(" width=\"$xf\" height=\"$yf\"/>\n")
-					}
-				}
-			}
-			sb.append("</svg>\n")
-			return sb.toString()
-		}
-
-		fun encodeAsTxt(
-			text: String,
-			format: BarcodeFormat,
-			errorCorrectionLevel: ErrorCorrectionLevel? = null
-		): String {
-			val hints = EnumMap<EncodeHintType, Any>(EncodeHintType::class.java)
-			hints[EncodeHintType.CHARACTER_SET] = "utf-8"
-			errorCorrectionLevel?.let {
-				hints[EncodeHintType.ERROR_CORRECTION] = it
-			}
-			val result = MultiFormatWriter().encode(
-				text,
-				format,
-				0,
-				0,
-				hints
-			)
-			val w = result.width
-			val h = result.height
-			val sb = StringBuilder()
-			for (y in 0 until h) {
-				for (x in 0 until w) {
-					sb.append(if (result.get(x, y)) "█" else " ")
-				}
-				sb.append("\n")
-			}
-			return sb.toString()
-		}
-	}
-}

app/src/main/res/drawable-anydpi-v26/ic_shortcut_decode_foreground.xml

@@ -1,12 +1,4 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:pathData="M54,55.787m-5.719,0a5.719,5.719 0,1 1,11.438 0a5.719,5.719 0,1 1,-11.438 0"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M48.639,37.916L45.368,41.491L39.703,41.491C37.738,41.491 36.129,43.099 36.129,45.065L36.129,66.509C36.129,68.475 37.738,70.084 39.703,70.084L68.297,70.084C70.262,70.084 71.871,68.475 71.871,66.509L71.871,45.065C71.871,43.099 70.262,41.491 68.297,41.491L62.632,41.491L59.361,37.916ZM54,64.722C49.068,64.722 45.065,60.719 45.065,55.787C45.065,50.855 49.068,46.852 54,46.852C58.932,46.852 62.935,50.855 62.935,55.787C62.935,60.719 58.932,64.722 54,64.722Z"
-      android:fillColor="#ffffff"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="108dp" android:height="108dp" android:viewportWidth="108" android:viewportHeight="108">
+    <path android:pathData="M48.281 55.787a5.719 5.719 0 1 1 11.438 0 5.719 5.719 0 1 1-11.438 0" android:fillColor="#ffffff"/>
+    <path android:pathData="M48.639 37.916l-3.271 3.575h-5.665c-1.965 0-3.574 1.608-3.574 3.574v21.444c0 1.966 1.609 3.575 3.574 3.575h28.594c1.965 0 3.574-1.609 3.574-3.575V45.065c0-1.966-1.609-3.574-3.574-3.574h-5.665l-3.271-3.575zM54 64.722c-4.932 0-8.935-4.003-8.935-8.935s4.003-8.935 8.935-8.935 8.935 4.003 8.935 8.935-4.003 8.935-8.935 8.935z" android:fillColor="#ffffff"/>
 </vector>

app/src/main/res/drawable-anydpi-v26/ic_shortcut_encode_foreground.xml

@@ -1,9 +1,3 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:pathData="M69.75,56.25L56.25,56.25L56.25,69.75L51.75,69.75L51.75,56.25L38.25,56.25L38.25,51.75L51.75,51.75L51.75,38.25L56.25,38.25L56.25,51.75L69.75,51.75Z"
-      android:fillColor="#FFFFFF"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="108dp" android:height="108dp" android:viewportWidth="108" android:viewportHeight="108">
+    <path android:pathData="M69.75 56.25h-13.5v13.5h-4.5v-13.5h-13.5v-4.5h13.5v-13.5h4.5v13.5h13.5z" android:fillColor="#FFFFFF"/>
 </vector>

app/src/main/res/drawable-anydpi-v26/ic_shortcut_preferences_foreground.xml

@@ -1,9 +1,3 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:pathData="M70.057,56.114C70.147,55.439 70.192,54.742 70.192,54C70.192,53.281 70.147,52.561 70.034,51.886L74.6,48.333C75.005,48.018 75.117,47.411 74.87,46.961L70.552,39.495C70.282,39 69.72,38.843 69.225,39L63.85,41.159C62.726,40.305 61.534,39.585 60.207,39.045L59.397,33.333C59.307,32.793 58.858,32.411 58.318,32.411L49.682,32.411C49.142,32.411 48.715,32.793 48.625,33.333L47.816,39.045C46.489,39.585 45.274,40.327 44.172,41.159L38.798,39C38.303,38.82 37.741,39 37.471,39.495L33.175,46.961C32.906,47.433 32.996,48.018 33.445,48.333L38.011,51.886C37.898,52.561 37.808,53.303 37.808,54C37.808,54.697 37.853,55.439 37.966,56.114L33.4,59.667C32.996,59.982 32.883,60.589 33.13,61.039L37.448,68.505C37.718,69 38.28,69.158 38.775,69L44.15,66.841C45.274,67.696 46.466,68.415 47.793,68.955L48.603,74.667C48.715,75.207 49.142,75.589 49.682,75.589L58.318,75.589C58.858,75.589 59.307,75.207 59.375,74.667L60.184,68.955C61.511,68.415 62.726,67.696 63.828,66.841L69.202,69C69.697,69.18 70.259,69 70.529,68.505L74.847,61.039C75.117,60.544 75.005,59.982 74.577,59.667ZM54,62.096C49.547,62.096 45.904,58.453 45.904,54C45.904,49.547 49.547,45.904 54,45.904C58.453,45.904 62.096,49.547 62.096,54C62.096,58.453 58.453,62.096 54,62.096Z"
-      android:fillColor="#ffffff"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="108dp" android:height="108dp" android:viewportWidth="108" android:viewportHeight="108">
+    <path android:pathData="M70.057 56.114c0.09-0.675 0.135-1.372 0.135-2.114 0-0.719-0.045-1.439-0.158-2.114l4.566-3.553c0.405-0.315 0.517-0.922 0.27-1.372l-4.318-7.466C70.282 39 69.72 38.843 69.225 39l-5.375 2.159c-1.124-0.854-2.316-1.574-3.643-2.114l-0.81-5.712c-0.09-0.54-0.539-0.922-1.079-0.922h-8.636c-0.54 0-0.967 0.382-1.057 0.922l-0.809 5.712c-1.327 0.54-2.542 1.282-3.644 2.114L38.798 39c-0.495-0.18-1.057 0-1.327 0.495l-4.296 7.466c-0.269 0.472-0.179 1.057 0.27 1.372l4.566 3.553c-0.113 0.675-0.203 1.417-0.203 2.114 0 0.697 0.045 1.439 0.158 2.114L33.4 59.667c-0.404 0.315-0.517 0.922-0.27 1.372l4.318 7.466C37.718 69 38.28 69.158 38.775 69l5.375-2.159c1.124 0.855 2.316 1.574 3.643 2.114l0.81 5.712c0.112 0.54 0.539 0.922 1.079 0.922h8.636c0.54 0 0.989-0.382 1.057-0.922l0.809-5.712c1.327-0.54 2.542-1.259 3.644-2.114L69.202 69c0.495 0.18 1.057 0 1.327-0.495l4.318-7.466c0.27-0.495 0.158-1.057-0.27-1.372zM54 62.096c-4.453 0-8.096-3.643-8.096-8.096s3.643-8.096 8.096-8.096 8.096 3.643 8.096 8.096-3.643 8.096-8.096 8.096z" android:fillColor="#ffffff"/>
 </vector>