Advance version number to 1.46.0

To open the app from web links.

CHANGELOG.md

@@ -1,6 +1,176 @@
 # Change Log
 
-# 1.25.0
+## 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
+* Support setting the error correction level when creating QR Codes
+* Support setting a custom deviating locale
+* Use adaptive icons for shortcut icons
+* Add exporting barcodes as plain text
+* Add Ukrainian translation
+* Add Turkish translation
+* Add Georgian translation
+* Update Indonesian translation
+* Update Russian translation
+* Update Italian translation
+* Update Simplified Chinese translation
+
+## 1.34.0
+* Use Material Design settings with headers
+* Add a setting to choose the message type when forwarding scanned content
+
+## 1.33.0
+* Add a setting to automatically send the scanned content to a custom URL
+* Add a setting to automatically put contents into clipboard
+* Add an explicit button to copy WiFi password into clipboard
+* Update Indonesian translation
+
+## 1.32.1
+* Alternatively remove region of interest by dragging handle to a screen corner
+* Restrict region of interest to screen space
+* Remove extra action item to create barcode
+
+## 1.32.0
+* Add bulk mode
+* Remember region of interest permanently
+* Export generated barcode as SVG
+* Run detection on images in background
+* Remove a scan from result view
+* Update Indonesian translation
+
+## 1.31.0
+* Stop detection while region of interest is modified
+* Fix resetting region of interest
+* Add Polish translation
+
+## 1.30.1
+* Improve usability of cropping limiter
+* Draw round corners around region of interest
+* Update Indonesian translation
+
+## 1.30.0
+* Add a handle to define a region of interest
+* Add a setting to show/hide cropping limiter
+* Add support for VCALENDAR types
+* Add spanish translation
+* Add copy to clipboard button to context menu in history listing
+* Make history actions work on current listing only
+* Keep camera selection over orientation changes
+
+## 1.29.0
+* Add a setting to enable reading of vertical 1D barcodes
+
+## 1.28.0
+* Share history as CSV and JSON too
+* Export history in JSON format
+* Update Indonesian translation
+* Fix initializing of RenderScript automatically
+* Fix highlighting after landscape to landscape rotations
+
+## 1.27.1
+* Update Russian translation
+* Force compat mode if native RenderScript crashed
+
+## 1.27.0
+* Export SQLite database
+* Improve order of preferences
+* Update Italian translation
+
+## 1.26.0
+* Zoom in & out by swiping vertically in camera view
+* Add a setting for swipe to zoom feature
+* Optimize vector drawables
+* Update Indonesian translation
+
+## 1.25.1
+* Fix Proguard configuration
+
+## 1.25.0
 * Add giving scans individual names in history listing
 * Add searching the history
 * Add a setting to search harder for barcodes
@@ -15,7 +185,7 @@
 * Fix saving external files on Android Q+
 * Fix order of metadata items
 
-# 1.24.0
+## 1.24.0
 * Show barcode metadata
 * Add a setting to show/hide metadata
 * Include metadata in CSV export
@@ -23,37 +193,37 @@
 * Fix resetting flash button
 * Fix CSV export for Android Q
 
-# 1.23.0
+## 1.23.0
 * Add a setting to not save consecutive double scans
 * Add a setting to show/hide hex dump
 * Limit history items to just one line
 * Fix window insets for consecutive screens
 
-# 1.22.3
+## 1.22.3
 * Fix broken RenderScript built
 
-# 1.22.2
+## 1.22.2
 * Fix getting window insets for Android Lollipop and above
 
-# 1.22.1
+## 1.22.1
 * Ensure non-printable content is saved as raw data
 
-# 1.22.0
+## 1.22.0
 * Highlight detected barcodes in camera view
 * Add bing and yandex search engines
 * Update Chinese Translation
 * Update Italian translation
 * Update Indonesian translation
 
-# 1.21.0
+## 1.21.0
 * Save and restore history list state
 * Improve scanning from large images
 * Fix opening image files by "Open with"
 
-# 1.20.1
+## 1.20.1
 * Fix window insets below Android Lollipop
 
-# 1.20.0
+## 1.20.0
 * Scroll content below tool and system bars
 * Preset file name to save with format and content
 * Add encode menu item to make encoding easier when keyboard is visible
@@ -64,28 +234,28 @@
 * Fix returning result for ZXing's SCAN intent again
 * Fix transfering barcode format from history
 
-# 1.19.0
+## 1.19.0
 * Allow scaling a new barcode to half its size
 * Remember last selected barcode format
 
-# 1.18.0
+## 1.18.0
 * Make open URL default action after decoding a barcode
 * Add a setting to open contents without inspection
 * Highlight codes for picking in shared/loaded images
 * Improve visability of crop border
 * Fix returning result for ZXing's SCAN intent
 
-# 1.17.1
+## 1.17.1
 * Fix navigating back without choosing an image
 
-# 1.17.0
+## 1.17.0
 * Pinch/Zoom shared/loaded images to scan just a section
 * Add a load file menu item to load an image file
 * Add a save file menu item to the barcode view
 * Use discrete style for size seek bar
 * Fix bar transparency when zooming/pinching
 
-# 1.16.0
+## 1.16.0
 * Improve displaying scanned barcodes
 * Show a message if a barcode cannot be shared
 * Fix setting system bar transparency when double taping a barcode
@@ -94,36 +264,36 @@
 * Update Indonesian translation
 * Update Italian translation
 
-# 1.15.0
+## 1.15.0
 * Additionally export history as CSV file
 * Color tool and system bars when a view is scrolled
 * Add an intent filter for opening images
 * Add Russian translation
 
-# 1.14.0
+## 1.14.0
 * Add OTP support
 * Update Indonesian translation
 
-# 1.13.1
+## 1.13.1
 * Fix crash caused by missing support for Regex on Android < 6
 
-# 1.13.0
+## 1.13.0
 * Add missing extras for ZXing result intents
 
-# 1.12.0
+## 1.12.0
 * Add preferences dialog and the option to use a custom URL with read contents
 * Add Brazilian Portuguese translation
 * Add Chinese translation
 * Encode text using UTF-8 encoding when creating a barcode
 
-# 1.11.2
+## 1.11.2
 * Downgrade ZXing version
 * Improve getting system UI metrics
 
-# 1.11.1
+## 1.11.1
 * Fix tap to focus on some devices
 
-# 1.11.0
+## 1.11.0
 * Add support for VCard and VEvent barcodes contents
 * Generated barcodes are now zoomable
 * Fix creating PDF417 barcodes

Makefile

@@ -23,6 +23,19 @@ 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}'
+
 install:
 	adb $(TARGET) install -r app/build/outputs/apk/debug/app-debug.apk
 
@@ -33,8 +46,14 @@ start:
 uninstall:
 	adb $(TARGET) uninstall $(PACKAGE).debug
 
+meminfo:
+	adb shell dumpsys meminfo $(PACKAGE).debug
+
 images:
 	svg/update.sh
 
+avocado:
+	avocado $(shell fgrep -rl '<vector' app/src/main/res)
+
 clean:
 	./gradlew clean

PRIVACY.md

@@ -4,3 +4,50 @@ Binary Eye does not collect any personal information.
 
 If you have any questions or suggestions about my Privacy Policy, do not
 hesitate to contact me.
+
+## Permissions
+
+### [ACCESS_FINE_LOCATION](https://developer.android.com/reference/android/Manifest.permission#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]
+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)
+
+Required to read a barcode from the camera image.
+
+### [INTERNET](https://developer.android.com/reference/android/Manifest.permission#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)
+
+Required to vibrate on detection.
+
+### [WRITE_EXTERNAL_STORAGE](https://developer.android.com/reference/android/Manifest.permission#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)
+
+Required to add a WiFi network from a barcode (usually a QR Code).
+
+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)
+
+Required to add a WiFi network from a barcode (usually a QR Code).
+
+Before Android Q, this feature requires using
+[WifiManager.getConfiguredNetworks][configuredNetworks]
+which requires `ACCESS_WIFI_STATE`.
+
+[configuredNetworks]: https://developer.android.com/reference/android/net/wifi/WifiManager#getConfiguredNetworks()
+[addNetworkSuggestions]: https://developer.android.com/reference/android/net/wifi/WifiManager#addNetworkSuggestions(java.util.List%3Candroid.net.wifi.WifiNetworkSuggestion%3E)

README.md

@@ -12,15 +12,14 @@ library.
 
 ## Screenshots
 
-<img
-	src="https://raw.githubusercontent.com/markusfisch/BinaryEye/gh-pages/screencap-scanning.png"
-	alt="Screenshot Scanning" width="160"/>
-<img
-	src="https://raw.githubusercontent.com/markusfisch/BinaryEye/gh-pages/screencap-decoded.png"
-	alt="Screenshot Result" width="160"/>
-<img
-	src="https://raw.githubusercontent.com/markusfisch/BinaryEye/gh-pages/screencap-compose-barcode.png"
-	alt="Screenshot Compose Barcode" width="160"/>
+<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/screencap-scanning.png"
+	alt="Screenshot Gallery" width="160"/>
+<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/screencap-scanning-cropped.png"
+	alt="Screenshot Gallery" width="160"/>
+<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/screencap-decoded.png"
+	alt="Screenshot Theme" width="160"/>
+<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/screencap-compose-barcode.png"
+	alt="Screenshot Editor" width="160"/>
 
 ## Download
 
@@ -40,7 +39,8 @@ ZXing can read the following barcode formats:
 * [EAN 8][ean_8]
 * [EAN 13][ean_13]
 * [ITF][itf]
-* [MAXICODE][maxicode]
+* [MAXICODE][maxicode] (only when unrotated and unskewed, see [77][77],
+	because of which Binary Eye *cannot* read this barcode)
 * [PDF417][pdf417]
 * [QR CODE][qr_code]
 * [RSS 14][rss]
@@ -64,6 +64,83 @@ ZXing can generate the following barcode formats:
 * [QR CODE][qr_code]
 * [UPC A][upc_a]
 
+## Deep Links and Intents
+
+### Deep Links
+
+You can invoke Binary Eye with a web URI intent from anything that can
+open URIs. There are two options:
+
+1. [binaryeye://scan](binaryeye://scan)
+2. [http(s)://markusfisch.de/BinaryEye](http://markusfisch.de/BinaryEye)
+
+If you want to get the scanned contents, you can add a `ret` query
+argument with a (URL encoded) URI template. For example:
+
+[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})
+
+Supported symbols are:
+
+* `RESULT` - scanned content
+* `RESULT_BYTES` - raw result as a hex string
+* `FORMAT` - barcode format
+* `META` - the meta data, if available
+
+### SCAN Intent
+
+You can also use Binary Eye from other apps by using the
+`com.google.zxing.client.android.SCAN` Intent with `startActivityForResult()`
+like this:
+
+	startActivityForResult(
+		Intent("com.google.zxing.client.android.SCAN"),
+		SOME_NUMBER
+	)
+
+And process the result in `onActivityResult()` of your `Activity`:
+
+	override fun onActivityResult(
+		requestCode: Int,
+		resultCode: Int,
+		data: Intent?
+	) {
+		when (requestCode) {
+			SOME_NUMBER -> if (resultCode == RESULT_OK) {
+				val result = data.getStringExtra("SCAN_RESULT")
+				…
+			}
+		}
+	}
+
+## RenderScript
+
+This app uses [RenderScript][rs] to resize and rotate the camera image.
+Unfortunately, RenderScript has some nasty gotchas.
+
+### RenderScript.forceCompat()
+
+It's necessary to call `RenderScript.forceCompat()` on some devices/roms.
+
+`RenderScript.forceCompat()` needs to be run before any other RenderScript
+function and unfortunately there is no way to know if invoking `forceCompat()`
+is necessary or not.
+
+If `RenderScript.forceCompat()` is necessary, a `RSRuntimeException` will
+be thrown and the only option is to restart the app, this time with calling
+`forceCompat()` first.
+
+Calling `RenderScript.forceCompat()` means the processing is done in
+software so you probably don't want to enable it by default.
+
+### 2D barcodes
+
+If you want to fork this and are only interested in reading 2D barcodes
+(like QR or Aztec), you may want to remove the custom rotation kernel
+altogether as ZXing can read 2D barcodes in any orientation.
+
+This will make your app a bit simpler and saves you from compiling a
+custom RenderScript kernel for each architecture you want to support.
+
 [play]: https://play.google.com/store/search?q=barcode%20scanner&c=apps
 [zxing]: https://github.com/zxing/zxing
 [kotlin]: http://kotlinlang.org/
@@ -83,3 +160,5 @@ ZXing can generate the following barcode formats:
 [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

app/build.gradle

@@ -9,17 +9,16 @@ android {
 		minSdkVersion 9
 		targetSdkVersion sdk_version
 
-		versionCode 58
-		versionName '1.25.0'
+		versionCode 87
+		versionName '1.46.0'
 
-		// it's recommended to set this value to the lowest API level
-		// able to provide all the functionality
+		// 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'
-
-		buildConfigField 'boolean', 'IS_CATALINA', is_catalina.toString()
 	}
 
 	signingConfigs {
@@ -51,10 +50,22 @@ android {
 		}
 	}
 
+	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
+		}
+	}
+
 	lintOptions {
-		// because at the time of writing, even the latest version
+		// Because at the time of writing, even the latest version
 		// of RenderScript is raising this error no matter if
-		// renderscriptTargetApi matches targetSdkVersion
+		// renderscriptTargetApi matches targetSdkVersion.
 		disable 'GradleCompatible'
 	}
 }
@@ -72,9 +83,11 @@ dependencies {
 	implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.2"
 	implementation "com.android.support:appcompat-v7:$support_version"
 	implementation "com.android.support:design:$support_version"
+	implementation "com.android.support:preference-v7:$support_version"
+	implementation "com.android.support:preference-v14:$support_version"
 	// Do NOT upgrade ZXing because newer versions won't work on API < 24
 	// https://github.com/zxing/zxing/issues/1170
 	implementation 'com.google.zxing:core:3.3.3'
-	implementation 'com.github.markusfisch:CameraView:1.8.4'
-	implementation 'com.github.markusfisch:ScalingImageView:1.2.0'
+	implementation 'com.github.markusfisch:CameraView:1.9.1'
+	implementation 'com.github.markusfisch:ScalingImageView:1.3.0'
 }

app/proguard-rules.pro

@@ -1,4 +1,6 @@
 -dontwarn com.google.**
+-dontwarn android.support.v7.**
 -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,14 +1,15 @@
 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)
@@ -19,33 +20,89 @@ class PreprocessorTest {
 		val assets = InstrumentationRegistry.getInstrumentation()
 			.context.assets
 		val pattern = Pattern.compile(
-			"[0-9]+-([0-9]+)x([0-9]+)-([0-9]+)deg.yuv"
+			"[0-9]+-([0-9]+)deg.jpg"
 		)
-		val files = assets.list("yuv") ?: return
-		for (file in files) {
-			val m = pattern.matcher(file)
-			if (!m.find() || m.groupCount() < 3) {
-				continue
+		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 frameWidth = m.group(1) ?: return
-			val frameHeight = m.group(2) ?: return
-			val frameOrientation = m.group(3) ?: return
-			val frameData = assets.open("yuv/$file").readBytes()
-			val preprocessor = Preprocessor(
+			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(),
-				frameWidth.toInt(),
-				frameHeight.toInt(),
-				frameOrientation.toInt()
 			)
-			preprocessor.process(frameData)
-			val result = zxing.decode(
-				frameData,
-				preprocessor.outWidth,
-				preprocessor.outHeight
+			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 $file" }
+			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/main/AndroidManifest.xml

@@ -5,17 +5,33 @@
 	<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.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-permission android:name="android.permission.ACCESS_WIFI_STATE"
+		android:maxSdkVersion="28"/>
 	<uses-feature android:name="android.hardware.camera"/>
 	<uses-feature android:name="android.hardware.camera.autofocus"/>
+	<uses-sdk tools:overrideLibrary="android.support.v14.preference"/>
+	<queries>
+		<intent>
+			<action android:name="android.intent.action.VIEW"/>
+			<data android:scheme="https"/>
+		</intent>
+		<intent>
+			<action android:name="android.intent.action.VIEW"/>
+			<data android:scheme="http"/>
+		</intent>
+	</queries>
 	<application
 		tools:ignore="UnusedAttribute"
 		android:name=".app.BinaryEyeApp"
+		android:usesCleartextTraffic="true"
 		android:allowBackup="true"
 		android:fullBackupContent="@xml/backup_rules"
 		android:supportsRtl="true"
@@ -51,10 +67,16 @@
 				<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:scheme="http"
+					android:host="markusfisch.de"
+					android:pathPrefix="/BinaryEye"/>
+				<data android:scheme="https" />
+			</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
@@ -76,6 +98,15 @@
 			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: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/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.widget.toast
 
 interface IAction {
@@ -21,7 +21,7 @@ abstract class IntentAction : IAction {
 		val intent = createIntent(context, data) ?: return context.toast(
 			errorMsg
 		)
-		execShareIntent(context, intent)
+		context.execShareIntent(intent)
 	}
 
 	abstract suspend fun createIntent(context: Context, data: ByteArray): Intent?
@@ -43,6 +43,6 @@ abstract class SchemeAction : IAction {
 
 	final override suspend fun execute(context: Context, data: ByteArray) {
 		val uri = parseAndNormalizeUri(String(data))
-		execShareIntent(context, Intent(intentAction, uri))
+		context.execShareIntent(Intent(intentAction, uri))
 	}
 }

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

@@ -5,10 +5,9 @@ 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 de.markusfisch.android.binaryeye.content.startIntent
 import java.net.URLEncoder
 
 object OpenOrSearchAction : IAction {
@@ -18,28 +17,36 @@ 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, s: String, search: Boolean) {
+		val intent = Intent(Intent.ACTION_VIEW, parseAndNormalizeUri(s))
+		if (!context.startIntent(intent) && search) {
+			openSearch(context, s)
 		}
-		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 + URLEncoder.encode(query, "utf-8"),
+				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)
@@ -49,7 +56,7 @@ object OpenOrSearchAction : IAction {
 			setItems(names.toTypedArray()) { _, which ->
 				resume(urls[which] + URLEncoder.encode(query, "utf-8"))
 			}
-		} ?: return null
-		return openUri(context, queryUri, false)
+		} ?: return
+		view(context, queryUri, false)
 	}
 }

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

@@ -6,19 +6,27 @@ object VTypeParser {
 	private const val BACKSLASH_R_LEGACY =
 		"(?:\u000D\u000A|[\u000A\u000B\u000C\u000D\u0085\u2028\u2029])"
 	private val vTypeRegex =
-		"""^BEGIN:(VCARD|VEVENT)(?:$BACKSLASH_R_LEGACY.+?:[\s\S]+?)+?${BACKSLASH_R_LEGACY}END:\1$BACKSLASH_R_LEGACY?$""".toRegex(
+		"""^BEGIN:(V.+)(?:$BACKSLASH_R_LEGACY.+?:[\s\S]+?)+?${BACKSLASH_R_LEGACY}END:\1$BACKSLASH_R_LEGACY?$""".toRegex(
 			RegexOption.IGNORE_CASE
 		)
-	private val propertyRegex = """^(.+?):([\s\S]*?)$""".toRegex(RegexOption.MULTILINE)
+	private val propertyRegex = """^(.+?):([\s\S]*?)$""".toRegex(
+		RegexOption.MULTILINE
+	)
 
-	fun parseVType(data: String): String? =
-		vTypeRegex.matchEntire(data)?.groupValues?.get(1)?.toUpperCase(Locale.US)
+	fun parseVType(data: String): String? = vTypeRegex.matchEntire(
+		data
+	)?.groupValues?.get(1)?.uppercase(Locale.US)
 
-	fun parseMap(data: String): Map<String, List<VTypeProperty>> = propertyRegex.findAll(data).map {
+	fun parseMap(
+		data: String
+	): Map<String, List<VTypeProperty>> = propertyRegex.findAll(data).map {
 		it.groupValues[1].split(';').let { typeAndInfo ->
-			typeAndInfo[0] to VTypeProperty(typeAndInfo.drop(1), it.groupValues[2])
+			typeAndInfo[0] to VTypeProperty(
+				typeAndInfo.drop(1),
+				it.groupValues[2]
+			)
 		}
-	}.groupBy({ it.first.toUpperCase(Locale.US) }) { it.second }
+	}.groupBy({ it.first.uppercase(Locale.US) }) { it.second }
 }
 
 data class VTypeProperty(

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

@@ -20,10 +20,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 {
@@ -50,7 +59,7 @@ object VCardAction : IntentAction() {
 				}
 				putExtra(
 					extraPhone,
-					phoneProperty.value.toLowerCase(Locale.US).removePrefix("tel:")
+					phoneProperty.value.lowercase(Locale.US).removePrefix("tel:")
 				)
 			}
 			info["EMAIL"]?.forEachIndexed { index, mailProperty ->
@@ -142,7 +151,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 +160,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

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

@@ -21,8 +21,11 @@ object VEventAction : IntentAction() {
 		get() = R.string.vevent_failed
 
 	override fun canExecuteOn(data: ByteArray): Boolean {
-		return Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH
-				&& VTypeParser.parseVType(String(data)) == "VEVENT"
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+			return false
+		}
+		val type = VTypeParser.parseVType(String(data))
+		return type == "VEVENT" || type == "VCALENDAR"
 	}
 
 	@RequiresApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
@@ -53,7 +56,8 @@ object VEventAction : IntentAction() {
 		}
 	}
 
-	@SuppressLint("SimpleDateFormat") // we definitely don't wan't the local format
+	// We definitely don't wan't the local format.
+	@SuppressLint("SimpleDateFormat")
 	private val dateFormats = listOf(
 		SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"),
 		SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"),

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

@@ -10,6 +10,12 @@ import android.support.annotation.RequiresApi
 import de.markusfisch.android.binaryeye.R
 import java.util.*
 
+@RequiresApi(Build.VERSION_CODES.Q)
+fun removeNetworkSuggestions(context: Context): Int =
+	(context.applicationContext.getSystemService(
+		Context.WIFI_SERVICE
+	) as WifiManager).removeNetworkSuggestions(listOf())
+
 /**
  * Normal:
  * WIFI:S:[network SSID];T:<WPA|WEP|nopass|>;P:[network password];H:<true|false|>;;
@@ -45,7 +51,7 @@ object WifiConnector {
 			invoke(parsedData.password)
 		}
 		return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-			// WifiConfiguration is deprecated in Android Q
+			// WifiConfiguration is deprecated in Android Q.
 			@Suppress("DEPRECATION")
 			WifiConfiguration().apply(parsedData)
 		} else {
@@ -58,7 +64,7 @@ object WifiConnector {
 			Context.WIFI_SERVICE
 		) as WifiManager
 		return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-			// WifiConfiguration is deprecated in Android Q
+			// WifiConfiguration is deprecated in Android Q.
 			@Suppress("DEPRECATION")
 			val wifiConfig = config as WifiConfiguration
 			if (wifiManager.enableWifi() &&
@@ -72,7 +78,7 @@ object WifiConnector {
 		} else {
 			val suggestion = (config as WifiNetworkSuggestion.Builder).build()
 			val suggestions = listOf(suggestion)
-			// remove previous conflicting network suggestion
+			// Remove previous conflicting network suggestion.
 			wifiManager.removeNetworkSuggestions(suggestions)
 			val result = wifiManager.addNetworkSuggestions(suggestions)
 			if (result == WifiManager.STATUS_NETWORK_SUGGESTIONS_SUCCESS) {
@@ -84,17 +90,17 @@ object WifiConnector {
 	}
 
 	internal fun parseMap(string: String): Map<String, String>? {
-		// normally those codes should have the last semicolon, but many
-		// generators don't add it
+		// 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
 		)?.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 +108,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 +118,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?
@@ -164,7 +170,7 @@ object WifiConnector {
 	): WifiNetworkSuggestion.Builder? {
 		fun WifiNetworkSuggestion.Builder.applyCommon(
 			data: SimpleDataAccessor
-		): WifiNetworkSuggestion.Builder? {
+		): WifiNetworkSuggestion.Builder {
 			setSsid(data.ssid)
 			return this
 		}
@@ -172,47 +178,44 @@ object WifiConnector {
 		fun WifiNetworkSuggestion.Builder.applySecurity(
 			data: SimpleDataAccessor
 		): WifiNetworkSuggestion.Builder? {
-			when (data.securityType) {
-				"WPA", "WPA2" -> {
-					data.password?.let {
-						setWpa2Passphrase(it)
+			try {
+				when (data.securityType) {
+					"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 +225,7 @@ object WifiConnector {
 
 		fun WifiConfiguration.applyCommon(
 			data: SimpleDataAccessor
-		): WifiConfiguration? {
+		): WifiConfiguration {
 			allowedAuthAlgorithms.clear()
 			allowedGroupCiphers.clear()
 			allowedKeyManagement.clear()
@@ -274,7 +277,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 +295,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,8 +303,8 @@ object WifiConnector {
 	}
 }
 
-// keep possibility of wrongly unescaped \ by explicitly searching
-// for special chars
+// 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 ->
@@ -327,12 +330,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 +348,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

@@ -4,55 +4,83 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
+import android.graphics.Matrix
+import android.graphics.Rect
+import android.graphics.RectF
 import android.hardware.Camera
+import android.media.AudioManager
+import android.media.ToneGenerator
 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.app.*
-import de.markusfisch.android.binaryeye.data.Scan
-import de.markusfisch.android.binaryeye.graphics.Mapping
-import de.markusfisch.android.binaryeye.graphics.frameToView
+import de.markusfisch.android.binaryeye.content.copyToClipboard
+import de.markusfisch.android.binaryeye.content.execShareIntent
+import de.markusfisch.android.binaryeye.database.Scan
+import de.markusfisch.android.binaryeye.graphics.getFrameToViewMatrix
+import de.markusfisch.android.binaryeye.graphics.map
+import de.markusfisch.android.binaryeye.net.sendAsync
+import de.markusfisch.android.binaryeye.os.error
+import de.markusfisch.android.binaryeye.os.vibrate
 import de.markusfisch.android.binaryeye.rs.Preprocessor
+import de.markusfisch.android.binaryeye.view.initSystemBars
+import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
 import de.markusfisch.android.binaryeye.widget.DetectorView
 import de.markusfisch.android.binaryeye.widget.toast
 import de.markusfisch.android.binaryeye.zxing.Zxing
 import de.markusfisch.android.cameraview.widget.CameraView
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
+import java.net.URLEncoder
+import kotlin.math.max
+import kotlin.math.min
+import kotlin.math.roundToInt
 
 class CameraActivity : AppCompatActivity() {
-	private val zxing = Zxing(ResultPointCallback { point ->
-		point?.let {
-			mapping?.map(it)?.let {
-				detectorView.post {
-					detectorView.mark(listOf(it))
-				}
-			}
+	private val zxing = Zxing { point ->
+		point ?: return@Zxing
+		val matrix = getMappingMatrix() ?: return@Zxing
+		detectorView.post {
+			detectorView.update(
+				matrix.map(
+					arrayOf(point),
+					detectorView.coordinates
+				)
+			)
 		}
-	})
+	}
 
+	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: View
+	private lateinit var flashFab: FloatingActionButton
 
 	private var preprocessor: Preprocessor? = null
-	private var mapping: Mapping? = null
+	private var nativeMappingMatrix: Matrix? = null
+	private var rotatedMappingMatrix: Matrix? = null
+	private var recreatePreprocessor = false
+	private var rotate = false
 	private var invert = false
 	private var flash = false
+	private var decoding = true
 	private var returnResult = false
+	private var returnUrlTemplate: String? = null
 	private var frontFacing = false
+	private var bulkMode = prefs.bulkMode
+	private var ignoreNext: String? = null
 	private var fallbackBuffer: IntArray? = null
 
 	override fun onRequestPermissionsResult(
@@ -61,7 +89,7 @@ class CameraActivity : AppCompatActivity() {
 		grantResults: IntArray
 	) {
 		when (requestCode) {
-			REQUEST_CAMERA -> if (grantResults.isNotEmpty() &&
+			PERMISSION_CAMERA -> if (grantResults.isNotEmpty() &&
 				grantResults[0] != PackageManager.PERMISSION_GRANTED
 			) {
 				toast(R.string.no_camera_no_fun)
@@ -87,10 +115,20 @@ class CameraActivity : AppCompatActivity() {
 		}
 	}
 
+	override fun attachBaseContext(base: Context?) {
+		base?.applyLocale(prefs.customLocale)
+		super.attachBaseContext(base)
+	}
+
 	override fun onCreate(state: Bundle?) {
 		super.onCreate(state)
 		setContentView(R.layout.activity_camera)
 
+		// 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)
@@ -99,12 +137,11 @@ class CameraActivity : AppCompatActivity() {
 		cameraView = findViewById(R.id.camera_view) as CameraView
 		detectorView = findViewById(R.id.detector_view) as DetectorView
 		zoomBar = findViewById(R.id.zoom) as SeekBar
-		flashFab = findViewById(R.id.flash)
-		flashFab.setOnClickListener { toggleTorchMode() }
+		flashFab = findViewById(R.id.flash) as FloatingActionButton
 
 		initCameraView()
 		initZoomBar()
-		restoreZoom()
+		initDetectorView()
 
 		if (intent?.action == Intent.ACTION_SEND &&
 			intent.type == "text/plain"
@@ -115,21 +152,47 @@ class CameraActivity : AppCompatActivity() {
 
 	override fun onDestroy() {
 		super.onDestroy()
-		preprocessor?.destroy()
+		resetPreProcessor()
 		fallbackBuffer = null
 		saveZoom()
+		saveCropHandlePos()
+		rs.destroy()
 	}
 
 	override fun onResume() {
 		super.onResume()
 		System.gc()
-		zxing.updateHints(prefs.tryHarder)
-		returnResult = "com.google.zxing.client.android.SCAN" == intent.action
-		if (hasCameraPermission(this, REQUEST_CAMERA)) {
+		zxing.updateHints(
+			prefs.tryHarder,
+			prefs.barcodeFormats
+		)
+		if (prefs.bulkMode && bulkMode != prefs.bulkMode) {
+			bulkMode = prefs.bulkMode
+			invalidateOptionsMenu()
+			ignoreNext = null
+		}
+		setReturnTarget(intent)
+		if (hasCameraPermission(this)) {
 			openCamera()
 		}
 	}
 
+	private fun setReturnTarget(intent: Intent?) {
+		when {
+			intent?.action == "com.google.zxing.client.android.SCAN" -> {
+				returnResult = true
+			}
+			isReturnUrl(intent) -> intent?.data?.let {
+				returnUrlTemplate = it.getQueryParameter("ret")
+			}
+		}
+	}
+
+	private fun resetPreProcessor() {
+		preprocessor?.destroy()
+		preprocessor = null
+	}
+
 	private fun openCamera() {
 		cameraView.openAsync(
 			CameraView.findCameraId(
@@ -150,7 +213,7 @@ class CameraActivity : AppCompatActivity() {
 
 	private fun closeCamera() {
 		cameraView.close()
-		// closing the camera will also shut off the flash
+		// Closing the camera will also shut off the flash.
 		flash = false
 	}
 
@@ -158,23 +221,37 @@ class CameraActivity : AppCompatActivity() {
 		super.onRestoreInstanceState(savedState)
 		zoomBar.max = savedState.getInt(ZOOM_MAX)
 		zoomBar.progress = savedState.getInt(ZOOM_LEVEL)
+		frontFacing = savedState.getBoolean(FRONT_FACING)
+		bulkMode = savedState.getBoolean(BULK_MODE)
 	}
 
 	override fun onSaveInstanceState(outState: Bundle) {
 		outState.putInt(ZOOM_MAX, zoomBar.max)
 		outState.putInt(ZOOM_LEVEL, zoomBar.progress)
+		outState.putBoolean(FRONT_FACING, frontFacing)
+		outState.putBoolean(BULK_MODE, bulkMode)
 		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.
+		if (detectorView.onTouchEvent(ev)) {
+			return true
+		}
+		return super.dispatchTouchEvent(ev)
+	}
+
 	override fun onCreateOptionsMenu(menu: Menu): Boolean {
 		menuInflater.inflate(R.menu.activity_camera, menu)
+		menu.findItem(R.id.bulk_mode).isChecked = bulkMode
 		return true
 	}
 
 	override fun onOptionsItemSelected(item: MenuItem): Boolean {
 		return when (item.itemId) {
 			R.id.create -> {
-				startActivity(MainActivity.getEncodeIntent(this))
+				createBarcode()
 				true
 			}
 			R.id.history -> {
@@ -197,6 +274,12 @@ class CameraActivity : AppCompatActivity() {
 				switchCamera()
 				true
 			}
+			R.id.bulk_mode -> {
+				bulkMode = bulkMode xor true
+				item.isChecked = bulkMode
+				ignoreNext = null
+				true
+			}
 			R.id.preferences -> {
 				startActivity(MainActivity.getPreferencesIntent(this))
 				true
@@ -209,6 +292,10 @@ class CameraActivity : AppCompatActivity() {
 		}
 	}
 
+	private fun createBarcode() {
+		startActivity(MainActivity.getEncodeIntent(this))
+	}
+
 	private fun switchCamera() {
 		closeCamera()
 		frontFacing = frontFacing xor true
@@ -220,11 +307,7 @@ class CameraActivity : AppCompatActivity() {
 			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) {
@@ -237,7 +320,49 @@ class CameraActivity : AppCompatActivity() {
 
 	private fun initCameraView() {
 		cameraView.setUseOrientationListener(true)
-		cameraView.setTapToFocus()
+		@Suppress("ClickableViewAccessibility")
+		cameraView.setOnTouchListener(object : View.OnTouchListener {
+			var focus = true
+			var offset = -1f
+			var progress = 0
+
+			override fun onTouch(v: View?, event: MotionEvent?): Boolean {
+				event ?: return false
+				val pos = event.y
+				when (event.actionMasked) {
+					MotionEvent.ACTION_DOWN -> {
+						offset = pos
+						progress = zoomBar.progress
+						return true
+					}
+					MotionEvent.ACTION_MOVE -> {
+						if (prefs.zoomBySwiping) {
+							v ?: return false
+							val dist = offset - pos
+							val maxValue = zoomBar.max
+							val change = maxValue / v.height.toFloat() * 2f * dist
+							zoomBar.progress = min(
+								maxValue,
+								max(progress + change.roundToInt(), 0)
+							)
+							return true
+						}
+					}
+					MotionEvent.ACTION_UP -> {
+						// 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) {
+								v?.performClick()
+								return true
+							}
+						}
+					}
+				}
+				return false
+			}
+		})
 		@Suppress("DEPRECATION")
 		cameraView.setOnCameraListener(object : CameraView.OnCameraListener {
 			override fun onConfigureParameters(
@@ -273,33 +398,27 @@ class CameraActivity : AppCompatActivity() {
 			}
 
 			override fun onCameraReady(camera: Camera) {
+				// Reset preprocessor to make sure it always fits the current
+				// frame orientation. Important for landscape to landscape
+				// orientation changes.
+				resetPreProcessor()
 				val frameWidth = cameraView.frameWidth
 				val frameHeight = cameraView.frameHeight
 				val frameOrientation = cameraView.frameOrientation
-				var decoding = true
+				ignoreNext = null
+				decoding = true
 				camera.setPreviewCallback { frameData, _ ->
 					if (decoding) {
-						val result = decodeFrame(
+						decodeFrame(
 							frameData,
 							frameWidth,
 							frameHeight,
 							frameOrientation
-						)
-						result?.let {
-							cameraView.post {
-								val rp = result.resultPoints
-								val m = mapping
-								if (m != null && rp != null && rp.isNotEmpty()) {
-									detectorView.mark(m.map(rp))
-								}
-								vibrator.vibrate()
-								showResult(
-									this@CameraActivity,
-									result,
-									returnResult
-								)
+						)?.let { result ->
+							if (result.text != ignoreNext) {
+								postResult(result)
+								decoding = false
 							}
-							decoding = false
 						}
 					}
 				}
@@ -329,6 +448,7 @@ class CameraActivity : AppCompatActivity() {
 
 			override fun onStopTrackingTouch(seekBar: SeekBar) {}
 		})
+		restoreZoom()
 	}
 
 	@Suppress("DEPRECATION")
@@ -340,7 +460,7 @@ class CameraActivity : AppCompatActivity() {
 				params.zoom = zoom
 				camera.parameters = params
 			} catch (e: RuntimeException) {
-				// ignore; there's nothing we can do
+				// Ignore. There's nothing we can do.
 			}
 		}
 	}
@@ -360,11 +480,40 @@ class CameraActivity : AppCompatActivity() {
 		)
 	}
 
-	private fun updateFlashFab(available: Boolean) {
-		flashFab.visibility = if (available) {
-			View.GONE
+	private fun initDetectorView() {
+		detectorView.onRoiChange = {
+			decoding = false
+		}
+		detectorView.onRoiChanged = {
+			decoding = true
+			recreatePreprocessor = true
+		}
+		detectorView.setPaddingFromWindowInsets()
+		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 updateFlashFab(unavailable: Boolean) {
+		if (unavailable) {
+			flashFab.setImageResource(R.drawable.ic_action_create)
+			flashFab.setOnClickListener { createBarcode() }
 		} else {
-			View.VISIBLE
+			flashFab.setImageResource(R.drawable.ic_action_flash)
+			flashFab.setOnClickListener { toggleTorchMode() }
 		}
 	}
 
@@ -382,7 +531,7 @@ class CameraActivity : AppCompatActivity() {
 				camera.parameters = parameters
 				flash = flash xor true
 			} catch (e: RuntimeException) {
-				// ignore; there's nothing we can do
+				// Ignore. There's nothing we can do.
 			}
 		}
 	}
@@ -394,20 +543,44 @@ class CameraActivity : AppCompatActivity() {
 		frameOrientation: Int
 	): Result? {
 		frameData ?: return null
-		invert = invert xor true
-		val pp = preprocessor ?: createPreprocessorAndMapping(
-			frameWidth,
-			frameHeight,
-			frameOrientation
-		)
-		pp.process(frameData)
-		preprocessor = pp
-		return zxing.decode(
-			frameData,
-			pp.outWidth,
-			pp.outHeight,
-			invert
-		)
+		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(
@@ -415,43 +588,192 @@ class CameraActivity : AppCompatActivity() {
 		frameHeight: Int,
 		frameOrientation: Int
 	): Preprocessor {
-		val pp = Preprocessor(
-			this,
+		val frameRoi = calculateFrameRect(
 			frameWidth,
 			frameHeight,
 			frameOrientation
 		)
-		mapping = frameToView(
+		val pp = Preprocessor(
+			rs,
+			frameWidth,
+			frameHeight,
+			frameRoi
+		)
+		val viewRect = if (frameRoi != null) {
+			detectorView.roi
+		} else {
+			cameraView.previewRect
+		}
+		nativeMappingMatrix = getFrameToViewMatrix(
 			pp.outWidth,
 			pp.outHeight,
-			cameraView.previewRect
+			frameOrientation,
+			viewRect
+		)
+		rotatedMappingMatrix = getFrameToViewMatrix(
+			pp.outHeight,
+			pp.outWidth,
+			(frameOrientation - 90 + 360) % 360,
+			viewRect
 		)
 		return pp
 	}
 
+	private fun calculateFrameRect(
+		frameWidth: Int,
+		frameHeight: Int,
+		frameOrientation: Int
+	): Rect? {
+		val viewRoi = detectorView.roi
+		return if (
+			viewRoi.width() == 0 ||
+			viewRoi.height() == 0
+		) {
+			null
+		} else {
+			// Map ROI in detectorView to cameraView.
+			val previewRect = cameraView.previewRect
+			// previewRect may be larger than the screen (and thus as the
+			// detectorView) in which case its left and/or top coordinate
+			// will be negative which must then be clamped to the
+			// screen/DetectorView.
+			val previewLeft = max(0, previewRect.left)
+			val previewTop = max(0, previewRect.top)
+			val previewRoi = Rect(
+				previewLeft + viewRoi.left,
+				previewTop + viewRoi.top,
+				previewLeft + viewRoi.right,
+				previewTop + viewRoi.bottom
+			)
+			val previewRectWidth = previewRect.width().toFloat()
+			val previewRectHeight = previewRect.height().toFloat()
+			val normalizedRoi = RectF(
+				previewRoi.left.toFloat() / previewRectWidth,
+				previewRoi.top.toFloat() / previewRectHeight,
+				previewRoi.right.toFloat() / previewRectWidth,
+				previewRoi.bottom.toFloat() / previewRectHeight
+			)
+			// Since the ROI is always centered and symmetric, we don't
+			// need to distinguish between 0 and 180 or 90 and 270 degree.
+			val errectedRoi = if (isPortrait(frameOrientation)) {
+				RectF(
+					normalizedRoi.top,
+					normalizedRoi.left,
+					normalizedRoi.bottom,
+					normalizedRoi.right
+				)
+			} else {
+				normalizedRoi
+			}
+			Rect(
+				(errectedRoi.left * frameWidth.toFloat()).roundToInt(),
+				(errectedRoi.top * frameHeight.toFloat()).roundToInt(),
+				(errectedRoi.right * frameWidth.toFloat()).roundToInt(),
+				(errectedRoi.bottom * frameHeight.toFloat()).roundToInt()
+			)
+		}
+	}
+
+	private fun postResult(result: Result) {
+		// Get matrix for the current rotate value.
+		val matrix = getMappingMatrix()
+		val resultPoints = result.resultPoints
+		if (matrix == null ||
+			resultPoints == null ||
+			resultPoints.isEmpty()
+		) {
+			return
+		}
+		cameraView.post {
+			detectorView.update(
+				matrix.map(
+					resultPoints,
+					detectorView.coordinates
+				)
+			)
+			vibrator.vibrate()
+			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(
+					this@CameraActivity,
+					result,
+					vibrator,
+					bulkMode
+				)
+			}
+			if (bulkMode) {
+				ignoreNext = result.text
+				if (prefs.showToastInBulkMode) {
+					toast(result.text)
+				}
+				detectorView.postDelayed({
+					decoding = true
+				}, prefs.bulkModeDelay.toLong())
+			}
+		}
+	}
+
+	private fun getMappingMatrix() = if (rotate) {
+		rotatedMappingMatrix
+	} else {
+		nativeMappingMatrix
+	}
+
 	companion object {
-		private const val REQUEST_CAMERA = 1
 		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"
 	}
 }
 
 fun showResult(
 	activity: Activity,
 	result: Result,
-	isResult: Boolean = false
+	vibrator: Vibrator,
+	bulkMode: Boolean = false,
 ) {
+	if (prefs.copyImmediately) {
+		activity.copyToClipboard(result.text)
+	}
 	val scan = Scan(result)
-	if (isResult) {
-		activity.setResult(Activity.RESULT_OK, getReturnIntent(result))
-		activity.finish()
-	} else {
-		if (prefs.useHistory) {
-			GlobalScope.launch {
-				db.insertScan(scan)
+	if (prefs.sendScanUrl.isNotEmpty()) {
+		scan.sendAsync(
+			prefs.sendScanUrl,
+			prefs.sendScanType
+		) { code, body ->
+			if (code == null || code < 200 || code > 299) {
+				vibrator.error()
+				beepBeepBeep()
+			}
+			if (body != null && body.isNotEmpty()) {
+				activity.toast(body)
+			} else if (code == null || code > 299) {
+				activity.toast(R.string.background_request_failed)
 			}
 		}
+	}
+	if (prefs.useHistory) {
+		scan.id = db.insertScan(scan)
+	}
+	if (!bulkMode) {
 		activity.startActivity(
 			MainActivity.getDecodeIntent(activity, scan)
 		)
@@ -498,3 +820,44 @@ fun getReturnIntent(result: Result): Intent {
 	}
 	return intent
 }
+
+private fun isReturnUrl(intent: Intent?): Boolean {
+	val dataString = intent?.dataString
+	return listOf(
+		"binaryeye://scan",
+		"http://markusfisch.de/BinaryEye",
+		"https://markusfisch.de/BinaryEye"
+	).firstOrNull {
+		val result = dataString?.startsWith(it) == true
+		result
+	} != null
+}
+
+private fun completeUrl(urlTemplate: String, result: Result) = Uri.parse(
+	urlTemplate
+		.replace("{RESULT}", URLEncoder.encode(result.text, "UTF-8"))
+		.replace("{RESULT_BYTES}", result.rawBytes?.toHexString() ?: "")
+		.replace(
+			"{FORMAT}", URLEncoder.encode(
+				result.barcodeFormat.toString(), "UTF-8"
+			)
+		)
+		.replace(
+			"{META}", URLEncoder.encode(
+				result.resultMetadata?.toString() ?: "", "UTF-8"
+			)
+		)
+		// And support {CODE} from the old ZXing app, too.
+		.replace("{CODE}", URLEncoder.encode(result.text, "UTF-8"))
+)
+
+private fun beepBeepBeep() {
+	ToneGenerator(AudioManager.STREAM_ALARM, 100).startTone(
+		ToneGenerator.TONE_CDMA_CONFIRM,
+		1000
+	)
+}
+
+private fun isPortrait(
+	orientation: Int
+) = orientation == 90 || orientation == 270

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

@@ -2,23 +2,39 @@ 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.colorSystemAndToolBars
-import de.markusfisch.android.binaryeye.app.initSystemBars
-import de.markusfisch.android.binaryeye.app.setFragment
-import de.markusfisch.android.binaryeye.data.Scan
+import de.markusfisch.android.binaryeye.app.*
+import de.markusfisch.android.binaryeye.database.Scan
 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.setupInsets
+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) {
@@ -29,16 +45,18 @@ class MainActivity : AppCompatActivity() {
 		return true
 	}
 
+	override fun attachBaseContext(base: Context?) {
+		base?.applyLocale(prefs.customLocale)
+		super.attachBaseContext(base)
+	}
+
 	override fun onCreate(state: Bundle?) {
 		super.onCreate(state)
 		setContentView(R.layout.activity_main)
 
 		initSystemBars(this)
 		val toolbar = findViewById(R.id.toolbar) as Toolbar
-		setupInsets(
-			findViewById(android.R.id.content),
-			toolbar
-		)
+		recordToolbarHeight(toolbar)
 		setSupportActionBar(toolbar)
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
@@ -55,7 +73,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()

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

@@ -3,65 +3,81 @@ package de.markusfisch.android.binaryeye.activity
 import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
-import android.graphics.Point
 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.colorSystemAndToolBars
-import de.markusfisch.android.binaryeye.app.initSystemBars
-import de.markusfisch.android.binaryeye.app.vibrate
+import de.markusfisch.android.binaryeye.app.*
 import de.markusfisch.android.binaryeye.graphics.crop
 import de.markusfisch.android.binaryeye.graphics.loadImageUri
-import de.markusfisch.android.binaryeye.graphics.mapResult
-import de.markusfisch.android.binaryeye.view.setWindowInsetListener
-import de.markusfisch.android.binaryeye.view.setupInsets
+import de.markusfisch.android.binaryeye.graphics.mapResultToView
+import de.markusfisch.android.binaryeye.os.vibrate
+import de.markusfisch.android.binaryeye.rs.fixTransparency
+import de.markusfisch.android.binaryeye.view.colorSystemAndToolBars
+import de.markusfisch.android.binaryeye.view.initSystemBars
+import de.markusfisch.android.binaryeye.view.recordToolbarHeight
+import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
 import de.markusfisch.android.binaryeye.widget.CropImageView
+import de.markusfisch.android.binaryeye.widget.DetectorView
 import de.markusfisch.android.binaryeye.widget.toast
 import de.markusfisch.android.binaryeye.zxing.Zxing
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 class PickActivity : AppCompatActivity() {
 	private val zxing = Zxing()
 
+	private lateinit var rs: RenderScript
 	private lateinit var vibrator: Vibrator
 	private lateinit var cropImageView: CropImageView
+	private lateinit var detectorView: DetectorView
+
+	private var result: Result? = null
+
+	override fun attachBaseContext(base: Context?) {
+		base?.applyLocale(prefs.customLocale)
+		super.attachBaseContext(base)
+	}
 
 	override fun onCreate(state: Bundle?) {
 		super.onCreate(state)
 		setContentView(R.layout.activity_pick)
 
-		zxing.updateHints(true)
+		// Necessary to get the right translation after setting a custom
+		// locale.
+		setTitle(R.string.pick_code_to_scan)
+
+		zxing.updateHints(
+			true,
+			prefs.barcodeFormats
+		)
+		rs = RenderScript.create(this)
 		vibrator = getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
 
 		initSystemBars(this)
 		val toolbar = findViewById(R.id.toolbar) as Toolbar
-		setupInsets(findViewById(android.R.id.content), toolbar)
+		recordToolbarHeight(toolbar)
 		setSupportActionBar(toolbar)
 
 		supportFragmentManager.addOnBackStackChangedListener {
 			colorSystemAndToolBars(this@PickActivity)
 		}
 
-		val bitmap = if (
-			intent?.action == Intent.ACTION_SEND &&
-			intent.type?.startsWith("image/") == true
-		) {
-			loadSentImage(intent)
-		} else if (
-			intent?.action == Intent.ACTION_VIEW &&
-			intent.type?.startsWith("image/") == true
-		) {
-			loadImageToOpen(intent)
-		} else {
-			null
-		}
+		val bitmap = fixTransparency(
+			rs,
+			getBitmapFromIntent()
+		)
 
 		if (bitmap == null) {
 			applicationContext.toast(R.string.error_no_content)
@@ -69,42 +85,81 @@ class PickActivity : AppCompatActivity() {
 			return
 		}
 
-		val scannedRect = Rect()
-		val scanWithinBounds: () -> Result? = {
-			var result: Result? = null
-			crop(
-				bitmap,
-				cropImageView.normalizedRectInBounds,
-				cropImageView.imageRotation
-			)?.also {
-				scannedRect.set(0, 0, it.width, it.height)
-				result = zxing.decodePositiveNegative(it)
-			}
-			result
-		}
-
 		cropImageView = findViewById(R.id.image) as CropImageView
+		cropImageView.restrictTranslation = false
 		cropImageView.setImageBitmap(bitmap)
 		cropImageView.onScan = {
-			var points: List<Point>? = null
-			scanWithinBounds()?.let {
-				points = mapResult(
-					scannedRect.width(),
-					scannedRect.height(),
-					cropImageView.getBoundsRect(),
-					it
-				)
-				vibrator.vibrate()
-			}
-			points
-		}
-		setWindowInsetListener { insets ->
-			cropImageView.windowInsets.set(insets)
+			scanWithinBounds(bitmap)
 		}
 
-		findViewById(R.id.scan).setOnClickListener {
-			scanImage(scanWithinBounds())
+		detectorView = findViewById(R.id.detector_view) as DetectorView
+		detectorView.onRoiChanged = {
+			scanWithinBounds(bitmap)
 		}
+		detectorView.setPaddingFromWindowInsets()
+
+		findViewById(R.id.scan).setOnClickListener {
+			showResult()
+		}
+	}
+
+	private fun getBitmapFromIntent(): Bitmap? = if (
+		intent?.action == Intent.ACTION_SEND &&
+		intent.type?.startsWith("image/") == true
+	) {
+		loadSentImage(intent)
+	} else if (
+		intent?.action == Intent.ACTION_VIEW &&
+		intent.type?.startsWith("image/") == true
+	) {
+		loadImageToOpen(intent)
+	} else {
+		null
+	}
+
+	private fun scanWithinBounds(bitmap: Bitmap) {
+		val roi = detectorView.roi
+		val rectInView = if (roi.width() < 1) {
+			cropImageView.getBoundsRect()
+		} else {
+			roi
+		}
+		val imageRect = cropImageView.mappedRect
+		val rectInImage = normalizeRoi(imageRect, rectInView)
+		val cropped = crop(
+			bitmap,
+			rectInImage,
+			cropImageView.imageRotation
+		) ?: return
+		CoroutineScope(Dispatchers.IO).launch(Dispatchers.IO) {
+			result = zxing.decodePositiveNegative(cropped)
+			result?.let {
+				withContext(Dispatchers.Main) {
+					if (isFinishing) {
+						return@withContext
+					}
+					vibrator.vibrate()
+					val rc = Rect()
+					imageRect.round(rc)
+					rectInView.intersect(rc)
+					detectorView.update(
+						mapResultToView(
+							cropped.width,
+							cropped.height,
+							0,
+							rectInView,
+							it.resultPoints,
+							detectorView.coordinates
+						)
+					)
+				}
+			}
+		}
+	}
+
+	override fun onDestroy() {
+		super.onDestroy()
+		rs.destroy()
 	}
 
 	override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -138,12 +193,23 @@ class PickActivity : AppCompatActivity() {
 		return loadImageUri(contentResolver, uri)
 	}
 
-	private fun scanImage(result: Result?) {
-		if (result != null) {
-			showResult(this, result)
+	private fun showResult() {
+		result?.let {
+			showResult(this, it, vibrator)
 			finish()
 			return
 		}
 		applicationContext.toast(R.string.no_barcode_found)
 	}
 }
+
+private fun normalizeRoi(imageRect: RectF, roi: Rect): RectF {
+	val w = imageRect.width()
+	val h = imageRect.height()
+	return RectF(
+		(roi.left - imageRect.left) / w,
+		(roi.top - imageRect.top) / h,
+		(roi.right - imageRect.left) / w,
+		(roi.bottom - imageRect.top) / h
+	)
+}

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

@@ -3,15 +3,17 @@ 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,14 +2,16 @@ 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
 import android.widget.CursorAdapter
 import android.widget.TextView
 import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.data.Database
+import de.markusfisch.android.binaryeye.database.Database
+import java.text.DateFormat
+import java.text.SimpleDateFormat
+import java.util.*
 
 class ScansAdapter(context: Context, cursor: Cursor) :
 	CursorAdapter(context, cursor, false) {
@@ -21,7 +23,6 @@ class ScansAdapter(context: Context, cursor: Cursor) :
 	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 selectedColor = ContextCompat.getColor(context, R.color.selected_row)
 
 	fun select(id: Long, position: Int) {
 		selectedScanId = id
@@ -33,11 +34,22 @@ class ScansAdapter(context: Context, cursor: Cursor) :
 		selectedScanPosition = -1
 	}
 
+	fun getSelectedContent() = if (selectedScanPosition < 0) {
+		null
+	} else {
+		val cursor = getItem(selectedScanPosition)
+		if (cursor is Cursor) {
+			cursor.getString(contentIndex)
+		} else {
+			null
+		}
+	}
+
 	override fun newView(
 		context: Context,
 		cursor: Cursor,
 		parent: ViewGroup
-	) = LayoutInflater.from(parent.context).inflate(
+	): View? = LayoutInflater.from(parent.context).inflate(
 		R.layout.row_scan, parent, false
 	)
 
@@ -47,7 +59,7 @@ class ScansAdapter(context: Context, cursor: Cursor) :
 		cursor: Cursor
 	) {
 		val holder = getViewHolder(view)
-		holder.timeView.text = cursor.getString(timeIndex)
+		holder.timeView.text = formatDateTime(cursor.getString(timeIndex))
 		val name = cursor.getString(nameIndex)
 		val content = cursor.getString(contentIndex)
 		var icon = 0
@@ -62,8 +74,8 @@ class ScansAdapter(context: Context, cursor: Cursor) :
 		holder.contentView.setCompoundDrawablesWithIntrinsicBounds(
 			icon, 0, 0, 0
 		)
-		holder.formatView.text = cursor.getString(formatIndex)
-		// view.isSelected needs to be put on the queue to work
+		holder.formatView.text = prettifyFormatName(cursor.getString(formatIndex))
+		// view.isSelected needs to be put on the queue to work.
 		val selected = cursor.getLong(idIndex) == selectedScanId
 		view.post {
 			view.isSelected = selected
@@ -86,3 +98,15 @@ class ScansAdapter(context: Context, cursor: Cursor) :
 		val formatView: TextView
 	)
 }
+
+fun prettifyFormatName(format: String) = format.replace("_", " ")
+
+private fun formatDateTime(rfc: String): String {
+	SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US).parse(rfc)?.let {
+		return DateFormat.getDateTimeInstance(
+			DateFormat.LONG,
+			DateFormat.SHORT
+		).format(it)
+	}
+	return rfc
+}

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

@@ -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

@@ -2,8 +2,7 @@ package de.markusfisch.android.binaryeye.app
 
 import android.app.Application
 import android.support.v8.renderscript.RenderScript
-import de.markusfisch.android.binaryeye.BuildConfig
-import de.markusfisch.android.binaryeye.data.Database
+import de.markusfisch.android.binaryeye.database.Database
 import de.markusfisch.android.binaryeye.preference.Preferences
 
 val db = Database()
@@ -12,23 +11,11 @@ val prefs = Preferences()
 class BinaryEyeApp : Application() {
 	override fun onCreate() {
 		super.onCreate()
-
-		// `RenderScript.forceCompat()` will crash the app when compiled
-		// on macOS Catalina with build tools 29.0.3 :( To make things
-		// even more complicated, `forceCompat()` will continue to work
-		// if the app is compiled on Linux with the exact same version
-		// 29.0.3 of the build tools
-		if (!BuildConfig.IS_CATALINA &&
-			System.getProperty("os.version")?.contains(
-				"lineageos", true
-			) == true
-		) {
-			// required to make RenderScript work for Lineage 16.0
-			// possibly because of a system/device bug
-			RenderScript.forceCompat()
-		}
-
 		db.open(this)
 		prefs.init(this)
+
+		if (prefs.forceCompat) {
+			RenderScript.forceCompat()
+		}
 	}
 }

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

@@ -10,3 +10,5 @@ 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/Flow.kt

@@ -1,27 +0,0 @@
-package de.markusfisch.android.binaryeye.app
-
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.emitAll
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.scanReduce
-
-@ExperimentalCoroutinesApi
-fun Flow<ByteArray>.addDelimiter(delimiter: String) = addDelimiter(
-	delimiter.toByteArray(),
-	ByteArray::plus
-)
-
-@ExperimentalCoroutinesApi
-inline fun <T, R> Flow<T>.addDelimiter(
-	delimiter: R,
-	crossinline append: R.(T) -> T
-): Flow<T> = scanReduce { _, content ->
-	delimiter.append(content)
-}
-
-@ExperimentalCoroutinesApi
-infix fun <T> T.asFlowWith(other: Flow<T>) = flow<T> {
-	emit(this@asFlowWith)
-	emitAll(other)
-}

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

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

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

@@ -0,0 +1,26 @@
+package de.markusfisch.android.binaryeye.app
+
+import android.content.Context
+import android.os.Build
+import java.util.*
+
+fun Context.applyLocale(localeName: String) {
+	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

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

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

@@ -0,0 +1,26 @@
+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,50 +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) {
-	shareUri(context, getUriForFile(context, file), 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/content/Clipboard.kt

@@ -1,4 +1,4 @@
-package de.markusfisch.android.binaryeye.app
+package de.markusfisch.android.binaryeye.content
 
 import android.content.ClipData
 import android.content.Context
@@ -11,7 +11,7 @@ fun Context.copyToClipboard(text: String) {
 		(service as android.text.ClipboardManager).text = text
 	} else {
 		(service as android.content.ClipboardManager).setPrimaryClip(
-			ClipData.newPlainText("simple text", text)
+			ClipData.newPlainText("plain text", text)
 		)
 	}
 }

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

@@ -0,0 +1,66 @@
+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
+
+fun Context.execShareIntent(intent: Intent) {
+	if (!startIntent(intent)) {
+		toast(R.string.cannot_resolve_action)
+	}
+}
+
+fun Context.startIntent(intent: Intent) = 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 shareText(context: Context, text: String, type: String = "text/plain") {
+	val intent = Intent(Intent.ACTION_SEND)
+	intent.putExtra(Intent.EXTRA_TEXT, text)
+	intent.type = type
+	context.execShareIntent(intent)
+}
+
+fun shareUri(context: Context, uri: Uri, type: String) {
+	val intent = Intent(Intent.ACTION_SEND)
+	intent.putExtra(Intent.EXTRA_STREAM, uri)
+	intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+	intent.type = type
+	context.execShareIntent(intent)
+}
+
+fun 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/database/CsvExport.kt

@@ -1,14 +1,31 @@
-package de.markusfisch.android.binaryeye.data
+package de.markusfisch.android.binaryeye.database
 
 import android.content.Context
 import android.database.Cursor
-import de.markusfisch.android.binaryeye.app.writeExternalFile
+import de.markusfisch.android.binaryeye.app.toHexString
+import de.markusfisch.android.binaryeye.io.writeExternalFile
+import java.io.ByteArrayOutputStream
+import java.io.OutputStream
 
 fun exportCsv(
 	context: Context,
 	name: String,
 	cursor: Cursor,
 	delimiter: String
+) = writeExternalFile(context, name, "text/csv") { outputStream ->
+	exportCsv(outputStream, cursor, delimiter)
+}
+
+fun exportCsv(cursor: Cursor, delimiter: String): String {
+	val outputStream = ByteArrayOutputStream()
+	exportCsv(outputStream, cursor, delimiter)
+	return outputStream.toString()
+}
+
+private fun exportCsv(
+	outputStream: OutputStream,
+	cursor: Cursor,
+	delimiter: String
 ) {
 	if (!cursor.moveToFirst()) {
 		return
@@ -31,34 +48,24 @@ fun exportCsv(
 	}
 	val contentIndex = cursor.getColumnIndex(Database.SCANS_CONTENT)
 	val rawIndex = cursor.getColumnIndex(Database.SCANS_RAW)
-	writeExternalFile(context, name, "text/csv") { outputStream ->
-		outputStream.write(
-			columns.joinToString(
-				delimiter,
-				postfix = "\n"
-			).toByteArray()
-		)
-		do {
-			var deviation: Pair<Int, String>? = null
-			if (cursor.getString(contentIndex)?.isEmpty() == true) {
-				deviation = Pair(
-					contentIndex,
-					cursor.getBlob(rawIndex).toHexString()
-				)
-			}
-			outputStream.write(
-				cursor.toCsvRecord(indices, delimiter, deviation)
+	outputStream.write(
+		columns.joinToString(
+			delimiter,
+			postfix = "\n"
+		).toByteArray()
+	)
+	do {
+		var deviation: Pair<Int, String>? = null
+		if (cursor.getString(contentIndex)?.isEmpty() == true) {
+			deviation = Pair(
+				contentIndex,
+				cursor.getBlob(rawIndex).toHexString()
 			)
-		} while (cursor.moveToNext())
-	}
-}
-
-private fun ByteArray.toHexString(): String {
-	val hex = StringBuilder()
-	for (i in this.indices) {
-		hex.append(String.format("%02X", this[i]))
-	}
-	return hex.toString()
+		}
+		outputStream.write(
+			cursor.toCsvRecord(indices, delimiter, deviation)
+		)
+	} while (cursor.moveToNext())
 }
 
 private fun Cursor.toCsvRecord(
@@ -80,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/Database.kt

@@ -1,4 +1,4 @@
-package de.markusfisch.android.binaryeye.data
+package de.markusfisch.android.binaryeye.database
 
 import android.content.ContentValues
 import android.content.Context
@@ -50,14 +50,19 @@ class Database {
 		""", getWhereArguments(query)
 	)
 
-	private fun getWhereClause(query: String?) = if (query?.isNotEmpty() == true) {
-		"""WHERE $SCANS_CONTENT LIKE ?
+	private fun getWhereClause(
+		query: String?,
+		prefix: String = "WHERE"
+	) = if (query?.isNotEmpty() == true) {
+		"""$prefix $SCANS_CONTENT LIKE ?
 			OR $SCANS_NAME LIKE ?"""
 	} else {
 		""
 	}
 
-	private fun getWhereArguments(query: String?) = if (query?.isNotEmpty() == true) {
+	private fun getWhereArguments(
+		query: String?
+	) = if (query?.isNotEmpty() == true) {
 		val instr = "%$query%"
 		arrayOf(instr, instr)
 	} else {
@@ -173,8 +178,8 @@ class Database {
 		db.delete(SCANS, "$SCANS_ID = ?", arrayOf("$id"))
 	}
 
-	fun removeScans() {
-		db.delete(SCANS, null, null)
+	fun removeScans(query: String? = null) {
+		db.delete(SCANS, getWhereClause(query, ""), getWhereArguments(query))
 	}
 
 	fun renameScan(id: Long, name: String) {
@@ -184,7 +189,7 @@ class Database {
 	}
 
 	private class OpenHelper(context: Context) :
-		SQLiteOpenHelper(context, "history.db", null, 4) {
+		SQLiteOpenHelper(context, FILE_NAME, null, 4) {
 		override fun onCreate(db: SQLiteDatabase) {
 			createScans(db)
 		}
@@ -207,6 +212,7 @@ class Database {
 	}
 
 	companion object {
+		const val FILE_NAME = "history.db"
 		const val SCANS = "scans"
 		const val SCANS_ID = "_id"
 		const val SCANS_DATETIME = "_datetime"

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

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

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

@@ -0,0 +1,75 @@
+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.io.writeExternalFile
+import org.json.JSONArray
+import org.json.JSONException
+import org.json.JSONObject
+
+fun exportJson(
+	context: Context,
+	name: String,
+	cursor: Cursor
+) = writeExternalFile(context, name, "application/json") { outputStream ->
+	exportJson(cursor)?.let {
+		outputStream.write(it.toByteArray())
+	}
+}
+
+fun exportJson(cursor: Cursor): String? {
+	if (!cursor.moveToFirst()) {
+		return null
+	}
+	val columns = arrayOf(
+		Database.SCANS_DATETIME,
+		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
+	)
+	val indices = columns.map {
+		Pair(cursor.getColumnIndex(it), it)
+	}
+	val contentIndex = cursor.getColumnIndex(Database.SCANS_CONTENT)
+	val rawIndex = cursor.getColumnIndex(Database.SCANS_RAW)
+	val root = JSONArray()
+	do {
+		var deviation: Pair<Int, String>? = null
+		if (cursor.getString(contentIndex)?.isEmpty() == true) {
+			deviation = Pair(
+				contentIndex,
+				cursor.getBlob(rawIndex).toHexString()
+			)
+		}
+		root.put(cursor.toJsonObject(indices, deviation))
+	} while (cursor.moveToNext())
+	return root.toString()
+}
+
+private fun Cursor.toJsonObject(
+	indices: List<Pair<Int, String>>,
+	deviation: Pair<Int, String>?
+): JSONObject {
+	val obj = JSONObject()
+	return try {
+		indices.forEach {
+			val value = if (deviation?.first == it.first) {
+				deviation.second
+			} else {
+				this.getString(it.first)
+			}
+			obj.put(it.second, value ?: "")
+		}
+		obj
+	} catch (e: JSONException) {
+		obj
+	}
+}

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

@@ -1,4 +1,4 @@
-package de.markusfisch.android.binaryeye.data
+package de.markusfisch.android.binaryeye.database
 
 import android.os.Parcel
 import android.os.Parcelable
@@ -19,7 +19,7 @@ data class Scan(
 	val suggestedPrice: String?,
 	val upcEanExtension: String?,
 	val timestamp: String = getDateTime(),
-	val id: Long = 0L
+	var id: Long = 0L
 ) : Parcelable {
 	constructor(result: Result) : this(
 		result.text,
@@ -138,8 +138,12 @@ private fun getRawBytes(result: Result): ByteArray? {
 	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:"
+	// If the byte segments are shorter than the converted string, the
+	// content of the QR Code has been encoded with different encoding
+	// modes (e.g. some parts in alphanumeric, some in byte encoding).
+	// This is because Zxing only records byte segments for byte encoded
+	// parts. Please note the byte segments can actually be longer than
+	// the string because Zxing cuts off prefixes like "WIFI:".
 	return if (bytes.size >= result.text.length) bytes else null
 }
 

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

@@ -2,23 +2,31 @@ package de.markusfisch.android.binaryeye.fragment
 
 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.EncodeHintType
 import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.app.addSuffixIfNotGiven
 import de.markusfisch.android.binaryeye.app.hasWritePermission
-import de.markusfisch.android.binaryeye.app.shareFile
-import de.markusfisch.android.binaryeye.app.writeExternalFile
-import de.markusfisch.android.binaryeye.view.setPadding
-import de.markusfisch.android.binaryeye.view.setWindowInsetListener
+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.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.Main
+import de.markusfisch.android.binaryeye.zxing.encodeAsBitmap
+import de.markusfisch.android.binaryeye.zxing.encodeAsSvg
+import de.markusfisch.android.binaryeye.zxing.encodeAsText
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import java.io.File
@@ -28,7 +36,13 @@ import java.io.OutputStream
 import java.util.*
 
 class BarcodeFragment : Fragment() {
-	private var barcode: Bitmap? = null
+	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
 
@@ -42,7 +56,8 @@ class BarcodeFragment : Fragment() {
 		container: ViewGroup?,
 		state: Bundle?
 	): View? {
-		activity?.setTitle(R.string.view_barcode)
+		val ac = activity ?: return null
+		ac.setTitle(R.string.view_barcode)
 
 		val view = inflater.inflate(
 			R.layout.fragment_barcode,
@@ -53,16 +68,19 @@ class BarcodeFragment : Fragment() {
 		val args = arguments ?: return view
 		val content = args.getString(CONTENT) ?: return view
 		val format = args.getSerializable(FORMAT) as BarcodeFormat? ?: return view
+		val hints = args.getSerializable(HINTS) as EnumMap<EncodeHintType, Any>?
 		val size = args.getInt(SIZE)
 		try {
-			barcode = Zxing.encodeAsBitmap(content, format, size, size)
+			barcodeBitmap = encodeAsBitmap(content, format, size, size, hints)
+			barcodeSvg = encodeAsSvg(content, format, hints)
+			barcodeTxt = encodeAsText(content, format, hints)
 		} catch (e: Exception) {
 			var message = e.message
 			if (message == null || message.isEmpty()) {
 				message = getString(R.string.error_encoding_barcode)
 			}
 			message?.let {
-				activity.toast(message)
+				ac.toast(message)
 			}
 			fragmentManager.popBackStack()
 			return null
@@ -73,22 +91,21 @@ class BarcodeFragment : Fragment() {
 		val imageView = view.findViewById<ConfinedScalingImageView>(
 			R.id.barcode
 		)
-		imageView.setImageBitmap(barcode)
+		imageView.setImageBitmap(barcodeBitmap)
 		imageView.post {
-			// make sure to invoke this after ScalingImageView.onLayout()
+			// Make sure to invoke this after ScalingImageView.onLayout().
 			imageView.minWidth /= 2f
 		}
 
 		view.findViewById<View>(R.id.share).setOnClickListener {
-			val bitmap = barcode
-			bitmap?.let {
-				share(bitmap)
+			pickFileType(context, R.string.share_as) {
+				shareAs(it)
 			}
 		}
 
-		setWindowInsetListener { insets ->
-			(view.findViewById(R.id.inset_layout) as View).setPadding(insets)
-			imageView.insets.set(insets)
+		(view.findViewById(R.id.inset_layout) as View).setPaddingFromWindowInsets()
+		imageView.doOnApplyWindowInsets { v, insets ->
+			(v as ConfinedScalingImageView).insets.set(insets)
 		}
 
 		return view
@@ -100,33 +117,77 @@ class BarcodeFragment : Fragment() {
 
 	override fun onOptionsItemSelected(item: MenuItem): Boolean {
 		return when (item.itemId) {
-			R.id.save -> {
-				askForFileNameAndSave()
+			R.id.copy_to_clipboard -> {
+				barcodeTxt?.let {
+					context.copyToClipboard(it)
+					context.toast(R.string.copied_to_clipboard)
+				}
+				true
+			}
+			R.id.export_to_file -> {
+				pickFileType(context, R.string.export_as) {
+					askForFileNameAndSave(it)
+				}
 				true
 			}
 			else -> super.onOptionsItemSelected(item)
 		}
 	}
 
-	// dialogs do not have a parent view
+	private fun pickFileType(
+		context: Context,
+		title: Int,
+		action: (FileType) -> Unit
+	) {
+		val fileTypes = FileType.values()
+		AlertDialog.Builder(context)
+			.setTitle(title)
+			.setItems(fileTypes.map { it.name }.toTypedArray()) { _, which ->
+				action(fileTypes[which])
+			}
+			.show()
+	}
+
+	// Dialogs do not have a parent view.
 	@SuppressLint("InflateParams")
-	private fun askForFileNameAndSave() {
+	private fun askForFileNameAndSave(fileType: FileType) {
 		val ac = activity ?: return
+		// write permission is only required before Android Q
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&
+			!hasWritePermission(ac) { askForFileNameAndSave(fileType) }
+		) {
+			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"))
 		AlertDialog.Builder(ac)
 			.setView(view)
 			.setPositiveButton(android.R.string.ok) { _, _ ->
-				val bitmap = barcode
-				bitmap?.let {
-					saveAsFile(
-						bitmap,
-						addSuffixIfNotGiven(
-							editText.text.toString(),
-							".png"
-						)
-					)
+				val fileName = editText.text.toString()
+				when (fileType) {
+					FileType.PNG -> saveAs(
+						addSuffixIfNotGiven(fileName, ".png"),
+						MIME_PNG
+					) {
+						barcodeBitmap?.saveAsPng(it)
+					}
+					FileType.SVG -> saveAs(
+						addSuffixIfNotGiven(fileName, ".svg"),
+						MIME_SVG
+					) { outputStream ->
+						barcodeSvg?.let {
+							outputStream.write(it.toByteArray())
+						}
+					}
+					FileType.TXT -> saveAs(
+						addSuffixIfNotGiven(fileName, ".txt"),
+						MIME_TXT
+					) { outputStream ->
+						barcodeTxt?.let {
+							outputStream.write(it.toByteArray())
+						}
+					}
 				}
 			}
 			.setNegativeButton(android.R.string.cancel) { _, _ ->
@@ -134,25 +195,33 @@ class BarcodeFragment : Fragment() {
 			.show()
 	}
 
-	private fun saveAsFile(bitmap: Bitmap, fileName: String) {
+	private fun saveAs(
+		fileName: String,
+		mimeType: String,
+		write: (outputStream: OutputStream) -> Unit
+	) {
 		val ac = activity ?: return
-		if (!hasWritePermission(ac)) {
-			return
-		}
-		GlobalScope.launch {
-			val message = writeExternalFile(ac, fileName, "image/png") {
-				bitmap.saveAsPng(it)
-			}
-			GlobalScope.launch(Main) {
+		GlobalScope.launch(Dispatchers.IO) {
+			val message = writeExternalFile(ac, fileName, mimeType, write).toSaveResult()
+			launch(Dispatchers.Main) {
 				ac.toast(message)
 			}
 		}
 	}
 
+	private fun 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) }
+		}
+	}
+
 	private fun share(bitmap: Bitmap) {
-		GlobalScope.launch {
+		val ctx = context ?: return
+		GlobalScope.launch(Dispatchers.IO) {
 			val file = File(
-				context.externalCacheDir,
+				ctx.externalCacheDir,
 				"shared_barcode.png"
 			)
 			val success = try {
@@ -163,11 +232,11 @@ class BarcodeFragment : Fragment() {
 			} catch (e: IOException) {
 				false
 			}
-			GlobalScope.launch(Main) {
+			launch(Dispatchers.Main) {
 				if (success) {
-					shareFile(context, file, "image/png")
+					shareFile(ctx, file, "image/png")
 				} else {
-					activity?.toast(R.string.error_saving_binary_data)
+					ctx.toast(R.string.error_saving_file)
 				}
 			}
 		}
@@ -176,16 +245,24 @@ class BarcodeFragment : Fragment() {
 	companion object {
 		private const val CONTENT = "content"
 		private const val FORMAT = "format"
+		private const val HINTS = "hints"
 		private const val SIZE = "size"
+		private const val MIME_PNG = "image/png"
+		private const val MIME_SVG = "image/svg+xmg"
+		private const val MIME_TXT = "text/plain"
 
 		fun newInstance(
 			content: String,
 			format: BarcodeFormat,
-			size: Int
+			size: Int,
+			hints: EnumMap<EncodeHintType, Any>? = null
 		): Fragment {
 			val args = Bundle()
 			args.putString(CONTENT, content)
 			args.putSerializable(FORMAT, format)
+			hints?.let {
+				args.putSerializable(HINTS, it)
+			}
 			args.putInt(SIZE, size)
 			val fragment = BarcodeFragment()
 			fragment.arguments = args
@@ -200,4 +277,4 @@ private fun Bitmap.saveAsPng(outputStream: OutputStream, quality: Int = 90) {
 
 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

@@ -6,6 +6,7 @@ import android.support.design.widget.FloatingActionButton
 import android.support.v4.app.Fragment
 import android.text.Editable
 import android.text.TextWatcher
+import android.text.method.LinkMovementMethod
 import android.view.*
 import android.widget.EditText
 import android.widget.TableLayout
@@ -14,10 +15,17 @@ import android.widget.TextView
 import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.actions.ActionRegistry
 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.data.Scan
-import de.markusfisch.android.binaryeye.view.setPadding
-import de.markusfisch.android.binaryeye.view.setWindowInsetListener
+import de.markusfisch.android.binaryeye.content.copyToClipboard
+import de.markusfisch.android.binaryeye.content.shareText
+import de.markusfisch.android.binaryeye.database.Scan
+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
@@ -27,18 +35,23 @@ import kotlinx.coroutines.launch
 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 linksView: TextView
 	private lateinit var format: String
 	private lateinit var fab: FloatingActionButton
 
-	private var action = ActionRegistry.DEFAULT_ACTION
-	private var isBinary = false
+	private val parentJob = Job()
+	private val scope: CoroutineScope = CoroutineScope(Dispatchers.Main + parentJob)
 	private val content: String
 		get() = contentView.text.toString()
 
-	private val parentJob = Job()
-	private val scope: CoroutineScope = CoroutineScope(Dispatchers.Main + parentJob)
+	private var closeAutomatically = false
+	private var action = ActionRegistry.DEFAULT_ACTION
+	private var isBinary = false
+	private var raw: ByteArray = ByteArray(0)
+	private var id = 0L
 
 	override fun onCreate(state: Bundle?) {
 		super.onCreate(state)
@@ -58,17 +71,22 @@ class DecodeFragment : Fragment() {
 			false
 		)
 
+		closeAutomatically = prefs.closeAutomatically &&
+				activity?.intent?.hasExtra(MainActivity.DECODED) == true
+
 		val scan = arguments?.getParcelable(SCAN) as Scan?
 			?: throw IllegalArgumentException("DecodeFragment needs a Scan")
+		id = scan.id
 
 		val inputContent = scan.content
 		isBinary = hasNonPrintableCharacters(
 			inputContent
 		) or inputContent.isEmpty()
-		val raw = scan.raw ?: inputContent.toByteArray()
+		raw = scan.raw ?: inputContent.toByteArray()
 		format = scan.format
 
 		contentView = view.findViewById(R.id.content)
+		linksView = view.findViewById(R.id.links)
 		fab = view.findViewById(R.id.open)
 
 		if (!isBinary) {
@@ -100,6 +118,8 @@ class DecodeFragment : Fragment() {
 			if (prefs.openImmediately) {
 				executeAction(content.toByteArray())
 			}
+			linksView.text = getLinks(inputContent).joinToString("\n")
+			linksView.movementMethod = LinkMovementMethod.getInstance()
 		} else {
 			contentView.setText(R.string.binary_data)
 			contentView.isEnabled = false
@@ -110,32 +130,31 @@ class DecodeFragment : Fragment() {
 		}
 
 		formatView = view.findViewById(R.id.format)
+		dataView = view.findViewById(R.id.data)
 		metaView = view.findViewById(R.id.meta)
 		hexView = view.findViewById(R.id.hex)
 
 		updateViewsAndAction(raw)
-		if (action is WifiAction) {
-			val password = (action as WifiAction).password
-			if (password != null) {
-				activity?.apply {
-					copyToClipboard(password)
-					toast(R.string.copied_password_to_clipboard)
-				}
-			}
+
+		if (!isBinary) {
+			fillDataView(dataView, inputContent)
 		}
 
 		if (prefs.showMetaData) {
 			fillMetaView(metaView, scan)
 		}
 
-		setWindowInsetListener { insets ->
-			(view.findViewById(R.id.inset_layout) as View).setPadding(insets)
-			(view.findViewById(R.id.scroll_view) as View).setPadding(insets)
-		}
+		(view.findViewById(R.id.inset_layout) as View).setPaddingFromWindowInsets()
+		(view.findViewById(R.id.scroll_view) as View).setPaddingFromWindowInsets()
 
 		return view
 	}
 
+	override fun onDestroy() {
+		super.onDestroy()
+		parentJob.cancel()
+	}
+
 	private fun updateViewsAndAction(bytes: ByteArray) {
 		val prevAction = action
 		if (!prevAction.canExecuteOn(bytes)) {
@@ -144,7 +163,7 @@ class DecodeFragment : Fragment() {
 		formatView.text = resources.getQuantityString(
 			R.plurals.barcode_info,
 			bytes.size,
-			format,
+			prettifyFormatName(format),
 			bytes.size
 		)
 		hexView.text = if (prefs.showHexDump) hexDump(bytes) else ""
@@ -161,20 +180,13 @@ class DecodeFragment : Fragment() {
 		}
 	}
 
-	private fun fillMetaView(tableLayout: TableLayout, scan: Scan) {
+	private fun fillDataTable(tableLayout: TableLayout, items: LinkedHashMap<Int, String?>?) {
 		val ctx = tableLayout.context
-		val spaceBetween = (ctx.resources.displayMetrics.density * 16f).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 ->
+		val spaceBetween = (16f * ctx.resources.displayMetrics.density).toInt()
+
+		var hasEntries = false
+
+		items?.forEach { item ->
 			item.value?.let {
 				val tr = TableRow(ctx)
 				val keyView = TextView(ctx)
@@ -185,30 +197,82 @@ class DecodeFragment : Fragment() {
 				tr.addView(keyView)
 				tr.addView(valueView)
 				tableLayout.addView(tr)
-				hasMeta = true
+				hasEntries = true
 			}
 		}
-		if (hasMeta) {
+		if (hasEntries) {
 			tableLayout.setPadding(0, 0, 0, spaceBetween)
 		}
 	}
 
+	private fun fillDataView(tableLayout: TableLayout, content: String) {
+		val items = LinkedHashMap<Int, String?>()
+
+		if (action is WifiAction) {
+			val wifiData = WifiConnector.parseMap(content)
+
+			if (wifiData != null) {
+				items[R.string.entry_type] = getString(R.string.wifi_network)
+				items[R.string.wifi_ssid] = wifiData["S"]
+				items[R.string.wifi_password] = wifiData["P"]
+				items[R.string.wifi_type] = wifiData["T"]
+				items[R.string.wifi_hidden] = wifiData["H"]
+				items[R.string.wifi_eap] = wifiData["E"]
+				items[R.string.wifi_identity] = wifiData["I"]
+				items[R.string.wifi_anonymous_identity] = wifiData["A"]
+				items[R.string.wifi_phase2] = wifiData["PH2"]
+			}
+		}
+
+		fillDataTable(tableLayout, items)
+	}
+
+	private fun fillMetaView(tableLayout: TableLayout, scan: Scan) {
+		fillDataTable(
+			tableLayout, linkedMapOf(
+				R.string.error_correction_level to scan.errorCorrectionLevel,
+				R.string.issue_number to scan.issueNumber,
+				R.string.orientation to scan.orientation,
+				R.string.other_meta_data to scan.otherMetaData,
+				R.string.pdf417_extra_metadata to scan.pdf417ExtraMetaData,
+				R.string.possible_country to scan.possibleCountry,
+				R.string.suggested_price to scan.suggestedPrice,
+				R.string.upc_ean_extension to scan.upcEanExtension
+			)
+		)
+	}
+
 	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
+		}
+		if (action is WifiAction) {
+			menu.findItem(R.id.copy_password).isVisible = true
+		}
 	}
 
 	override fun onOptionsItemSelected(item: MenuItem): Boolean {
 		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?.also {
+					shareText(it, textOrHex())
+					maybeBackOrFinish()
+				}
 				true
 			}
 			R.id.create -> {
@@ -218,10 +282,33 @@ class DecodeFragment : Fragment() {
 				)
 				true
 			}
+			R.id.remove -> {
+				db.removeScan(id)
+				backOrFinish()
+				true
+			}
 			else -> super.onOptionsItemSelected(item)
 		}
 	}
 
+	private fun textOrHex() = if (isBinary) {
+		raw.toHexString()
+	} else {
+		content
+	}
+
+	private fun copyPasswordToClipboard() {
+		val ac = action
+		if (ac is WifiAction) {
+			ac.password?.let { password ->
+				activity?.apply {
+					copyToClipboard(password)
+					toast(R.string.copied_password_to_clipboard)
+				}
+			}
+		}
+	}
+
 	private fun copyToClipboard(text: String) {
 		activity?.apply {
 			copyToClipboard(text)
@@ -229,23 +316,40 @@ class DecodeFragment : Fragment() {
 		}
 	}
 
+	private fun maybeBackOrFinish() {
+		if (closeAutomatically) {
+			backOrFinish()
+		}
+	}
+
+	private fun backOrFinish() {
+		val fm = fragmentManager
+		if (fm != null && fm.backStackEntryCount > 0) {
+			fm.popBackStack()
+		} else {
+			activity?.finish()
+		}
+	}
+
 	private fun executeAction(content: ByteArray) {
-		if (activity != null && content.isNotEmpty()) {
+		val ac = activity ?: return
+		if (content.isNotEmpty()) {
 			if (action is WifiAction &&
 				Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&
-				!hasLocationPermission(activity)
+				!hasLocationPermission(ac) { executeAction(content) }
 			) {
 				return
 			}
 			scope.launch {
-				action.execute(activity, content)
+				action.execute(ac, content)
+				maybeBackOrFinish()
 			}
 		}
 	}
 
 	private fun askForFileNameAndSave(raw: ByteArray) {
 		val ac = activity ?: return
-		if (!hasWritePermission(ac)) {
+		if (!hasWritePermission(ac) { askForFileNameAndSave(raw) }) {
 			return
 		}
 		scope.launch(Dispatchers.Main) {
@@ -256,16 +360,11 @@ class DecodeFragment : Fragment() {
 				"application/octet-stream"
 			) {
 				it.write(raw)
-			}
+			}.toSaveResult()
 			ac.toast(message)
 		}
 	}
 
-	override fun onDestroyView() {
-		parentJob.cancel()
-		super.onDestroyView()
-	}
-
 	companion object {
 		private const val SCAN = "scan"
 
@@ -279,7 +378,7 @@ class DecodeFragment : Fragment() {
 	}
 }
 
-fun hexDump(bytes: ByteArray, charsPerLine: Int = 33): String {
+private fun hexDump(bytes: ByteArray, charsPerLine: Int = 33): String {
 	if (charsPerLine < 4 || bytes.isEmpty()) {
 		return ""
 	}
@@ -292,7 +391,7 @@ 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

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

@@ -2,18 +2,25 @@ package de.markusfisch.android.binaryeye.fragment
 
 import android.os.Bundle
 import android.support.v4.app.Fragment
-import android.view.*
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import android.widget.*
 import com.google.zxing.BarcodeFormat
+import com.google.zxing.EncodeHintType
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
 import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.adapter.prettifyFormatName
 import de.markusfisch.android.binaryeye.app.addFragment
-import de.markusfisch.android.binaryeye.app.hideSoftKeyboard
 import de.markusfisch.android.binaryeye.app.prefs
-import de.markusfisch.android.binaryeye.view.setPadding
-import de.markusfisch.android.binaryeye.view.setWindowInsetListener
+import de.markusfisch.android.binaryeye.view.hideSoftKeyboard
+import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
+import java.util.*
 
 class EncodeFragment : Fragment() {
 	private lateinit var formatView: Spinner
+	private lateinit var errorCorrectionLabel: TextView
+	private lateinit var errorCorrectionLevel: Spinner
 	private lateinit var sizeView: TextView
 	private lateinit var sizeBarView: SeekBar
 	private lateinit var contentView: EditText
@@ -32,11 +39,6 @@ class EncodeFragment : Fragment() {
 		BarcodeFormat.UPC_A
 	)
 
-	override fun onCreate(state: Bundle?) {
-		super.onCreate(state)
-		setHasOptionsMenu(true)
-	}
-
 	override fun onCreateView(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
@@ -52,11 +54,38 @@ class EncodeFragment : Fragment() {
 		)
 
 		formatView = view.findViewById(R.id.format)
-		formatView.adapter = ArrayAdapter(
+		val formatAdapter = ArrayAdapter(
 			ac,
-			android.R.layout.simple_list_item_1,
-			writers.map { it.name }
+			android.R.layout.simple_spinner_item,
+			writers.map { prettifyFormatName(it.name) }
 		)
+		formatAdapter.setDropDownViewResource(
+			android.R.layout.simple_spinner_dropdown_item
+		)
+		formatView.adapter = formatAdapter
+		formatView.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+			override fun onItemSelected(
+				parentView: AdapterView<*>?,
+				selectedItemView: View?,
+				position: Int,
+				id: Long
+			) {
+				val visibility = if (
+					writers[position] == BarcodeFormat.QR_CODE
+				) {
+					View.VISIBLE
+				} else {
+					View.GONE
+				}
+				errorCorrectionLabel.visibility = visibility
+				errorCorrectionLevel.visibility = visibility
+			}
+
+			override fun onNothingSelected(parentView: AdapterView<*>?) {}
+		}
+
+		errorCorrectionLabel = view.findViewById(R.id.error_correction_label)
+		errorCorrectionLevel = view.findViewById(R.id.error_correction_level)
 
 		sizeView = view.findViewById(R.id.size_display)
 		sizeBarView = view.findViewById(R.id.size_bar)
@@ -84,10 +113,8 @@ class EncodeFragment : Fragment() {
 			encode()
 		}
 
-		setWindowInsetListener { insets ->
-			(view.findViewById(R.id.inset_layout) as View).setPadding(insets)
-			(view.findViewById(R.id.scroll_view) as View).setPadding(insets)
-		}
+		(view.findViewById(R.id.inset_layout) as View).setPaddingFromWindowInsets()
+		(view.findViewById(R.id.scroll_view) as View).setPaddingFromWindowInsets()
 
 		return view
 	}
@@ -97,22 +124,17 @@ class EncodeFragment : Fragment() {
 		prefs.indexOfLastSelectedFormat = formatView.selectedItemPosition
 	}
 
-	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.next -> {
-				encode()
-				true
-			}
-			else -> super.onOptionsItemSelected(item)
-		}
-	}
-
 	private fun encode() {
+		val hints = EnumMap<EncodeHintType, Any>(EncodeHintType::class.java)
 		val format = writers[formatView.selectedItemPosition]
+		if (format == BarcodeFormat.QR_CODE) {
+			hints[EncodeHintType.ERROR_CORRECTION] = arrayListOf(
+				ErrorCorrectionLevel.L,
+				ErrorCorrectionLevel.M,
+				ErrorCorrectionLevel.Q,
+				ErrorCorrectionLevel.H
+			)[errorCorrectionLevel.selectedItemPosition]
+		}
 		val size = getSize(sizeBarView.progress)
 		val content = contentView.text.toString()
 		if (content.isEmpty()) {
@@ -125,7 +147,7 @@ class EncodeFragment : Fragment() {
 			activity?.hideSoftKeyboard(contentView)
 			addFragment(
 				fragmentManager,
-				BarcodeFragment.newInstance(content, format, size)
+				BarcodeFragment.newInstance(content, format, size, hints)
 			)
 		}
 	}

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

@@ -21,11 +21,16 @@ 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.data.Database
-import de.markusfisch.android.binaryeye.data.exportCsv
-import de.markusfisch.android.binaryeye.view.setPadding
-import de.markusfisch.android.binaryeye.view.setWindowInsetListener
-import de.markusfisch.android.binaryeye.view.useVisibility
+import de.markusfisch.android.binaryeye.content.copyToClipboard
+import de.markusfisch.android.binaryeye.content.shareText
+import de.markusfisch.android.binaryeye.database.Database
+import de.markusfisch.android.binaryeye.database.exportCsv
+import de.markusfisch.android.binaryeye.database.exportDatabase
+import de.markusfisch.android.binaryeye.database.exportJson
+import de.markusfisch.android.binaryeye.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.*
 
 class HistoryFragment : Fragment() {
@@ -47,7 +52,7 @@ class HistoryFragment : Fragment() {
 			)
 			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
 				lockStatusBarColor()
-				val ac = activity
+				val ac = activity ?: return false
 				ac.window.statusBarColor = ContextCompat.getColor(
 					ac,
 					R.color.accent_dark
@@ -67,11 +72,20 @@ class HistoryFragment : Fragment() {
 			mode: ActionMode,
 			item: MenuItem
 		): Boolean {
+			val ac = activity ?: return false
 			return when (item.itemId) {
+				R.id.copy_scan -> {
+					scansAdapter?.getSelectedContent()?.let {
+						ac.copyToClipboard(it)
+						ac.toast(R.string.copied_to_clipboard)
+					}
+					closeActionMode()
+					true
+				}
 				R.id.edit_scan -> {
 					scansAdapter?.let {
 						askForName(
-							activity,
+							ac,
 							it.selectedScanId,
 							getScanName(it.selectedScanPosition)
 						)
@@ -81,7 +95,7 @@ class HistoryFragment : Fragment() {
 				}
 				R.id.remove_scan -> {
 					scansAdapter?.let {
-						askToRemoveScan(activity, it.selectedScanId)
+						askToRemoveScan(ac, it.selectedScanId)
 					}
 					closeActionMode()
 					true
@@ -99,6 +113,8 @@ class HistoryFragment : Fragment() {
 	private var listViewState: Parcelable? = null
 	private var actionMode: ActionMode? = null
 	private var filter: String? = null
+	private var clearListMenuItem: MenuItem? = null
+	private var exportHistoryMenuItem: MenuItem? = null
 
 	override fun onCreate(state: Bundle?) {
 		super.onCreate(state)
@@ -109,8 +125,9 @@ class HistoryFragment : Fragment() {
 		inflater: LayoutInflater,
 		container: ViewGroup?,
 		state: Bundle?
-	): View {
-		activity?.setTitle(R.string.history)
+	): View? {
+		val ac = activity ?: return null
+		ac.setTitle(R.string.history)
 
 		val view = inflater.inflate(
 			R.layout.fragment_history,
@@ -130,7 +147,6 @@ class HistoryFragment : Fragment() {
 		listView.setOnItemLongClickListener { _, v, position, id ->
 			v.isSelected = true
 			scansAdapter?.select(id, position)
-			val ac = activity
 			if (actionMode == null && ac is AppCompatActivity) {
 				actionMode = ac.delegate.startSupportActionMode(
 					actionModeCallback
@@ -138,7 +154,7 @@ class HistoryFragment : Fragment() {
 			}
 			true
 		}
-		listView.setOnScrollListener(systemBarScrollListener)
+		listView.setOnScrollListener(systemBarListViewScrollListener)
 
 		fab = view.findViewById(R.id.share)
 		fab.setOnClickListener { v ->
@@ -147,10 +163,8 @@ class HistoryFragment : Fragment() {
 
 		progressView = view.findViewById(R.id.progress_view)
 
-		setWindowInsetListener { insets ->
-			(view.findViewById(R.id.inset_layout) as View).setPadding(insets)
-			listView.setPadding(insets)
-		}
+		(view.findViewById(R.id.inset_layout) as View).setPaddingFromWindowInsets()
+		listView.setPaddingFromWindowInsets()
 
 		update()
 
@@ -172,6 +186,8 @@ class HistoryFragment : Fragment() {
 		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)
 	}
 
 	private fun initSearchView(item: MenuItem?) {
@@ -179,7 +195,7 @@ class HistoryFragment : Fragment() {
 		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
 			item.isVisible = false
 		} else {
-			val ac = activity
+			val ac = activity ?: return
 			val searchView = item.actionView as SearchView
 			val searchManager = ac.getSystemService(
 				Context.SEARCH_SERVICE
@@ -204,11 +220,11 @@ class HistoryFragment : Fragment() {
 	override fun onOptionsItemSelected(item: MenuItem): Boolean {
 		return when (item.itemId) {
 			R.id.clear -> {
-				askToRemoveAllScans(context)
+				askToRemoveScans(context)
 				true
 			}
 			R.id.export_history -> {
-				askToExportToFile(context)
+				askToExportToFile()
 				true
 			}
 			else -> super.onOptionsItemSelected(item)
@@ -242,13 +258,14 @@ class HistoryFragment : Fragment() {
 					}
 					ActivityCompat.invalidateOptionsMenu(ac)
 				}
+				enableMenuItems(hasScans)
 				fab.visibility = if (hasScans) {
 					View.VISIBLE
 				} else {
 					View.GONE
 				}
 				cursor?.let { cursor ->
-					// close previous cursor
+					// Close previous cursor.
 					scansAdapter?.also { it.changeCursor(null) }
 					scansAdapter = ScansAdapter(ac, cursor)
 					listView.adapter = scansAdapter
@@ -260,6 +277,11 @@ class HistoryFragment : Fragment() {
 		}
 	}
 
+	private fun enableMenuItems(enabled: Boolean) {
+		clearListMenuItem?.isEnabled = enabled
+		exportHistoryMenuItem?.isEnabled = enabled
+	}
+
 	private fun closeActionMode() {
 		unlockStatusBarColor()
 		scansAdapter?.clearSelection()
@@ -276,7 +298,7 @@ class HistoryFragment : Fragment() {
 				DecodeFragment.newInstance(scan)
 			)
 		} catch (e: IllegalArgumentException) {
-			// ignore, can never happen
+			// Ignore, can never happen.
 		}
 	}
 
@@ -285,7 +307,7 @@ class HistoryFragment : Fragment() {
 		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(
@@ -320,11 +342,17 @@ class HistoryFragment : Fragment() {
 			.show()
 	}
 
-	private fun askToRemoveAllScans(context: Context) {
+	private fun askToRemoveScans(context: Context) {
 		AlertDialog.Builder(context)
-			.setMessage(R.string.really_remove_all_scans)
+			.setMessage(
+				if (filter == null) {
+					R.string.really_remove_all_scans
+				} else {
+					R.string.really_remove_selected_scans
+				}
+			)
 			.setPositiveButton(android.R.string.ok) { _, _ ->
-				db.removeScans()
+				db.removeScans(filter)
 				updateAndClearFilter()
 			}
 			.setNegativeButton(android.R.string.cancel) { _, _ ->
@@ -332,25 +360,43 @@ class HistoryFragment : Fragment() {
 			.show()
 	}
 
-	private fun askToExportToFile(context: Context) = scope.launch {
-		progressView.useVisibility {
-			if (!hasWritePermission(activity)) {
-				return@useVisibility
-			}
-			val delimiters = context.resources.getStringArray(
-				R.array.csv_delimiters_values
-			)
-			val delimiter = alertDialog<String>(context) { resume ->
-				setTitle(R.string.csv_delimiter)
-				setItems(R.array.csv_delimiters_names) { _, which ->
-					resume(delimiters[which])
+	private fun askToExportToFile() {
+		scope.launch {
+			val ac = activity ?: return@launch
+			progressView.useVisibility {
+				if (!hasWritePermission(ac) { askToExportToFile() }) {
+					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])
+					}
+				} ?: return@useVisibility
+				val name = withContext(Dispatchers.Main) {
+					ac.askForFileName(
+						when (delimiter) {
+							"db" -> ".db"
+							"json" -> ".json"
+							else -> ".csv"
+						}
+					)
+				} ?: 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)
+						}
+					} ?: false
+				}.toSaveResult()
+				withContext(Dispatchers.Main) {
+					ac.toast(message)
 				}
-			} ?: return@useVisibility
-			val name = withContext(Dispatchers.Main) {
-				activity.askForFileName(suffix = ".csv")
-			} ?: return@useVisibility
-			db.getScansDetailed(filter)?.use { cursor ->
-				exportCsv(context, name, cursor, delimiter)
 			}
 		}
 	}
@@ -367,27 +413,37 @@ class HistoryFragment : Fragment() {
 			.show()
 	}
 
-	private fun shareScans(separator: String) {
-		scope.launch {
-			progressView.useVisibility {
-				val sb = StringBuilder()
-				db.getScans(filter)?.use { cursor ->
-					val contentIndex = cursor.getColumnIndex(Database.SCANS_CONTENT)
-					if (cursor.moveToFirst()) {
-						do {
-							val content = cursor.getString(contentIndex)
-							if (content?.isNotEmpty() == true) {
-								sb.append(content)
-								sb.append(separator)
-							}
-						} while (cursor.moveToNext())
-					}
+	private fun shareScans(format: String) = scope.launch {
+		progressView.useVisibility {
+			var text: String? = null
+			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)
 				}
-				val text = sb.toString()
-				if (text.isNotEmpty()) withContext(Dispatchers.Main) {
-					shareText(context, text)
+			}
+			text?.let {
+				withContext(Dispatchers.Main) {
+					shareText(context, it)
 				}
 			}
 		}
 	}
 }
+
+private fun exportText(cursor: Cursor, separator: String): String {
+	val sb = StringBuilder()
+	val contentIndex = cursor.getColumnIndex(Database.SCANS_CONTENT)
+	if (cursor.moveToFirst()) {
+		do {
+			val content = cursor.getString(contentIndex)
+			if (content?.isNotEmpty() == true) {
+				sb.append(content)
+				sb.append(separator)
+			}
+		} while (cursor.moveToNext())
+	}
+	return sb.toString()
+}

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

@@ -1,96 +1,154 @@
 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.v4.app.Fragment
-import android.support.v7.widget.SwitchCompat
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.EditText
+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.actions.wifi.removeNetworkSuggestions
+import de.markusfisch.android.binaryeye.activity.SplashActivity
 import de.markusfisch.android.binaryeye.app.prefs
-import de.markusfisch.android.binaryeye.view.setPadding
-import de.markusfisch.android.binaryeye.view.setWindowInsetListener
+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 : Fragment() {
-	private lateinit var openImmediatelySwitch: SwitchCompat
-	private lateinit var vibrateSwitch: SwitchCompat
-	private lateinit var useHistorySwitch: SwitchCompat
-	private lateinit var showMetaDataSwitch: SwitchCompat
-	private lateinit var showHexDumpSwitch: SwitchCompat
-	private lateinit var tryHarderSwitch: SwitchCompat
-	private lateinit var ignoreConsecutiveDuplicatesSwitch: SwitchCompat
-	private lateinit var openWithUrlInput: EditText
+class PreferencesFragment : PreferenceFragmentCompat() {
+	private val changeListener = object : OnSharedPreferenceChangeListener {
+		override fun onSharedPreferenceChanged(
+			sharedPreferences: SharedPreferences,
+			key: String
+		) {
+			val preference = findPreference(key) ?: return
+			prefs.update()
+			if (preference.key == "custom_locale") {
+				activity?.restartApp()
+			} else {
+				setSummary(preference)
+			}
+		}
+	}
 
-	override fun onCreateView(
-		inflater: LayoutInflater,
-		container: ViewGroup?,
-		state: Bundle?
-	): View? {
+	override fun onCreatePreferences(state: Bundle?, rootKey: String?) {
+		addPreferencesFromResource(R.xml.preferences)
 		activity?.setTitle(R.string.preferences)
+		wireClearNetworkPreferences()
+	}
 
-		val view = inflater.inflate(
-			R.layout.fragment_preferences,
-			container,
-			false
+	private fun wireClearNetworkPreferences() {
+		val pref = findPreference("clear_network_suggestions") ?: return
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+			pref.isVisible = false
+		} else {
+			pref.setOnPreferenceClickListener {
+				askToClearNetworkSuggestions(context)
+				true
+			}
+		}
+	}
+
+	@RequiresApi(Build.VERSION_CODES.Q)
+	private fun askToClearNetworkSuggestions(context: Context) {
+		AlertDialog.Builder(context)
+			.setMessage(R.string.really_remove_all_networks)
+			.setPositiveButton(android.R.string.ok) { _, _ ->
+				clearNetworkSuggestions(context)
+			}
+			.setNegativeButton(android.R.string.cancel) { _, _ -> }
+			.show()
+	}
+
+	@RequiresApi(Build.VERSION_CODES.Q)
+	private fun clearNetworkSuggestions(context: Context) {
+		context.toast(
+			if (
+				removeNetworkSuggestions(context) == WifiManager.STATUS_NETWORK_SUGGESTIONS_SUCCESS
+			) {
+				R.string.clear_network_suggestions_success
+			} else {
+				R.string.clear_network_suggestions_nothing_to_remove
+			}
 		)
+	}
 
-		openImmediatelySwitch = view.findViewById(R.id.open_immediately)
-		if (prefs.openImmediately) {
-			openImmediatelySwitch.toggle()
-		}
-
-		vibrateSwitch = view.findViewById(R.id.vibrate)
-		if (prefs.vibrate) {
-			vibrateSwitch.toggle()
-		}
-
-		useHistorySwitch = view.findViewById(R.id.use_history)
-		if (prefs.useHistory) {
-			useHistorySwitch.toggle()
-		}
-
-		ignoreConsecutiveDuplicatesSwitch = view.findViewById(
-			R.id.ignore_consecutive_duplicates
-		)
-		if (prefs.ignoreConsecutiveDuplicates) {
-			ignoreConsecutiveDuplicatesSwitch.toggle()
-		}
-
-		showMetaDataSwitch = view.findViewById(R.id.show_meta_data)
-		if (prefs.showMetaData) {
-			showMetaDataSwitch.toggle()
-		}
-
-		showHexDumpSwitch = view.findViewById(R.id.show_hex_dump)
-		if (prefs.showHexDump) {
-			showHexDumpSwitch.toggle()
-		}
-
-		tryHarderSwitch = view.findViewById(R.id.try_harder)
-		if (prefs.tryHarder) {
-			tryHarderSwitch.toggle()
-		}
-
-		openWithUrlInput = view.findViewById(R.id.open_with_url)
-		openWithUrlInput.setText(prefs.openWithUrl)
-
-		setWindowInsetListener { insets ->
-			(view.findViewById(R.id.scroll_view) as View).setPadding(insets)
-		}
-
-		return view
+	override fun onResume() {
+		super.onResume()
+		listView.setPaddingFromWindowInsets()
+		listView.removeOnScrollListener(systemBarRecyclerViewScrollListener)
+		listView.addOnScrollListener(systemBarRecyclerViewScrollListener)
+		preferenceScreen.sharedPreferences
+			.registerOnSharedPreferenceChangeListener(changeListener)
+		setSummaries(preferenceScreen)
 	}
 
 	override fun onPause() {
 		super.onPause()
-		prefs.openImmediately = openImmediatelySwitch.isChecked
-		prefs.vibrate = vibrateSwitch.isChecked
-		prefs.useHistory = useHistorySwitch.isChecked
-		prefs.ignoreConsecutiveDuplicates = ignoreConsecutiveDuplicatesSwitch.isChecked
-		prefs.showMetaData = showMetaDataSwitch.isChecked
-		prefs.showHexDump = showHexDumpSwitch.isChecked
-		prefs.tryHarder = tryHarderSwitch.isChecked
-		prefs.openWithUrl = openWithUrlInput.text.toString()
+		preferenceScreen.sharedPreferences
+			.unregisterOnSharedPreferenceChangeListener(changeListener)
+	}
+
+	override fun onDisplayPreferenceDialog(preference: Preference) {
+		if (preference is UrlPreference) {
+			val fm = fragmentManager
+			UrlDialogFragment.newInstance(preference.key).apply {
+				setTargetFragment(this@PreferencesFragment, 0)
+				show(fm, null)
+			}
+		} else {
+			super.onDisplayPreferenceDialog(preference)
+		}
+	}
+
+	private fun setSummaries(screen: PreferenceGroup) {
+		var i = screen.preferenceCount
+		while (i-- > 0) {
+			setSummary(screen.getPreference(i))
+		}
+	}
+
+	private fun setSummary(preference: Preference) {
+		when (preference) {
+			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)
+			}
+		}
 	}
 }
+
+private fun Activity.restartApp() {
+	val intent = Intent(this, SplashActivity::class.java)
+	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+		intent.addFlags(
+			Intent.FLAG_ACTIVITY_NEW_TASK or
+					Intent.FLAG_ACTIVITY_CLEAR_TASK
+		)
+	}
+	startActivity(intent)
+	finish()
+	// Restart to begin with an unmodified Locale to follow system settings.
+	Runtime.getRuntime().exit(0)
+}

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

@@ -0,0 +1,96 @@
+package de.markusfisch.android.binaryeye.fragment
+
+import android.os.Bundle
+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.app.prefs
+import de.markusfisch.android.binaryeye.database.Scan
+import de.markusfisch.android.binaryeye.net.sendAsync
+import de.markusfisch.android.binaryeye.preference.UrlPreference
+
+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)
+		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(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,
+			"none",
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null
+		).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()
+			args.putString(ARG_KEY, key)
+			val fragment = UrlDialogFragment()
+			fragment.arguments = args
+			return fragment
+		}
+	}
+}
+
+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

@@ -7,6 +7,8 @@ import android.graphics.Matrix
 import android.graphics.RectF
 import android.net.Uri
 import java.io.IOException
+import kotlin.math.max
+import kotlin.math.min
 import kotlin.math.roundToInt
 
 fun loadImageUri(cr: ContentResolver, uri: Uri): Bitmap? = try {
@@ -51,12 +53,14 @@ fun crop(bitmap: Bitmap, rect: RectF, rotation: Float) = try {
 	val erected = erect(bitmap, rotation)
 	val w = erected.width
 	val h = erected.height
+	val x = max(0, (rect.left * w).roundToInt())
+	val y = max(0, (rect.top * h).roundToInt())
 	Bitmap.createBitmap(
 		erected,
-		(rect.left * w).roundToInt(),
-		(rect.top * h).roundToInt(),
-		(rect.width() * w).roundToInt(),
-		(rect.height() * h).roundToInt()
+		x,
+		y,
+		min(w - x, (rect.width() * w).roundToInt()),
+		min(h - y, (rect.height() * h).roundToInt())
 	)
 } catch (e: OutOfMemoryError) {
 	null

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

@@ -1,32 +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 Candidates(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.candidate
-		)
-		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/DashedBorderPaint.kt

@@ -0,0 +1,15 @@
+package de.markusfisch.android.binaryeye.graphics
+
+import android.content.Context
+import android.graphics.DashPathEffect
+import android.graphics.Paint
+import android.support.v4.content.ContextCompat
+import de.markusfisch.android.binaryeye.R
+
+fun Context.getDashedBorderPaint() = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+	val dp = resources.displayMetrics.density
+	color = ContextCompat.getColor(applicationContext, R.color.crop_bound)
+	style = Paint.Style.STROKE
+	strokeWidth = dp * 2f
+	pathEffect = DashPathEffect(floatArrayOf(10f * dp, 10f * dp), 0f)
+}

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

@@ -0,0 +1,36 @@
+package de.markusfisch.android.binaryeye.graphics
+
+import android.content.res.Resources
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import android.os.Build
+
+fun Resources.getBitmapFromDrawable(
+	resId: Int
+): Bitmap = getBitmapFromDrawable(getDrawableCompat(resId))
+
+fun Resources.getDrawableCompat(
+	resId: Int
+): Drawable = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+	getDrawable(resId, null)
+} else {
+	@Suppress("DEPRECATION")
+	getDrawable(resId)
+}
+
+private fun getBitmapFromDrawable(drawable: Drawable): Bitmap {
+	if (drawable is BitmapDrawable) {
+		return drawable.bitmap
+	}
+	val bitmap = Bitmap.createBitmap(
+		drawable.intrinsicWidth,
+		drawable.intrinsicHeight,
+		Bitmap.Config.ARGB_8888
+	)
+	val canvas = Canvas(bitmap)
+	drawable.setBounds(0, 0, canvas.width, canvas.height)
+	drawable.draw(canvas)
+	return bitmap
+}

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

@@ -1,37 +1,62 @@
 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 kotlin.math.roundToInt
 
-fun mapResult(
-	width: Int,
-	height: Int,
+fun mapResultToView(
+	frameWidth: Int,
+	frameHeight: Int,
+	frameOrientation: Int,
 	viewRect: Rect,
-	result: Result
-): List<Point> = frameToView(width, height, viewRect).map(result.resultPoints)
-
-fun frameToView(width: Int, height: Int, viewRect: Rect) = Mapping(
-	viewRect.width().toFloat() / width.toFloat(),
-	viewRect.height().toFloat() / height.toFloat(),
-	viewRect.left,
-	viewRect.top
+	resultPoints: Array<ResultPoint?>,
+	targetArray: FloatArray
+): Int = getFrameToViewMatrix(
+	frameWidth,
+	frameHeight,
+	frameOrientation,
+	viewRect
+).map(
+	resultPoints,
+	targetArray
 )
 
-data class Mapping(
-	val ratioX: Float,
-	val ratioY: Float,
-	val offsetX: Int,
-	val offsetY: Int
-) {
-	fun map(point: ResultPoint) = Point(
-		(point.x * ratioX).roundToInt() + offsetX,
-		(point.y * ratioY).roundToInt() + offsetY
+fun getFrameToViewMatrix(
+	frameWidth: Int,
+	frameHeight: Int,
+	frameOrientation: Int,
+	viewRect: Rect
+) = Matrix().apply {
+	// Normalize to frame dimensions for rotation.
+	postScale(
+		1f / frameWidth,
+		1f / frameHeight
 	)
-
-	fun map(points: Array<ResultPoint?>): List<Point> =
-		// because ZXing apparently returns null in this array sometimes
-		points.filterNotNull().map { map(it) }
+	// Rotate around center.
+	postRotate(frameOrientation.toFloat(), 0.5f, 0.5f)
+	// Scale up to view size.
+	postScale(viewRect.width().toFloat(), viewRect.height().toFloat())
+	// Apply view displacement.
+	postTranslate(viewRect.left.toFloat(), viewRect.top.toFloat())
+}
+
+fun Matrix.map(
+	resultPoints: Array<ResultPoint?>,
+	targetArray: FloatArray
+): Int {
+	val max = targetArray.size
+	var i = 0
+	for (resultPoint in resultPoints) {
+		// Because ZXing apparently returns null in this array sometimes.
+		if (resultPoint == null) {
+			continue
+		}
+		targetArray[i++] = resultPoint.x
+		targetArray[i++] = resultPoint.y
+		if (i >= max) {
+			break
+		}
+	}
+	mapPoints(targetArray, 0, targetArray, 0, i)
+	return i
 }

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
@@ -39,30 +40,29 @@ suspend fun Activity.askForFileName(suffix: String = ""): String? {
 	}
 }
 
+fun Boolean.toSaveResult() = if (this) {
+	R.string.saved_in_downloads
+} else {
+	R.string.error_saving_file
+}
+
 fun writeExternalFile(
 	context: Context,
 	fileName: String,
 	mimeType: String,
-	write: (outputStream: OutputStream) -> Any
-): Int = try {
-	val outputStream = getExternalOutputStream(
-		context,
-		fileName,
-		mimeType
-	) ?: throw IOException()
-	outputStream.use { write(it) }
-	R.string.saved_in_downloads
-} catch (e: FileAlreadyExistsException) {
-	R.string.error_file_exists
+	write: (outputStream: OutputStream) -> Unit
+): Boolean = try {
+	openExternalOutputStream(context, fileName, mimeType).use { write(it) }
+	true
 } catch (e: IOException) {
-	R.string.error_saving_binary_data
+	false
 }
 
-private fun getExternalOutputStream(
+private fun openExternalOutputStream(
 	context: Context,
 	fileName: String,
 	mimeType: String
-): OutputStream? = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+): OutputStream = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
 	@Suppress("DEPRECATION")
 	val file = File(
 		Environment.getExternalStoragePublicDirectory(
@@ -71,7 +71,7 @@ private fun getExternalOutputStream(
 		fileName
 	)
 	if (file.exists()) {
-		throw FileAlreadyExistsException(file)
+		throw IOException()
 	}
 	FileOutputStream(file)
 } else {
@@ -82,10 +82,6 @@ private fun getExternalOutputStream(
 			put(MediaStore.Downloads.DISPLAY_NAME, fileName)
 			put(MediaStore.Downloads.MIME_TYPE, mimeType)
 		}
-	)
-	if (uri != null) {
-		resolver.openOutputStream(uri)
-	} else {
-		null
-	}
+	) ?: throw IOException()
+	resolver.openOutputStream(uri) ?: throw IOException()
 }

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

@@ -0,0 +1,122 @@
+package de.markusfisch.android.binaryeye.net
+
+import de.markusfisch.android.binaryeye.app.toHexString
+import de.markusfisch.android.binaryeye.database.Scan
+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(url: String, type: String, callback: (Int?, String?) -> Unit) {
+	CoroutineScope(Dispatchers.IO).launch(Dispatchers.IO) {
+		val response = send(url, type)
+		withContext(Dispatchers.Main) {
+			callback(response.code, response.body)
+		}
+	}
+}
+
+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")
+			con.outputStream.apply {
+				write(asUrlArguments().toByteArray())
+				close()
+			}
+		}
+		"3" -> request(url) { con ->
+			con.requestMethod = "POST"
+			con.setRequestProperty("Content-Type", "application/json")
+			con.outputStream.apply {
+				write(asJson().toString().toByteArray())
+				close()
+			}
+		}
+		else -> request(
+			url + urlEncode(content)
+		)
+	}
+}
+
+private fun Scan.asUrlArguments(): String = getMap().map { (k, v) ->
+	"${k}=${urlEncode(v)}"
+}.joinToString("&")
+
+private fun Scan.asJson() = JSONObject().apply {
+	getMap().forEach { (k, v) -> put(k, v) }
+}
+
+private fun urlEncode(s: String) = URLEncoder.encode(s, "utf-8")
+
+private fun Scan.getMap(): Map<String, String> = mapOf(
+	"content" to content,
+	"raw" to raw?.toHexString(),
+	"format" to format,
+	"errorCorrectionLevel" to errorCorrectionLevel,
+	"issueNumber" to issueNumber,
+	"orientation" to orientation,
+	"otherMetaData" to otherMetaData,
+	"pdf417ExtraMetaData" to pdf417ExtraMetaData,
+	"possibleCountry" to possibleCountry,
+	"suggestedPrice" to suggestedPrice,
+	"upcEanExtension" to upcEanExtension,
+	"timestamp" to timestamp
+).filterNullValues()
+
+private fun Map<String, String?>.filterNullValues() =
+	filterValues { it != null }.mapValues { it.value as String }
+
+private fun request(
+	url: String,
+	writer: ((HttpURLConnection) -> Any)? = null
+): Response {
+	var con: HttpURLConnection? = null
+	return try {
+		con = URL(url).openConnection() as HttpURLConnection
+		con.connectTimeout = 5000
+		writer?.invoke(con)
+		val body = con.inputStream.readHead()
+		Response(con.responseCode, body)
+	} catch (e: ProtocolException) {
+		Response(null, e.message)
+	} catch (e: IOException) {
+		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/os/Vibrator.kt

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

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

@@ -2,54 +2,172 @@ package de.markusfisch.android.binaryeye.preference
 
 import android.content.Context
 import android.content.SharedPreferences
+import android.os.Build
 import android.preference.PreferenceManager
+import android.support.annotation.RequiresApi
 
 class Preferences {
 	lateinit var preferences: SharedPreferences
 
-	var openImmediately = false
+	var barcodeFormats = setOf(
+		"AZTEC",
+		"CODABAR",
+		"CODE_39",
+		"CODE_93",
+		"CODE_128",
+		"DATA_MATRIX",
+		"EAN_8",
+		"EAN_13",
+		"ITF",
+		"MAXICODE",
+		"PDF_417",
+		"QR_CODE",
+		"RSS_14",
+		"RSS_EXPANDED",
+		"UPC_A",
+		"UPC_E",
+		"UPC_EAN_EXTENSION"
+	)
+		@RequiresApi(Build.VERSION_CODES.HONEYCOMB)
 		set(value) {
-			setBoolean(OPEN_IMMEDIATELY, value)
+			apply(BARCODE_FORMATS, value)
 			field = value
 		}
-	var vibrate = true
+	var cropHandleX = -2 // -2 means set default roi.
 		set(value) {
-			setBoolean(VIBRATE, value)
+			apply(CROP_HANDLE_X, value)
 			field = value
 		}
-	var useHistory = false
+	var cropHandleY = -2
 		set(value) {
-			setBoolean(USE_HISTORY, value)
+			apply(CROP_HANDLE_Y, value)
 			field = value
 		}
-	var ignoreConsecutiveDuplicates = true
+	var cropHandleOrientation = 0
 		set(value) {
-			setBoolean(IGNORE_CONSECUTIVE_DUPLICATES, value)
+			apply(CROP_HANDLE_ORIENTATION, value)
 			field = value
 		}
-	var showMetaData = true
+	var showCropHandle = true
 		set(value) {
-			setBoolean(SHOW_META_DATA, value)
+			apply(SHOW_CROP_HANDLE, value)
 			field = value
 		}
-	var showHexDump = true
+	var zoomBySwiping = true
 		set(value) {
-			setBoolean(SHOW_HEX_DUMP, value)
+			apply(ZOOM_BY_SWIPING, value)
+			field = value
+		}
+	var autoRotate = false
+		set(value) {
+			// Immediately save this setting before it shouldn't change
+			// on the fly while scanning.
+			commit(AUTO_ROTATE, value)
 			field = value
 		}
 	var tryHarder = false
 		set(value) {
-			setBoolean(TRY_HARDER, value)
+			// Immediately save this setting because it's only ever read
+			// before the camera is opened.
+			commit(TRY_HARDER, value)
+			field = value
+		}
+	var bulkMode = false
+		set(value) {
+			// Immediately save this setting because it's only ever read
+			// before the camera is opened.
+			commit(BULK_MODE, value)
+			field = value
+		}
+	var bulkModeDelay = "500"
+		set(value) {
+			// Immediately save this setting because it's only ever read
+			// before the camera is opened.
+			commit(BULK_MODE_DELAY, value)
+			field = value
+		}
+	var showToastInBulkMode = true
+		set(value) {
+			// Immediately save this setting because it's only ever read
+			// before the camera is opened.
+			commit(SHOW_TOAST_IN_BULK_MODE, value)
+			field = value
+		}
+	var vibrate = true
+		set(value) {
+			apply(VIBRATE, value)
+			field = value
+		}
+	var useHistory = false
+		set(value) {
+			apply(USE_HISTORY, value)
+			field = value
+		}
+	var ignoreConsecutiveDuplicates = true
+		set(value) {
+			apply(IGNORE_CONSECUTIVE_DUPLICATES, value)
+			field = value
+		}
+	var copyImmediately = false
+		set(value) {
+			apply(COPY_IMMEDIATELY, value)
+			field = value
+		}
+	var openImmediately = false
+		set(value) {
+			apply(OPEN_IMMEDIATELY, value)
+			field = value
+		}
+	var showMetaData = true
+		set(value) {
+			apply(SHOW_META_DATA, value)
+			field = value
+		}
+	var showHexDump = true
+		set(value) {
+			apply(SHOW_HEX_DUMP, 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) {
-			setString(OPEN_WITH_URL, value)
+			apply(OPEN_WITH_URL, value)
+			field = value
+		}
+	var sendScanUrl: String = ""
+		set(value) {
+			apply(SEND_SCAN_URL, value)
+			field = value
+		}
+	var sendScanType: String = "0"
+		set(value) {
+			apply(SEND_SCAN_TYPE, value)
+			field = value
+		}
+	var customLocale: String = ""
+		set(value) {
+			apply(CUSTOM_LOCALE, value)
 			field = value
 		}
 	var indexOfLastSelectedFormat: Int = 0
 		set(value) {
-			setInt(INDEX_OF_LAST_SELECTED_FORMAT, value)
+			apply(INDEX_OF_LAST_SELECTED_FORMAT, value)
+			field = value
+		}
+	var forceCompat: Boolean = false
+		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)
 			field = value
 		}
 
@@ -59,9 +177,32 @@ class Preferences {
 	}
 
 	fun update() {
-		openImmediately = preferences.getBoolean(
-			OPEN_IMMEDIATELY,
-			openImmediately
+		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
+		)
+		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)
 		useHistory = preferences.getBoolean(USE_HISTORY, useHistory)
@@ -69,45 +210,99 @@ class Preferences {
 			IGNORE_CONSECUTIVE_DUPLICATES,
 			ignoreConsecutiveDuplicates
 		)
+		copyImmediately = preferences.getBoolean(
+			COPY_IMMEDIATELY,
+			copyImmediately
+		)
+		openImmediately = preferences.getBoolean(
+			OPEN_IMMEDIATELY,
+			openImmediately
+		)
 		showMetaData = preferences.getBoolean(SHOW_META_DATA, showMetaData)
 		showHexDump = preferences.getBoolean(SHOW_HEX_DUMP, showHexDump)
-		tryHarder = preferences.getBoolean(TRY_HARDER, tryHarder)
+		closeAutomatically = preferences.getBoolean(
+			CLOSE_AUTOMATICALLY,
+			closeAutomatically
+		)
+		preferences.getString(DEFAULT_SEARCH_URL, defaultSearchUrl)?.also {
+			defaultSearchUrl = it
+		}
 		preferences.getString(OPEN_WITH_URL, openWithUrl)?.also {
 			openWithUrl = it
 		}
+		preferences.getString(SEND_SCAN_URL, sendScanUrl)?.also {
+			sendScanUrl = it
+		}
+		preferences.getString(SEND_SCAN_TYPE, sendScanType)?.also {
+			sendScanType = it
+		}
+		preferences.getString(CUSTOM_LOCALE, customLocale)?.also {
+			customLocale = it
+		}
 		indexOfLastSelectedFormat = preferences.getInt(
 			INDEX_OF_LAST_SELECTED_FORMAT,
 			indexOfLastSelectedFormat
 		)
+		forceCompat = preferences.getBoolean(FORCE_COMPAT, forceCompat)
 	}
 
-	private fun setBoolean(label: String, value: Boolean) {
-		val editor = preferences.edit()
-		editor.putBoolean(label, value)
-		editor.apply()
+	private fun put(label: String, value: Boolean) =
+		preferences.edit().putBoolean(label, value)
+
+	private fun put(label: String, value: String) =
+		preferences.edit().putString(label, value)
+
+	private fun commit(label: String, value: Boolean) {
+		put(label, value).commit()
 	}
 
-	private fun setString(label: String, value: String) {
-		val editor = preferences.edit()
-		editor.putString(label, value)
-		editor.apply()
+	private fun commit(label: String, value: String) {
+		put(label, value).commit()
 	}
 
-	private fun setInt(label: String, value: Int) {
-		val editor = preferences.edit()
-		editor.putInt(label, value)
-		editor.apply()
+	private fun apply(label: String, value: Boolean) {
+		put(label, value).apply()
+	}
+
+	private fun apply(label: String, value: String) {
+		preferences.edit().putString(label, value).apply()
+	}
+
+	private fun apply(label: String, value: Int) {
+		preferences.edit().putInt(label, value).apply()
+	}
+
+	@RequiresApi(Build.VERSION_CODES.HONEYCOMB)
+	private fun apply(label: String, value: Set<String>) {
+		preferences.edit().putStringSet(label, value).apply()
 	}
 
 	companion object {
-		const val OPEN_IMMEDIATELY = "open_immediately"
+		const val BARCODE_FORMATS = "barcode_formats"
+		const val CROP_HANDLE_X = "crop_handle_x"
+		const val CROP_HANDLE_Y = "crop_handle_y"
+		const val CROP_HANDLE_ORIENTATION = "crop_handle_orientation"
+		const val SHOW_CROP_HANDLE = "show_crop_handle"
+		const val ZOOM_BY_SWIPING = "zoom_by_swiping"
+		const val AUTO_ROTATE = "auto_rotate"
+		const val TRY_HARDER = "try_harder"
+		const val BULK_MODE = "bulk_mode"
+		const val BULK_MODE_DELAY = "bulk_mode_delay"
+		const val SHOW_TOAST_IN_BULK_MODE = "show_toast_in_bulk_mode"
 		const val VIBRATE = "vibrate"
 		const val USE_HISTORY = "use_history"
 		const val IGNORE_CONSECUTIVE_DUPLICATES = "ignore_consecutive_duplicates"
-		const val SHOW_HEX_DUMP = "show_hex_dump"
+		const val OPEN_IMMEDIATELY = "open_immediately"
+		const val COPY_IMMEDIATELY = "copy_immediately"
 		const val SHOW_META_DATA = "show_meta_data"
-		const val TRY_HARDER = "try_harder"
+		const val SHOW_HEX_DUMP = "show_hex_dump"
+		const val CLOSE_AUTOMATICALLY = "close_automatically"
+		const val DEFAULT_SEARCH_URL = "default_search_url"
 		const val OPEN_WITH_URL = "open_with_url"
+		const val SEND_SCAN_URL = "send_scan_url"
+		const val SEND_SCAN_TYPE = "send_scan_type"
+		const val CUSTOM_LOCALE = "custom_locale"
 		const val INDEX_OF_LAST_SELECTED_FORMAT = "index_of_last_selected_format"
+		const val FORCE_COMPAT = "force_compat"
 	}
 }

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

@@ -0,0 +1,37 @@
+package de.markusfisch.android.binaryeye.preference
+
+import android.content.Context
+import android.support.v7.preference.DialogPreference
+import android.util.AttributeSet
+import de.markusfisch.android.binaryeye.R
+
+class UrlPreference(
+	context: Context?,
+	attrs: AttributeSet?
+) : DialogPreference(context, attrs) {
+	private var url: String? = null
+
+	init {
+		dialogLayoutResource = R.layout.dialog_url
+	}
+
+	fun getUrl() = url
+
+	fun setUrl(url: String) {
+		this.url = url
+		persistString(url)
+	}
+
+	override fun onSetInitialValue(
+		restorePersistedValue: Boolean,
+		defaultValue: Any?
+	) {
+		setUrl(
+			if (restorePersistedValue) {
+				getPersistedString(url)
+			} else {
+				defaultValue as String
+			}
+		)
+	}
+}

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

@@ -0,0 +1,42 @@
+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,25 +1,28 @@
 package de.markusfisch.android.binaryeye.rs
 
-import android.content.Context
+import android.graphics.Rect
 import android.support.v8.renderscript.*
-import de.markusfisch.android.binaryeye.renderscript.ScriptC_rotator
+import kotlin.math.max
 import kotlin.math.roundToInt
 
+private const val SCALE_FACTOR = .75f
+
 class Preprocessor(
-	context: Context,
+	rs: RenderScript,
 	width: Int,
 	height: Int,
-	private val orientation: Int
+	private val roi: Rect?
 ) {
 	var outWidth = 0
 	var outHeight = 0
 
-	private val rs = RenderScript.create(context)
 	private val resizeScript = ScriptIntrinsicResize.create(rs)
-	private val rotatorScript = ScriptC_rotator(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
@@ -38,15 +41,42 @@ class Preprocessor(
 			Allocation.USAGE_SCRIPT
 		)
 
-		val f = .75f
-		var w = (width * f).roundToInt()
-		var h = (height * f).roundToInt()
+		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),
-			w,
-			h
+			outWidth,
+			outHeight
 		)
 		resizedAlloc = Allocation.createTyped(
 			rs,
@@ -54,28 +84,17 @@ class Preprocessor(
 			Allocation.USAGE_SCRIPT
 		)
 
-		if (orientation == 90 || orientation == 270) {
-			val tmp = w
-			w = h
-			h = tmp
-		}
-
-		outWidth = w
-		outHeight = h
-
-		if (orientation != 0) {
-			rotatedType = Type.createXY(
-				rs,
-				Element.U8(rs),
-				w,
-				h
-			)
-			rotatedAlloc = Allocation.createTyped(
-				rs,
-				rotatedType,
-				Allocation.USAGE_SCRIPT
-			)
-		}
+		rotatedType = Type.createXY(
+			rs,
+			Element.U8(rs),
+			outHeight,
+			outWidth
+		)
+		rotatedAlloc = Allocation.createTyped(
+			rs,
+			rotatedType,
+			Allocation.USAGE_SCRIPT
+		)
 	}
 
 	fun destroy() {
@@ -83,6 +102,10 @@ class Preprocessor(
 		yuvType = null
 		yuvAlloc?.destroy()
 		yuvAlloc = null
+		roiType?.destroy()
+		roiType = null
+		roiAlloc?.destroy()
+		roiAlloc = null
 		resizedType?.destroy()
 		resizedType = null
 		resizedAlloc?.destroy()
@@ -92,38 +115,42 @@ class Preprocessor(
 		rotatedAlloc?.destroy()
 		rotatedAlloc = null
 		resizeScript.destroy()
-		rotatorScript.destroy()
-		rs.destroy()
+		rotateScript.destroy()
 	}
 
-	fun process(frame: ByteArray) {
+	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(yuvAlloc)
-		resizeScript.forEach_bicubic(resizedAlloc)
-
-		val t = resizedType
-		if (t == null || orientation == 0) {
-			resizedAlloc?.copyTo(frame)
-		} else {
-			rotatorScript._inImage = resizedAlloc
-			rotatorScript._inWidth = t.x
-			rotatorScript._inHeight = t.y
-			when (orientation) {
-				90 -> rotatorScript.forEach_rotate90(
-					rotatedAlloc,
-					rotatedAlloc
-				)
-				180 -> rotatorScript.forEach_rotate180(
-					rotatedAlloc,
-					rotatedAlloc
-				)
-				270 -> rotatorScript.forEach_rotate270(
-					rotatedAlloc,
-					rotatedAlloc
+		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
 			}
-			rotatedAlloc?.copyTo(frame)
-		}
+		)
+		resizeScript.forEach_bicubic(resizedAlloc)
 	}
 }

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

@@ -0,0 +1,18 @@
+package de.markusfisch.android.binaryeye.service
+
+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() {
+	@RequiresApi(Build.VERSION_CODES.N)
+	override fun onClick() {
+		super.onClick()
+		val intent = Intent(applicationContext, CameraActivity::class.java)
+		intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+		startActivityAndCollapse(intent)
+	}
+}

app/src/main/kotlin/de/markusfisch/android/binaryeye/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
@@ -6,35 +6,44 @@ import android.graphics.drawable.ColorDrawable
 import android.os.Build
 import android.support.v4.content.ContextCompat
 import android.support.v7.app.AppCompatActivity
+import android.support.v7.widget.LinearLayoutManager
+import android.support.v7.widget.RecyclerView
 import android.view.View
+import android.view.WindowManager
 import android.widget.AbsListView
 import de.markusfisch.android.binaryeye.R
 
-val systemBarScrollListener = object : AbsListView.OnScrollListener {
+val systemBarListViewScrollListener = object : AbsListView.OnScrollListener {
 	override fun onScroll(
 		view: AbsListView,
 		firstVisibleItem: Int,
 		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))
-			val scrollable = if (scrolled) {
-				true
-			} else {
-				totalItemCount > 0 && lastChildOutOfView(view)
-			}
+			val scrollable = scrolled || totalItemCount > 0 && lastChildOutOfView(view)
 			colorSystemAndToolBars(view.context, scrolled, scrollable)
 		}
 	}
 
-	override fun onScrollStateChanged(
-		view: AbsListView,
-		scrollState: Int
-	) {
+	override fun onScrollStateChanged(view: AbsListView, scrollState: Int) {
+	}
+}
+
+val systemBarRecyclerViewScrollListener = object : RecyclerView.OnScrollListener() {
+	override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+		val layoutManager = recyclerView.layoutManager as LinearLayoutManager
+		val scrolled = layoutManager.findFirstCompletelyVisibleItemPosition() != 0
+		val scrollable = scrolled || layoutManager.findLastVisibleItemPosition() <
+				recyclerView.adapter.itemCount - 1
+		colorSystemAndToolBars(recyclerView.context, scrolled, scrollable)
+	}
+
+	override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
 	}
 }
 
@@ -45,12 +54,17 @@ private fun firstChildScrolled(listView: AbsListView): Boolean {
 
 private fun lastChildOutOfView(listView: AbsListView): Boolean {
 	val child = listView.getChildAt(listView.lastVisiblePosition)
-	return child.bottom >= listView.height
+	return child != null && child.bottom >= listView.height
 }
 
 fun initSystemBars(activity: AppCompatActivity) {
 	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-		activity.window.decorView.systemUiVisibility =
+		// Keeps the soft keyboard from repositioning the layout.
+		val window = activity.window
+		window.setSoftInputMode(
+			WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
+		)
+		window.decorView.systemUiVisibility =
 			View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
 					View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
 					View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
@@ -95,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

@@ -2,49 +2,60 @@ package de.markusfisch.android.binaryeye.view
 
 import android.graphics.Rect
 import android.os.Build
+import android.support.annotation.RequiresApi
 import android.support.v4.view.ViewCompat
+import android.support.v4.view.WindowInsetsCompat
 import android.support.v7.widget.Toolbar
 import android.view.View
 
-private val windowInsets = Rect()
-private var windowInsetsSet = false
-private var windowInsetsListener: ((insets: Rect) -> Unit)? = null
-
-// invoke this from Fragment.onCreateView() *or* Activity.onCreate()
-fun setWindowInsetListener(listener: (insets: Rect) -> Unit) {
-	if (windowInsetsSet) {
-		// invoke listener for previously set window insets because
-		// setOnApplyWindowInsetsListener() won't fire again if we
-		// change Fragments
-		listener(windowInsets)
-	}
-	// *always* set the listener in case there is a configuration change
-	windowInsetsListener = listener
+private var toolbarHeight = 0
+fun recordToolbarHeight(toolbar: Toolbar) {
+	toolbarHeight = toolbar.layoutParams.height
 }
 
-// invoke this from Activity.onCreate() to setup listening for insets
-fun setupInsets(view: View, toolbar: Toolbar) {
-	val toolBarHeight = toolbar.layoutParams.height
+fun View.setPaddingFromWindowInsets() {
+	doOnApplyWindowInsets { v, insets -> v.setPadding(insets) }
+}
+
+// A slight variation of the idea from Google's Chris Banes to avoid
+// adding the toolbar height for every view that needs to be inset.
+// For the original post see here:
+// https://medium.com/androiddevelopers/windowinsets-listeners-to-layouts-8f9ccc8fa4d1
+fun View.doOnApplyWindowInsets(f: (View, Rect) -> Unit) {
 	if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-		// save insets so setWindowInsetListener() can return them
-		// when it's called from Fragment.onCreateView() later on
-		windowInsets.set(0, toolBarHeight, 0, 0)
-		windowInsetsSet = true
-		windowInsetsListener?.also { it(windowInsets) }
-		return
-	}
-	ViewCompat.setOnApplyWindowInsetsListener(view) { _, insets ->
-		// runs *after* layout and thus *after* Fragment.onCreateView()
-		if (insets.hasSystemWindowInsets()) {
-			windowInsets.set(
-				insets.systemWindowInsetLeft,
-				insets.systemWindowInsetTop + toolBarHeight,
-				insets.systemWindowInsetRight,
-				insets.systemWindowInsetBottom
-			)
-			windowInsetsSet = true
-			windowInsetsListener?.also { it(windowInsets) }
+		f(this, insetsWithToolbar())
+	} else {
+		ViewCompat.setOnApplyWindowInsetsListener(this) { v, insets ->
+			f(v, insetsWithToolbar(insets))
+			insets
 		}
-		insets
+		// 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.
+		requestApplyInsetsWhenAttached()
+	}
+}
+
+private fun insetsWithToolbar(insets: WindowInsetsCompat? = null) = Rect(
+	insets?.systemWindowInsetLeft ?: 0,
+	(insets?.systemWindowInsetTop ?: 0) + toolbarHeight,
+	insets?.systemWindowInsetRight ?: 0,
+	insets?.systemWindowInsetBottom ?: 0
+)
+
+@RequiresApi(Build.VERSION_CODES.KITKAT)
+private fun View.requestApplyInsetsWhenAttached() {
+	if (isAttachedToWindow) {
+		ViewCompat.requestApplyInsets(this)
+	} else {
+		addOnAttachStateChangeListener(object : View.OnAttachStateChangeListener {
+			override fun onViewAttachedToWindow(v: View) {
+				v.removeOnAttachStateChangeListener(this)
+				ViewCompat.requestApplyInsets(v)
+			}
+
+			override fun onViewDetachedFromWindow(v: View) = Unit
+		})
 	}
 }

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

@@ -1,56 +1,18 @@
 package de.markusfisch.android.binaryeye.widget
 
 import android.content.Context
-import android.graphics.*
-import android.support.v4.content.ContextCompat
+import android.graphics.Canvas
+import android.graphics.Rect
+import android.graphics.RectF
 import android.util.AttributeSet
-import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.graphics.Candidates
 import kotlin.math.roundToInt
 
 class CropImageView(context: Context, attr: AttributeSet) :
 	ConfinedScalingImageView(context, attr) {
-	val windowInsets = Rect()
+	var onScan: (() -> Unit)? = null
 
-	var onScan: (() -> List<Point>?)? = null
-
-	private val candidates = Candidates(context)
-	private val boundsPaint = Paint(Paint.ANTI_ALIAS_FLAG)
 	private val lastMappedRect = RectF()
-	private val dp = context.resources.displayMetrics.density
-	private val padding: Int = (dp * 24f).roundToInt()
-	private val onScanRunnable = Runnable {
-		onScan?.invoke()?.also {
-			candidatePoints = it
-			invalidate()
-		}
-	}
-
-	private var candidatePoints: List<Point>? = null
-
-	init {
-		boundsPaint.color = ContextCompat.getColor(context, R.color.crop_bound)
-		boundsPaint.style = Paint.Style.STROKE
-		boundsPaint.strokeWidth = dp * 2f
-		boundsPaint.pathEffect = DashPathEffect(floatArrayOf(dp * 10f, dp * 10f), 0f)
-		scaleType = ScaleType.CENTER_CROP
-	}
-
-	override fun onLayout(
-		changed: Boolean,
-		left: Int,
-		top: Int,
-		right: Int,
-		bottom: Int
-	) {
-		super.onLayout(changed, left, top, right, bottom)
-		setBoundsWithPadding(
-			left + windowInsets.left,
-			top + windowInsets.top,
-			right - windowInsets.right,
-			bottom - windowInsets.bottom
-		)
-	}
+	private val onScanRunnable = Runnable { onScan?.invoke() }
 
 	fun getBoundsRect() = Rect(
 		bounds.left.roundToInt(),
@@ -59,40 +21,12 @@ class CropImageView(context: Context, attr: AttributeSet) :
 		bounds.bottom.roundToInt()
 	)
 
-	private fun setBoundsWithPadding(
-		left: Int,
-		top: Int,
-		right: Int,
-		bottom: Int
-	) {
-		val width = right - left
-		val height = bottom - top
-		val size = if (width < height)
-			width - padding * 2
-		else
-			height - padding * 2
-		val hpad = (width - size) / 2
-		val vpad = (height - size) / 2
-		setBounds(
-			left.toFloat() + hpad,
-			top.toFloat() + vpad,
-			right.toFloat() - hpad,
-			bottom.toFloat() - vpad
-		)
-		center(bounds)
-	}
-
 	override fun onDraw(canvas: Canvas) {
 		super.onDraw(canvas)
-		canvas.drawRect(bounds, boundsPaint)
-		candidatePoints?.let {
-			candidates.draw(canvas, it)
-		}
-		candidatePoints = null
 		val mr = mappedRect ?: return
 		if (mr != lastMappedRect) {
 			removeCallbacks(onScanRunnable)
-			postDelayed(onScanRunnable, 500)
+			postDelayed(onScanRunnable, 300)
 			lastMappedRect.set(mr)
 		}
 	}

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

@@ -1,20 +1,76 @@
 package de.markusfisch.android.binaryeye.widget
 
+import android.annotation.SuppressLint
 import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Point
-import android.graphics.PorterDuff
+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.graphics.Candidates
+import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.app.prefs
+import de.markusfisch.android.binaryeye.graphics.getBitmapFromDrawable
+import de.markusfisch.android.binaryeye.graphics.getDashedBorderPaint
+import kotlin.math.abs
+import kotlin.math.max
+import kotlin.math.min
+import kotlin.math.roundToInt
 
 class DetectorView : View {
-	private val candidates = Candidates(context)
+	val coordinates = FloatArray(32)
+	val currentOrientation = resources.configuration.orientation
+	val roi = Rect()
+
+	var onRoiChange: (() -> Unit)? = null
+	var onRoiChanged: (() -> Unit)? = null
+
 	private val invalidateRunnable: Runnable = Runnable {
-		marks = null
+		coordinatesLast = 0
 		invalidate()
 	}
-	private var marks: List<Point>? = null
+	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
+	)
+	private val handleXRadius = handleBitmap.width / 2
+	private val handleYRadius = handleBitmap.height / 2
+	private val handlePos = Point(-1, -1)
+	private val handleHome = Point()
+	private val center = Point()
+	private val touchDown = Point()
+	private val distToFull: Int
+	private val minMoveThresholdSq: Int
+	private val cornerRadius: Int
+	private val fabHeight: Int
+	private val padding: Int
+
+	private var coordinatesLast = 0
+	private var handleGrabbed = false
+	private var handleActive = false
+	private var minY = 0
+	private var maxY = 0
+	private var minDist = 0
+	private var shadeColor = 0
+
+	init {
+		val dp = context.resources.displayMetrics.density
+		dotRadius = 8f * dp
+		distToFull = (24f * dp).roundToInt()
+		val minMoveThreshold = (8f * dp).roundToInt()
+		minMoveThresholdSq = minMoveThreshold * minMoveThreshold
+		cornerRadius = (8f * dp).roundToInt()
+		fabHeight = (92f * dp).roundToInt()
+		padding = (20f * dp).roundToInt()
+		isSaveEnabled = true
+	}
 
 	constructor(context: Context, attrs: AttributeSet) :
 			super(context, attrs)
@@ -22,17 +78,323 @@ class DetectorView : View {
 	constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) :
 			super(context, attrs, defStyleAttr)
 
-	fun mark(points: List<Point>) {
-		marks = points
+	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 getCropHandlePos() = if (handleActive) {
+		handlePos
+	} else {
+		Point(-1, -1)
+	}
+
+	fun update(numberOfResultPoints: Int) {
+		coordinatesLast = numberOfResultPoints * 2
 		invalidate()
 		removeCallbacks(invalidateRunnable)
 		postDelayed(invalidateRunnable, 500)
 	}
 
+	override fun onSaveInstanceState(): Parcelable? {
+		if (!handleActive) {
+			return super.onSaveInstanceState()
+		}
+		return SavedState(super.onSaveInstanceState()).apply {
+			savedHandlePos.set(getCropHandlePos())
+			savedOrientation = currentOrientation
+		}
+	}
+
+	override fun onRestoreInstanceState(state: Parcelable) {
+		super.onRestoreInstanceState(
+			if (state is SavedState) {
+				setCropHandlePos(
+					state.savedHandlePos.x,
+					state.savedHandlePos.y,
+					state.savedOrientation
+				)
+				state.superState
+			} else {
+				state
+			}
+		)
+	}
+
+	@SuppressLint("ClickableViewAccessibility")
+	override fun onTouchEvent(event: MotionEvent?): Boolean {
+		event ?: return super.onTouchEvent(event)
+		val x = event.x.roundToInt()
+		val y = event.y.roundToInt()
+		return when (event.actionMasked) {
+			MotionEvent.ACTION_DOWN -> {
+				if (prefs.showCropHandle) {
+					touchDown.set(x, y)
+					handleGrabbed = abs(x - handlePos.x) < handleXRadius &&
+							abs(y - handlePos.y) < handleYRadius
+					if (handleGrabbed) {
+						onRoiChange?.invoke()
+					}
+					handleGrabbed
+				} else {
+					false
+				}
+			}
+			MotionEvent.ACTION_MOVE -> {
+				if (handleGrabbed) {
+					handlePos.set(x, y)
+					handleActive =
+						handleActive or (distSq(handlePos, touchDown) > minMoveThresholdSq)
+					if (handleActive) {
+						updateClipRect()
+						invalidate()
+					}
+					true
+				} else {
+					false
+				}
+			}
+			MotionEvent.ACTION_CANCEL -> {
+				if (handleGrabbed) {
+					snap(x, y)
+					handleGrabbed = false
+				}
+				false
+			}
+			MotionEvent.ACTION_UP -> {
+				if (handleGrabbed) {
+					if (!handleActive) {
+						setHandleToDefaultRoi()
+					} else {
+						snap(x, y)
+					}
+					if (handleActive) {
+						updateClipRect()
+						invalidate()
+					}
+					onRoiChanged?.invoke()
+					handleGrabbed = false
+				}
+				false
+			}
+			else -> super.onTouchEvent(event)
+		}
+	}
+
+	private fun setHandleToDefaultRoi() {
+		val mn = min(center.x, center.y) * .8f
+		handlePos.set(
+			(center.x + mn).roundToInt(),
+			(center.y + mn).roundToInt()
+		)
+		handleActive = true
+	}
+
+	private fun snap(x: Int, y: Int) {
+		val cx = clampX(x)
+		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
+		if (dx < distToFull ||
+			dy < distToFull ||
+			// check if handle is close to a screen corner
+			((abs(cy - minY) < distToFull || abs(maxY - cy) < distToFull) &&
+					abs(dx - center.x) < distToFull)
+		) {
+			reset()
+			invalidate()
+		}
+	}
+
+	private fun reset() {
+		handlePos.set(handleHome)
+		handleActive = false
+		roi.set(0, 0, 0, 0)
+	}
+
+	override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
+		super.onLayout(changed, left, top, right, bottom)
+		val width = right - left
+		val height = bottom - top
+		center.set(
+			left + (width / 2),
+			top + (height / 2)
+		)
+		minY = padding * 2
+		maxY = height - minY
+		handleHome.set(
+			width - handleXRadius - paddingRight - padding,
+			height - handleYRadius - paddingBottom - fabHeight
+		)
+		if (handlePos.x == -2) {
+			setHandleToDefaultRoi()
+		}
+		if (handleActive) {
+			updateClipRect()
+		} else {
+			reset()
+		}
+	}
+
 	override fun onDraw(canvas: Canvas) {
-		canvas.drawColor(0, PorterDuff.Mode.CLEAR)
-		marks?.let {
-			candidates.draw(canvas, it)
+		if (handleActive) {
+			drawClip(canvas)
+		}
+		drawDots(canvas)
+		if (prefs.showCropHandle) {
+			canvas.drawBitmap(
+				handleBitmap,
+				(handlePos.x - handleXRadius).toFloat(),
+				(handlePos.y - handleYRadius).toFloat(),
+				null
+			)
+		}
+	}
+
+	private fun drawDots(canvas: Canvas) {
+		var i = 0
+		while (i < coordinatesLast) {
+			canvas.drawCircle(
+				coordinates[i++],
+				coordinates[i++],
+				dotRadius,
+				dotPaint
+			)
+		}
+	}
+
+	private fun drawClip(canvas: Canvas) {
+		if (minDist < 1) {
+			return
+		}
+		// canvas.clipRect() doesn't work reliably below KITKAT.
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+			val radius = min(minDist / 2, cornerRadius).toFloat()
+			canvas.save()
+			canvas.clipOutPathCompat(
+				calculateRoundedRectPath(
+					roi.left.toFloat(),
+					roi.top.toFloat(),
+					roi.right.toFloat(),
+					roi.bottom.toFloat(),
+					radius,
+					radius
+				)
+			)
+			canvas.drawColor(shadeColor)
+			canvas.restore()
+		} else {
+			canvas.drawRect(roi, roiPaint)
+		}
+	}
+
+	private fun updateClipRect() {
+		clampHandlePos()
+		val dx = abs(handlePos.x - center.x)
+		val dy = abs(handlePos.y - center.y)
+		minDist = min(dx, dy)
+		shadeColor = (min(
+			1f,
+			minDist.toFloat() / distToFull.toFloat()
+		) * 128f).toInt() shl 24
+		roi.set(
+			center.x - dx,
+			center.y - dy,
+			center.x + dx,
+			center.y + dy
+		)
+	}
+
+	private fun clampHandlePos() {
+		handlePos.x = clampX(handlePos.x)
+		handlePos.y = clampY(handlePos.y)
+	}
+
+	private fun clampX(x: Int) = min(center.x * 2, max(0, x))
+
+	private fun clampY(y: Int) = min(maxY, max(minY, y))
+
+	internal class SavedState : BaseSavedState {
+		val savedHandlePos = Point()
+
+		var savedOrientation = 0
+
+		constructor(superState: Parcelable?) : super(superState)
+
+		private constructor(parcel: Parcel) : super(parcel) {
+			savedHandlePos.set(
+				parcel.readInt(),
+				parcel.readInt()
+			)
+			savedOrientation = parcel.readInt()
+		}
+
+		override fun writeToParcel(out: Parcel, flags: Int) {
+			super.writeToParcel(out, flags)
+			out.writeInt(savedHandlePos.x)
+			out.writeInt(savedHandlePos.y)
+			out.writeInt(savedOrientation)
+		}
+
+		companion object {
+			@JvmField
+			val CREATOR = object : Parcelable.Creator<SavedState> {
+				override fun createFromParcel(source: Parcel) = SavedState(source)
+				override fun newArray(size: Int): Array<SavedState?> = arrayOfNulls(size)
+			}
 		}
 	}
 }
+
+private fun distSq(a: Point, b: Point): Int {
+	val dx = a.x - b.x
+	val dy = a.y - b.y
+	return dx * dx + dy * dy
+}
+
+private fun Point.set(point: Point) {
+	x = point.x
+	y = point.y
+}
+
+private fun Canvas.clipOutPathCompat(path: Path) {
+	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+		clipOutPath(path)
+	} else {
+		@Suppress("DEPRECATION")
+		clipPath(path, Region.Op.DIFFERENCE)
+	}
+}
+
+private fun calculateRoundedRectPath(
+	left: Float,
+	top: Float,
+	right: Float,
+	bottom: Float,
+	rx: Float,
+	ry: Float
+): Path {
+	val width = right - left
+	val height = bottom - top
+	val widthMinusCorners = width - 2 * rx
+	val heightMinusCorners = height - 2 * ry
+	return Path().apply {
+		moveTo(right, top + ry)
+		rQuadTo(0f, -ry, -rx, -ry)
+		rLineTo(-widthMinusCorners, 0f)
+		rQuadTo(-rx, 0f, -rx, ry)
+		rLineTo(0f, heightMinusCorners)
+		rQuadTo(0f, ry, rx, ry)
+		rLineTo(widthMinusCorners, 0f)
+		rQuadTo(rx, 0f, rx, -ry)
+		rLineTo(0f, -heightMinusCorners)
+		close()
+	}
+}

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

@@ -2,6 +2,7 @@ package de.markusfisch.android.binaryeye.zxing
 
 import android.graphics.Bitmap
 import com.google.zxing.*
+import com.google.zxing.common.BitMatrix
 import com.google.zxing.common.HybridBinarizer
 import java.util.*
 
@@ -10,44 +11,30 @@ class Zxing(possibleResultPoint: ResultPointCallback? = null) {
 	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) {
+	fun updateHints(tryHarder: Boolean, formats: Set<String>) {
 		if (tryHarder) {
 			hints[DecodeHintType.TRY_HARDER] = java.lang.Boolean.TRUE
 		} else {
 			hints.remove(DecodeHintType.TRY_HARDER)
 		}
+		setDecodeFormats(formats)
+	}
+
+	private fun setDecodeFormats(formats: Set<String>) {
+		val decodeFormats = EnumSet.noneOf(
+			BarcodeFormat::class.java
+		)
+		decodeFormats.addAll(
+			EnumSet.copyOf(
+				formats.map { BarcodeFormat.valueOf(it) }
+			)
+		)
+		hints[DecodeHintType.POSSIBLE_FORMATS] = decodeFormats
 	}
 
 	fun decode(
@@ -112,49 +99,110 @@ class Zxing(possibleResultPoint: ResultPointCallback? = null) {
 		val bitmap = BinaryBitmap(HybridBinarizer(source))
 		return try {
 			multiFormatReader.decode(bitmap, hints)
-		} catch (e: ReaderException) {
+		} catch (e: Exception) {
+			// Usually it's bad practice to blindly catch *all* exceptions
+			// because this can hide problems we want to know about. But
+			// since ZXing has some errors (like all software) and I don't
+			// want this app to break in the hands of my users, which won't
+			// see the stack trace anyway, it's better to just catch all
+			// exceptions here and live on.
 			null
 		} finally {
 			multiFormatReader.reset()
 		}
 	}
+}
 
-	companion object {
-		private const val BLACK = 0xff000000.toInt()
-		private const val WHITE = 0xffffffff.toInt()
+private const val BLACK = 0xff000000.toInt()
+private const val WHITE = 0xffffffff.toInt()
 
-		fun encodeAsBitmap(
-			text: String,
-			format: BarcodeFormat,
-			width: Int,
-			height: Int
-		): Bitmap? {
-			val hints = EnumMap<EncodeHintType, Any>(EncodeHintType::class.java)
-			hints[EncodeHintType.CHARACTER_SET] = "utf-8"
-			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
+fun encodeAsBitmap(
+	text: String,
+	format: BarcodeFormat,
+	width: Int,
+	height: Int,
+	hints: EnumMap<EncodeHintType, Any>? = null
+): Bitmap? {
+	val bitMatrix = encode(text, format, hints, width, height)
+	val w = bitMatrix.width
+	val h = bitMatrix.height
+	val pixels = IntArray(w * h)
+	var offset = 0
+	for (y in 0 until h) {
+		for (x in 0 until w) {
+			pixels[offset + x] = if (bitMatrix.get(x, y)) {
+				BLACK
+			} else {
+				WHITE
+			}
+		}
+		offset += w
+	}
+	val bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888)
+	bitmap.setPixels(pixels, 0, w, 0, 0, w, h)
+	return bitmap
+}
+
+fun encodeAsSvg(
+	text: String,
+	format: BarcodeFormat,
+	hints: EnumMap<EncodeHintType, Any>? = null
+): String {
+	val bitMatrix = encode(text, format, hints)
+	val sb = StringBuilder()
+	val w = bitMatrix.width
+	var h = bitMatrix.height
+	val moduleHeight = if (h == 1) w / 2 else 1
+	for (y in 0 until h) {
+		for (x in 0 until w) {
+			if (bitMatrix.get(x, y)) {
+				sb.append(" M${x},${y}h1v${moduleHeight}h-1z")
 			}
-			val bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888)
-			bitmap.setPixels(pixels, 0, w, 0, 0, w, h)
-			return bitmap
 		}
 	}
+	h *= moduleHeight
+	return """<svg width="$w" height="$h"
+viewBox="0 0 $w $h"
+xmlns="http://www.w3.org/2000/svg">
+<path d="$sb"/>
+</svg>
+"""
+}
+
+fun encodeAsText(
+	text: String,
+	format: BarcodeFormat,
+	hints: EnumMap<EncodeHintType, Any>? = null
+): String {
+	val bitMatrix = encode(text, format, hints)
+	val w = bitMatrix.width
+	val h = bitMatrix.height
+	val sb = StringBuilder()
+	for (y in 0 until h) {
+		for (x in 0 until w) {
+			sb.append(if (bitMatrix.get(x, y)) "█" else " ")
+		}
+		sb.append("\n")
+	}
+	return sb.toString()
+}
+
+private fun encode(
+	text: String,
+	format: BarcodeFormat,
+	encodeHints: EnumMap<EncodeHintType, Any>? = null,
+	width: Int = 0,
+	height: Int = 0
+): BitMatrix {
+	val hints = encodeHints ?: EnumMap<EncodeHintType, Any>(EncodeHintType::class.java)
+	if (!hints.contains(EncodeHintType.CHARACTER_SET)) {
+		hints[EncodeHintType.CHARACTER_SET] = "utf-8"
+	}
+	return MultiFormatWriter().encode(
+		text,
+		format,
+		width,
+		height,
+		hints
+	)
 }

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

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

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

@@ -0,0 +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="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.xml

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

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

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

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

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

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

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

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:width="56dp" android:height="56dp" android:viewportWidth="56" android:viewportHeight="56">
+    <path android:pathData="M4 32a24 24 0 1 1 48 0 24 24 0 1 1-48 0">
+        <aapt:attr name="android:fillColor">
+            <gradient android:gradientRadius="24" android:centerX="28" android:centerY="32" android:type="radial">
+                <item android:offset="0" android:color="#FF000000"/>
+                <item android:offset="1" android:color="#00000000"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:pathData="M4 28a24 24 0 1 1 48 0 24 24 0 1 1-48 0" android:fillColor="#B6D46F"/>
+    <path android:pathData="M33 31h2v-8c0-1.1-0.9-2-2-2h-8v2h8v8zm-10 2V17h-2v4h-4v2h4v10c0 1.1 0.9 2 2 2h10v4h2v-4h4v-2H23z" android:fillColor="#FFFFFF"/>
+</vector>

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

@@ -0,0 +1,3 @@
+<vector android:height="24dp" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M14 10H2v2h12v-2zm0-4H2v2h12V6zm4 8v-4h-2v4h-4v2h4v4h2v-4h4v-2h-4zM2 16h8v-2H2v2z"/>
+</vector>

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

@@ -1,9 +1,3 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M16 1H4C2.9 1 2 1.9 2 3v14h2V3h12V1zm3 4H8C6.9 5 6 5.9 6 7v14c0 1.1 0.9 2 2 2h11c1.1 0 2-0.9 2-2V7c0-1.1-0.9-2-2-2zm0 16H8V7h11v14z"/>
 </vector>

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

@@ -0,0 +1,3 @@
+<vector android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M12.65 10C11.83 7.67 9.61 6 7 6c-3.31 0-6 2.69-6 6s2.69 6 6 6c2.61 0 4.83-1.67 5.65-4H17v4h4v-4h2v-4H12.65zM7 14c-1.1 0-2-0.9-2-2s0.9-2 2-2 2 0.9 2 2-0.9 2-2 2z"/>
+</vector>

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

@@ -1,9 +1,3 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
 </vector>

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

@@ -1,5 +1,3 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+<vector android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c0.39-0.39 0.39-1.02 0-1.41l-2.34-2.34c-0.39-0.39-1.02-0.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z"/>
 </vector>

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

@@ -1,5 +1,3 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M9,3L5,6.99h3L8,14h2L10,6.99h3L9,3zM16,17.01L16,10h-2v7.01h-3L15,21l4,-3.99h-3z"/>
+<vector android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M9 3L5 6.99h3V14h2V6.99h3L9 3zm7 14.01V10h-2v7.01h-3L15 21l4-3.99h-3z"/>
 </vector>

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

@@ -1,9 +1,3 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M7,2v11h3v9l7,-12h-4l4,-8z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M7 2v11h3v9l7-12h-4l4-8z"/>
 </vector>

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

@@ -1,5 +1,3 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
+<vector android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M13 3c-4.97 0-9 4.03-9 9H1l3.89 3.89 0.07 0.14L9 12H6c0-3.87 3.13-7 7-7s7 3.13 7 7-3.13 7-7 7c-1.93 0-3.68-0.79-4.94-2.06l-1.42 1.42C8.27 19.99 10.51 21 13 21c4.97 0 9-4.03 9-9s-4.03-9-9-9zm-1 5v5l4.28 2.54 0.72-1.21-3.5-2.08V8H12z"/>
 </vector>

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

@@ -1,9 +1,3 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z"/>
 </vector>

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

@@ -1,6 +1,3 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-		android:viewportHeight="24.0" android:viewportWidth="24.0"
-		android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-	<path android:fillColor="#FF000000"
-		android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8l8,5 8,-5v10zM12,11L4,6h16l-8,5z"/>
+<vector android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M20 4H4C2.9 4 2.01 4.9 2.01 6L2 18c0 1.1 0.9 2 2 2h16c1.1 0 2-0.9 2-2V6c0-1.1-0.9-2-2-2zm0 14H4V8l8 5 8-5v10zm-8-7L4 6h16l-8 5z"/>
 </vector>

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

@@ -1,5 +1,3 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
+<vector android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/>
 </vector>

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

@@ -1,9 +1,3 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M19,4L5,4c-1.11,0 -2,0.9 -2,2v12c0,1.1 0.89,2 2,2h4v-2L5,18L5,8h14v10h-4v2h4c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.89,-2 -2,-2zM12,10l-4,4h3v6h2v-6h3l-4,-4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M19 4H5C3.89 4 3 4.9 3 6v12c0 1.1 0.89 2 2 2h4v-2H5V8h14v10h-4v2h4c1.1 0 2-0.9 2-2V6c0-1.1-0.89-2-2-2zm-7 6l-4 4h3v6h2v-6h3l-4-4z"/>
 </vector>