Advance version number to 1.50.0

Add support for MATMSG format
Updated Russian translation
2022-05-18 22:48:58 +02:00 · 2022-05-18 22:37:56 +02:00 · 2022-05-18 12:11:14 +02:00 · 2022-05-17 19:03:03 +02:00 · 2022-05-15 13:25:46 +02:00 · 2022-05-14 12:50:22 +02:00
402 changed files with 11050 additions and 5283 deletions
@@ -4,6 +4,5 @@
 .idea
 build
 local.properties
-gradle.properties
 infer-out
 *.iml
@@ -1,16 +1,322 @@
 # Change Log

-# 1.17.1
+## 1.50.0
+* Add support for MATMSG format
+* Add a setting to show the QR Code version
+* Add timezone offset in calendar dates
+* Recognize colloquial incomplete URLs
+* Update ZXing library to latest version
+* Update Czech translation
+* Update Russian translation
+* Update Japanese translation
+* Update Hungarian translation
+
+## 1.49.2
+* Update design of app icon
+* Update pt-br translation
+
+## 1.49.1
+* Update Simplified Chinese translation
+* Return directly to caller for deep links
+* Fix metadata for deep links
+
+## 1.49.0
+* Add a setting to quickly enable/disable forwarding
+* Stop playing error beep when in silent mode
+* Improve enabling/disabling torch mode
+* Update to latest ZXing version
+* Update German translation
+* Update Russian translation
+
+## 1.48.1
+* Fix broken detection of binary content
+
+## 1.48.0
+* Add a menu item to temporarily scan a certain format only
+* Add a monochome launcher icon for Android 13
+* Show alpha numeric characters in binary data
+* Fix showing binary data label for scans from the history
+* Fix handling empty meta strings
+* Update Turkish translation
+* Update Ukrainian translation
+* Update French translation
+* Update Polish translation
+* Update Russian translation
+
+## 1.47.0
+* Add forwarding into external browser
+* Fix visibility of zoom slider when switching cameras
+
+## 1.46.3
+* Fix cropping still images
+* Improve usability of zoom slider
+* Update Dutch translation
+* Update Chinese translation
+
+## 1.46.2
+* Fix saving external files on Android Q and newer
+
+## 1.46.1
+* Use cropping limiter settings for image picking too
+* Remove extra link on result screen
+* Update Turkish translation
+
+## 1.46.0
+* Support deep links
+* Support "A:" in WIFI codes
+* Allow multiple query arguments in custom URL
+* Add Wi-Fi info data section
+* Add Vietnamese translation
+* Update Brazilian Portuguese translation
+* Update Hungarian translation
+* Update Ukrainian translation
+* Update Russian translation
+
+## 1.45.0
+* Add a setting to set the delay for bulk mode
+* Add support for MECARD contact format
+* Remove unused permissions on Android Q
+
+## 1.44.1
+* Update Spanish translation
+* Update Japanese translation
+* Fix in-app language switching for App Bundles
+
+## 1.44.0
+* Add a setting to choose barcode formats to scan
+* Ask before removing network suggestions
+* Update Traditional Chinese Translation
+* Update Russian language
+* Update Dutch translation
+
+## 1.43.0
+* Add a preference item to remove WiFi network suggestions
+* Update Traditional Chinese Translation
+* Update Russian language
+
+## 1.42.0
+* Add a setting to pick a default search engine
+* Update Traditional Chinese
+* Update Dutch translation
+
+## 1.41.1
+* Update Bengali translation
+* Update Simplified Chinese
+
+## 1.41.0
+* Use cropping limiter by default for new installations
+* Truncate all toasts with strings from the outside
+* Add Bangla translation
+* Add missing Japanese locale
+* Update Hungarian translation
+* Update Russian app description
+
+## 1.40.0
+* Add a setting to show/hide scanned data when scanning continuously
+* Only show the first 50 characters when scanning continuously
+* Share binary data as hex dump
+* Update Russian language
+
+## 1.39.0
+* Fix adding contacts and calendar entries on Android 11+
+* Add a setting to always start in bulk mode
+* Add Czech translation
+* Update Spanish translation
+* Update Czech translation
+
+## 1.38.0
+* Add a quick settings tile to scan from settings
+* Make custom background requests time out after 5 seconds
+* Add Japanese translation
+* Updated French translation
+
+## 1.37.0
+* Improve formatting date and time in history listing
+* Add haptic and audible feedback for background request errors
+
+## 1.36.0
+* Add a setting to automatically return to scanning screen after copying
+* Add a button to test the background request
+* Show HTTP response for background requests
+* Improve SVG export
+* Automatically continue with an action after granting a permission
+* Update Chinese translation
+* Update French translation
+* Update Indonesian translation
+* Update Turkish translation
+* Update Ukrainian translation
+
+## 1.35.0
+* Put images with transparent pixels on white/black
+* Use cropping limiter when scanning from images too
+* 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
+* Add a setting to control vibration on detection
+* Add app shortcuts for launchers that support them
+* Remove saving barcodes for intents from other apps
+* Show latest possible result point in camera view
+* Suggest a WiFi network on Android Q+
+* Always put parsed WiFi password into clipboard
+* Use native image processing where available
+* Ignore consecutive duplicates by default
+* Fix saving external files on Android Q+
+* Fix order of metadata items
+
+## 1.24.0
+* Show barcode metadata
+* Add a setting to show/hide metadata
+* Include metadata in CSV export
+* Update italian translation
+* Fix resetting flash button
+* Fix CSV export for Android Q
+
+## 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
+* Fix broken RenderScript built
+
+## 1.22.2
+* Fix getting window insets for Android Lollipop and above
+
+## 1.22.1
+* Ensure non-printable content is saved as raw data
+
+## 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
+* Save and restore history list state
+* Improve scanning from large images
+* Fix opening image files by "Open with"
+
+## 1.20.1
+* Fix window insets below Android Lollipop
+
+## 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
+* Increase font size of barcode contents in history
+* Update Hungarian translation
+* Update Indonesian translation
+* Fix encoding for old Androids
+* Fix returning result for ZXing's SCAN intent again
+* Fix transfering barcode format from history
+
+## 1.19.0
+* Allow scaling a new barcode to half its size
+* Remember last selected barcode format
+
+## 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
 * 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
@@ -19,36 +325,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
@@ -13,7 +13,7 @@ to squash when merging into master:

 	$ git merge cool_feature --squash

-Then write a [good commit messages][commit_messages] to keep the history
+Then write a [good commit message][commit_messages] to keep the history
 meaningful and useful. One feature, one commit.

 [android_best_practices]: https://developer.android.com/distribute/best-practices/develop/
@@ -18,8 +18,24 @@ infer: clean
 	infer -- ./gradlew assembleDebug

 test:
+	./gradlew test
+
+cat:
 	./gradlew test cAT

+testview:
+	adb shell am start -W -a android.intent.action.VIEW -d 'binaryeye://scan'
+
+testscan:
+	adb shell am start -a android.intent.action.VIEW \
+		-c android.intent.category.BROWSABLE \
+		-d 'binaryeye://scan/?ret=http%3A%2F%2Fmarkusfisch.de%2F%3Fresult%3D{RESULT}'
+
+testurl:
+	adb shell am start -a android.intent.action.VIEW \
+		-c android.intent.category.BROWSABLE \
+		-d 'http://markusfisch.de/BinaryEye?ret=http%3A%2F%2Fmarkusfisch.de%2F%3Fresult%3D{RESULT}'
+
 install:
 	adb $(TARGET) install -r app/build/outputs/apk/debug/app-debug.apk

@@ -30,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
@@ -4,3 +4,57 @@ 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][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][CAMERA]
+
+Required to read a barcode from the camera image.
+
+### [INTERNET][INTERNET]
+
+Required to send a scanned code to a custom URL you can specify in settings.
+
+### [VIBRATE][VIBRATE]
+
+Required to vibrate on detection.
+
+### [WRITE_EXTERNAL_STORAGE][WRITE_EXTERNAL_STORAGE]
+
+Required to save generated barcodes as files before Android Q.
+
+### [CHANGE_WIFI_STATE][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][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`.
+
+[ACCESS_FINE_LOCATION]: https://developer.android.com/reference/android/Manifest.permission#ACCESS_FINE_LOCATION
+[CAMERA]: https://developer.android.com/reference/android/Manifest.permission#CAMERA
+[INTERNET]: https://developer.android.com/reference/android/Manifest.permission#INTERNET
+[VIBRATE]: https://developer.android.com/reference/android/Manifest.permission#VIBRATE
+[WRITE_EXTERNAL_STORAGE]: https://developer.android.com/reference/android/Manifest.permission#WRITE_EXTERNAL_STORAGE
+[CHANGE_WIFI_STATE]: https://developer.android.com/reference/android/Manifest.permission#CHANGE_WIFI_STATE
+[ACCESS_WIFI_STATE]: https://developer.android.com/reference/android/Manifest.permission#ACCESS_FINE_LOCATION
+[configuredNetworks]: https://developer.android.com/reference/android/net/wifi/WifiManager#getConfiguredNetworks()
+[addNetworkSuggestions]: https://developer.android.com/reference/android/net/wifi/WifiManager#addNetworkSuggestions(java.util.List%3Candroid.net.wifi.WifiNetworkSuggestion%3E)
@@ -2,32 +2,189 @@

 Yet another barcode scanner for Android. As if there weren't [enough][play].

-This one is totally free, open source and does use the [ZXing][zxing] barcode
-scanning library.
+This one is free, without any ads and open source.

-Unlike many others, it works in portrait and landscape orientation, can read
-inverted codes, comes in Material Design and doesn't do much else but decoding
-a barcode.
+Works in portrait and landscape orientation, can read inverted codes,
+comes in Material Design and can also generate barcodes.

-And it's written in [Kotlin][kotlin] because I wanted to explore that a
-bit more.
+Binary Eye uses the [ZXing][zxing] ("Zebra Crossing") barcode scanning
+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

 <a href="https://f-droid.org/en/packages/de.markusfisch.android.binaryeye/"><img alt="Get it on F-Droid" src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="80"/></a> <a href="https://play.google.com/store/apps/details?id=de.markusfisch.android.binaryeye"><img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" height="80"/></a>

+## Supported Barcode Formats
+
+### Read
+
+ZXing can read the following barcode formats:
+* [AZTEC][aztec]
+* [CODABAR][codabar]
+* [CODE 39][code_39]
+* [CODE 93][code_93]
+* [CODE 128][code_128]
+* [DATA MATRIX][data_matrix]
+* [EAN 8][ean_8]
+* [EAN 13][ean_13]
+* [ITF][itf]
+* [MAXICODE][maxicode] (only when unrotated and unskewed, see [77][77],
+	because of which Binary Eye *cannot* read this barcode)
+* [PDF417][pdf417]
+* [QR CODE][qr_code]
+* [RSS 14][rss]
+* [RSS EXPANDED][rss]
+* [UPC A][upc_a]
+* [UPC E][upc_e]
+* [UPC EAN EXTENSION][upc_ean]
+
+### Generate
+
+ZXing can generate the following barcode formats:
+* [AZTEC][aztec]
+* [CODABAR][codabar]
+* [CODE 39][code_39]
+* [CODE 128][code_128]
+* [DATA MATRIX][data_matrix]
+* [EAN 8][ean_8]
+* [EAN 13][ean_13]
+* [ITF][itf]
+* [PDF 417][pdf417]
+* [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()][start_activity] like this:
+
+```kotlin
+startActivityForResult(
+	Intent("com.google.zxing.client.android.SCAN"),
+	SOME_NUMBER
+)
+```
+
+And process the result in [onActivityResult()][on_activity_result] of your
+`Activity`:
+
+```kotlin
+override fun onActivityResult(
+	requestCode: Int,
+	resultCode: Int,
+	data: Intent?
+) {
+	when (requestCode) {
+		SOME_NUMBER -> if (resultCode == RESULT_OK) {
+			val result = data.getStringExtra("SCAN_RESULT")
+			…
+		}
+	}
+}
+```
+
+If you're using AndroidX, this would be the new,
+[recommended way][intent_result]:
+
+```kotlin
+class YourActivity : Activity() {
+	private val resultLauncher = registerForActivityResult(StartActivityForResult()) { result ->
+		if (result.resultCode == Activity.RESULT_OK) {
+			val scan = result.data?.getStringExtra("SCAN_RESULT")
+			…
+		}
+	}
+
+	fun openScanner() {
+		resultLauncher.launch(Intent("com.google.zxing.client.android.SCAN"))
+	}
+}
+```
+
+## 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/
+[aztec]: https://en.wikipedia.org/wiki/Aztec_Code
+[codabar]: https://en.wikipedia.org/wiki/Codabar
+[code_39]: https://en.wikipedia.org/wiki/Code_39
+[code_93]: https://en.wikipedia.org/wiki/Code_93
+[code_128]: https://en.wikipedia.org/wiki/Code_128
+[data_matrix]: https://en.wikipedia.org/wiki/Data_Matrix
+[ean_8]: https://en.wikipedia.org/wiki/EAN-8
+[ean_13]: https://en.wikipedia.org/wiki/International_Article_Number
+[itf]: https://en.wikipedia.org/wiki/Interleaved_2_of_5
+[maxicode]: https://en.wikipedia.org/wiki/MaxiCode
+[pdf417]: https://en.wikipedia.org/wiki/PDF417
+[qr_code]: https://en.wikipedia.org/wiki/QR_code
+[rss]: https://en.wikipedia.org/wiki/GS1_DataBar
+[upc_a]: https://en.wikipedia.org/wiki/Universal_Product_Code
+[upc_e]: https://en.wikipedia.org/wiki/Universal_Product_Code#UPC-E
+[upc_ean]: https://en.wikipedia.org/wiki/Universal_Product_Code#EAN-13
+[77]: https://github.com/markusfisch/BinaryEye/issues/77
+[rs]: https://developer.android.com/guide/topics/renderscript/compute
+[start_activity]: https://developer.android.com/reference/android/app/Activity#startActivityForResult(android.content.Intent,%20int)
+[on_activity_result]: https://developer.android.com/reference/android/app/Activity#onActivityResult(int,%20int,%20android.content.Intent)
+[intent_result]: https://developer.android.com/training/basics/intents/result
@@ -2,26 +2,30 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'

 android {
+	namespace 'de.markusfisch.android.binaryeye'
 	compileSdkVersion sdk_version
-	buildToolsVersion build_tools_version

 	defaultConfig {
 		minSdkVersion 9
 		targetSdkVersion sdk_version

-		versionCode 45
-		versionName '1.17.1'
+		versionCode 97
+		versionName '1.50.0'

-		// it's recommended to set this value to the lowest API level
-		// able to provide all the functionality
+		// Required for desugaring.
+		multiDexEnabled true
+
+		// 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'
 	}

 	signingConfigs {
-		config {
+		release {
 			keyAlias System.getenv('ANDROID_KEY_ALIAS')
 			keyPassword System.getenv('ANDROID_KEY_PASSWORD')
 			storePassword System.getenv('ANDROID_STORE_PASSWORD')
@@ -45,34 +49,54 @@ android {
 			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 			minifyEnabled true
 			shrinkResources true
-			signingConfig signingConfigs.config
+			signingConfig signingConfigs.release
 		}
 	}

-	lintOptions {
-		// because at the time of writing, even the latest version
+	bundle {
+		language {
+			// To make the app bundle contain all language resources
+			// so the in-app language setting works. Another solution
+			// would be to use the PlayCore API to download language
+			// resources on demand, but it makes much more sense to
+			// simply include the ~60 kb than adding fragile code and
+			// dependencies.
+			enableSplit = false
+		}
+	}
+
+	compileOptions {
+		// To desugar fancy Java features in ZXing 3.4.+ that don't
+		// work on SDK < 24. See:
+		// https://github.com/zxing/zxing/issues/1170
+		coreLibraryDesugaringEnabled true
+	}
+
+	lint {
+		// 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'
 	}
 }

 dependencies {
-	androidTestImplementation ('com.android.support.test:runner:1.0.2') {
+	androidTestImplementation('com.android.support.test:runner:1.0.2') {
 		exclude module: 'support-annotations'
 	}
-	androidTestImplementation ('com.android.support.test:rules:1.0.2') {
+	androidTestImplementation('com.android.support.test:rules:1.0.2') {
 		exclude module: 'support-annotations'
 	}
-	testImplementation 'junit:junit:4.12'
+	testImplementation 'junit:junit:4.13.2'

+	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 	implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-	implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.2"
+	implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2"
 	implementation "com.android.support:appcompat-v7:$support_version"
 	implementation "com.android.support:design:$support_version"
-	// 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.1.4'
+	implementation "com.android.support:preference-v7:$support_version"
+	implementation "com.android.support:preference-v14:$support_version"
+	implementation 'com.google.zxing:core:3.5.0'
+	implementation 'com.github.markusfisch:CameraView:1.9.1'
+	implementation 'com.github.markusfisch:ScalingImageView:1.3.0'
 }
@@ -3,10 +3,20 @@
 	<!-- Lint can't understand Kotlin sources and reports all resources
 		as unused -->
 	<issue id="UnusedResources">
-		<ignore path="src/main/res/"/>
+		<ignore path="src/main/res/" />
 	</issue>
 	<!-- Ignore RenderScript output  -->
 	<issue id="UnusedResources">
-		<ignore path="*/res/rs/debug/raw/bc*"/>
+		<ignore path="*/res/rs/debug/raw/bc*" />
 	</issue>
+	<!-- Android 12 requires apps that request ACCESS_FINE_LOCATION
+		to also request ACCESS_COARSE_LOCATION. But this app doesn't
+		request nor requires ACCESS_FINE_LOCATION above SDK 28. So
+		this is a false positive. -->
+	<issue id="CoarseFineLocation" severity="ignore"/>
+	<!-- Androidx SplashScreen compat library would require minSdk 21,
+		make the app unnecessarily larger and Android 12 automatically
+		replaces our custom splash screen anyway, which is exactly what
+		we want. So there is no reason to complain. -->
+	<issue id="CustomSplashScreen" severity="ignore"/>
 </lint>
@@ -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.** { *; }
@@ -1,52 +1,107 @@
 package de.markusfisch.android.binaryeye

+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
 import android.support.test.InstrumentationRegistry
 import android.support.test.runner.AndroidJUnit4
-
+import android.support.v8.renderscript.RenderScript
 import de.markusfisch.android.binaryeye.rs.Preprocessor
 import de.markusfisch.android.binaryeye.zxing.Zxing
-
+import org.junit.Assert.fail;
 import org.junit.Test
 import org.junit.runner.RunWith
-
 import java.util.regex.Pattern

@RunWith(AndroidJUnit4::class)
 class PreprocessorTest {
 	@Test
 	fun processSamples() {
-		val zxing = Zxing()
 		val assets = InstrumentationRegistry.getInstrumentation()
 			.context.assets
+		val samples = assets.list("samples")
+		checkNotNull(samples) { "no samples found" }
 		val pattern = Pattern.compile(
-			"[0-9]+-([0-9]+)x([0-9]+)-([0-9]+)deg.yuv"
+			"[0-9]+-([0-9]+)deg.jpg"
 		)
-
-		for (file in assets.list("yuv")) {
-			val m = pattern.matcher(file)
-			if (!m.find() || m.groupCount() < 3) {
-				continue
+		val rs = RenderScript.create(
+			InstrumentationRegistry.getTargetContext(),
+		)
+		val zxing = Zxing()
+		for (sample in samples) {
+			val m = pattern.matcher(sample)
+			if (!m.find() || m.groupCount() < 1) {
+				fail("invalid sample: $sample")
 			}
-
-			val frameWidth = m.group(1).toInt()
-			val frameHeight = m.group(2).toInt()
-			val frameOrientation = m.group(3).toInt()
-			val frameData = assets.open("yuv/$file").readBytes()
+			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 preprocessor = Preprocessor(
-				InstrumentationRegistry.getTargetContext(),
+				rs,
 				frameWidth,
 				frameHeight,
-				frameOrientation
-			)
-			preprocessor.process(frameData)
-			val result = zxing.decode(
-				frameData,
-				preprocessor.outWidth,
-				preprocessor.outHeight
+				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()
-
-			checkNotNull(result) { "no barcode found in $file" }
+			checkNotNull(result) { "no barcode found in $sample" }
 		}
+		rs.destroy()
 	}
 }
+
+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 (t in 0 until height) {
+		for (s in 0 until width) {
+			val pixel = argb[index]
+			r = pixel and 0xff0000 shr 16
+			g = pixel and 0xff00 shr 8
+			b = pixel and 0xff
+			y = (66 * r + 129 * g + 25 * b + 128 shr 8) + 16
+			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 (t % 2 == 0 && index % 2 == 0) {
+				yuv[uvIndex++] = (if (v < 0) 0 else if (v > 255) 255 else v).toByte()
+				yuv[uvIndex++] = (if (u < 0) 0 else if (u > 255) 255 else u).toByte()
+			}
+			++index
+		}
+	}
+	return yuv
+}
+
+private fun ceilIfUneven(n: Int) = if (n and 1 == 1) n + 1 else n
@@ -4,35 +4,7 @@
    android:viewportWidth="108"
    android:viewportHeight="108">
  <path
-      android:fillColor="#FF000000"
-      android:pathData="M52,-884.362h29v71h-29z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M52,-884.362h29v71h-29z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M52,-884.362h29v71h-29z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M32.002,-24.974h3.127v7.656h-3.127z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M52,-884.362h29v71h-29z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M52,-884.362h29v71h-29z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M52,-884.362h29v71h-29z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M52,-884.362h29v71h-29z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M52,-884.362h29v71h-29z"/>
-  <path
-      android:pathData="m54.826,27.893c-6.851,0 -13.701,2.581 -18.924,7.745 -10.445,10.328 -10.413,27.062 0,37.423l36.218,36.036 37.879,0.902 -0.07,-38.363 -36.18,-35.998c-5.207,-5.18 -12.073,-7.745 -18.924,-7.745z"
-      android:strokeAlpha="1"
+      android:pathData="M54.826,27.894C47.976,27.894 41.125,30.475 35.903,35.639C25.457,45.967 25.489,62.701 35.903,73.062L72.121,109.098L108,108L109.93,71.637L73.75,35.639C68.543,30.459 61.677,27.894 54.826,27.894Z"
      android:strokeLineJoin="miter"
      android:strokeWidth="8.60725021"
      android:fillColor="#000000"
@@ -41,43 +13,25 @@
      android:fillAlpha="0.1254902"
      android:strokeLineCap="butt"/>
  <path
-      android:pathData="M28.001,54.118a26.525,26.227 0,1 0,53.049 0a26.525,26.227 0,1 0,-53.049 0z"
-      android:strokeAlpha="1"
+      android:pathData="M27.475,54a26.525,26.5 0,1 0,53.05 0a26.525,26.5 0,1 0,-53.05 0z"
      android:strokeLineJoin="miter"
      android:strokeWidth="4"
      android:fillColor="#ffffff"
      android:strokeColor="#00000000"
-      android:fillAlpha="1"
      android:strokeLineCap="butt"/>
  <path
-      android:pathData="M39.26,54.988a14.509,14.346 0,1 0,29.019 0a14.509,14.346 0,1 0,-29.019 0z"
-      android:strokeAlpha="1"
+      android:pathData="M72.745,54.001C72.745,58.588 71.099,62.791 68.362,66.049L68.362,41.953C71.099,45.21 72.745,49.412 72.745,54.001ZM54.001,72.745C53.463,72.745 52.931,72.723 52.406,72.679L52.406,35.322C52.931,35.278 53.463,35.255 54.001,35.255C54.538,35.255 55.071,35.278 55.596,35.322L55.596,72.679C55.071,72.723 54.538,72.745 54.001,72.745ZM35.255,54.001C35.255,49.412 36.903,45.21 39.638,41.953L39.638,66.049C36.903,62.791 35.255,58.588 35.255,54.001ZM61.98,70.969C60.961,71.447 59.895,71.838 58.789,72.13L58.789,35.873C59.895,36.164 60.961,36.553 61.98,37.032L61.98,70.969ZM49.213,72.13C46.877,71.514 44.717,70.458 42.831,69.056L42.831,38.945C44.717,37.543 46.877,36.487 49.213,35.873L49.213,72.13Z"
      android:strokeLineJoin="miter"
      android:strokeWidth="4"
      android:fillColor="#000000"
      android:strokeColor="#00000000"
-      android:fillAlpha="1"
      android:strokeLineCap="butt"/>
  <path
-      android:pathData="M54.034,44.513a9.535,9.428 0,1 0,19.07 0a9.535,9.428 0,1 0,-19.07 0z"
-      android:strokeAlpha="1"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="10"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"
-      android:fillAlpha="1"
-      android:strokeLineCap="butt"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M52,-884.362h29v71h-29z"/>
-  <path
-      android:pathData="m62.745,24.783c-2.055,1.011 -2.87,3.415 -1.847,5.446 0.588,1.168 1.642,1.916 2.839,2.168 -0.564,0.884 -0.835,1.972 -0.925,3.156 -1.782,-0.45 -3.735,-0.191 -5.25,0.639a0.799,0.808 90,0 0,-0.132 0.172,0.799 0.808,90 0,0 -0.132,0.172 0.799,0.808 90,0 0,-0.132 0.39,0.799 0.808,90 0,0 0.044,0.304 0.799,0.808 90,0 0,0.437 0.433,0.799 0.808,90 0,0 0.131,0.043 0.799,0.808 90,0 0,0.131 0.043,0.799 0.808,90 0,0 0.218,-0 0.799,0.808 90,0 0,0.263 -0.129c1.29,-0.707 2.97,-0.892 4.375,-0.425 0.096,0.882 0.341,1.782 0.695,2.683 -0.456,0.072 -0.936,0.177 -1.357,0.343 -1.207,0.48 -2.245,1.302 -3.022,2.244a0.799,0.808 90,0 0,-0.044 0.129,0.799 0.808,90 0,0 -0.088,0.258 0.799,0.808 90,0 0,0.044 0.304,0.799 0.808,90 0,0 0.393,0.563 0.799,0.808 90,0 0,0.394 0.131,0.799 0.808,90 0,0 0.175,-0.086 0.799,0.808 90,0 0,0.175 -0.086,0.799 0.808,90 0,0 0.219,-0.215c0.922,-1.115 2.409,-1.925 3.897,-2.025 0.494,0.845 1.016,1.575 1.658,2.209 -1.232,1.149 -2.043,2.664 -2.239,4.234a0.799,0.808 90,0 0,-0.001 0.215,0.799 0.808,90 0,0 0.174,0.346 0.799,0.808 90,0 0,0.043 0.086,0.799 0.808,90 0,0 0.219,0.217 0.799,0.808 90,0 0,0.131 0.043,0.799 0.808,90 0,0 0.131,0.043 0.799,0.808 90,0 0,0.218 -0,0.799 0.808,90 0,0 0.218,-0 0.799,0.808 90,0 0,0.132 -0.172,0.799 0.808,90 0,0 0.175,-0.086 0.799,0.808 90,0 0,0.044 -0.129,0.799 0.808,90 0,0 0.088,-0.258 0.799,0.808 90,0 0,0.044 -0.129c0.159,-1.272 0.816,-2.493 1.799,-3.371 1.966,1.394 4.252,1.797 6.122,0.876 1.892,-0.931 2.903,-3.018 2.941,-5.444 1.327,-0.259 2.813,0.014 3.936,0.656a0.799,0.808 90,0 0,0.174 0.129,0.799 0.808,90 0,0 0.131,0.043 0.799,0.808 90,0 0,0.088 -0.043,0.799 0.808,90 0,0 0.218,-0 0.799,0.808 90,0 0,0.087 -0.043,0.799 0.808,90 0,0 0.175,-0.086 0.799,0.808 90,0 0,0.132 -0.172,0.799 0.808,90 0,0 0.132,-0.172 0.799,0.808 90,0 0,0.045 -0.562,0.799 0.808,90 0,0 -0.043,-0.086 0.799,0.808 90,0 0,-0.262 -0.303,0.799 0.808,90 0,0 -0.131,-0.043c-1.386,-0.792 -3.097,-1.066 -4.766,-0.787 -0.125,-0.89 -0.309,-1.783 -0.695,-2.683 0.982,-1.073 2.47,-1.756 3.896,-1.81a0.799,0.808 90,0 0,0.131 0.043,0.799 0.808,90 0,0 0.087,-0.043 0.799,0.808 90,0 0,0.482 -0.345,0.799 0.808,90 0,0 0.044,-0.129 0.799,0.808 90,0 0,0.088 -0.476,0.799 0.808,90 0,0 -0.043,-0.086 0.799,0.808 90,0 0,-0.262 -0.303,0.799 0.808,90 0,0 -0.043,-0.086 0.799,0.808 90,0 0,-0.394 -0.131,0.799 0.808,90 0,0 -0.131,-0.043c-1.227,0.048 -2.518,0.369 -3.633,1.031 -0.388,0.233 -0.762,0.548 -1.095,0.864 -0.513,-0.821 -1.093,-1.559 -1.746,-2.166 0.47,-1.39 1.632,-2.605 2.98,-3.195a0.799,0.808 90,0 0,0.175 -0.086,0.799 0.808,90 0,0 0.132,-0.172 0.799,0.808 90,0 0,0.132 -0.172,0.799 0.808,90 0,0 0.132,-0.39 0.799,0.808 90,0 0,-0.043 -0.086,0.799 0.808,90 0,0 -0.174,-0.346 0.799,0.808 90,0 0,-0.043 -0.086,0.799 0.808,90 0,0 -0.437,-0.217 0.799,0.808 90,0 0,-0.175 0.086,0.799 0.808,90 0,0 -0.131,-0.043 0.799,0.808 90,0 0,-0.087 0.043,0.799 0.808,90 0,0 -0.131,-0.043c-1.584,0.694 -2.97,2.079 -3.681,3.756 -1.012,-0.644 -2.048,-1.087 -3.104,-1.173 0.53,-1.101 0.642,-2.414 0.05,-3.59 -1.023,-2.031 -3.541,-2.795 -5.596,-1.783z"
+      android:pathData="m62.745,28.783c-2.055,1.011 -2.87,3.415 -1.847,5.446 0.588,1.168 1.642,1.916 2.839,2.168 -0.564,0.884 -0.835,1.972 -0.925,3.156 -1.782,-0.45 -3.735,-0.191 -5.25,0.639a0.799,0.808 90.001,0 0,-0.132 0.172,0.799 0.808,90.001 0,0 -0.132,0.172 0.799,0.808 90.001,0 0,-0.132 0.39,0.799 0.808,90.001 0,0 0.044,0.304 0.799,0.808 90.001,0 0,0.437 0.433,0.799 0.808,90.001 0,0 0.131,0.043 0.799,0.808 90.001,0 0,0.131 0.043,0.799 0.808,90.001 0,0 0.218,-0 0.799,0.808 90.001,0 0,0.263 -0.129c1.29,-0.707 2.97,-0.892 4.375,-0.425 0.096,0.882 0.341,1.782 0.695,2.683 -0.456,0.072 -0.936,0.177 -1.357,0.343 -1.207,0.48 -2.245,1.302 -3.022,2.244a0.799,0.808 90.001,0 0,-0.044 0.129,0.799 0.808,90.001 0,0 -0.088,0.258 0.799,0.808 90.001,0 0,0.044 0.304,0.799 0.808,90.001 0,0 0.393,0.563 0.799,0.808 90.001,0 0,0.394 0.131,0.799 0.808,90.001 0,0 0.175,-0.086 0.799,0.808 90.001,0 0,0.175 -0.086,0.799 0.808,90.001 0,0 0.219,-0.215c0.922,-1.115 2.409,-1.925 3.897,-2.025 0.494,0.845 1.016,1.575 1.658,2.209 -1.232,1.149 -2.043,2.664 -2.239,4.234a0.799,0.808 90.001,0 0,-0.001 0.215,0.799 0.808,90.001 0,0 0.174,0.346 0.799,0.808 90.001,0 0,0.043 0.086,0.799 0.808,90.001 0,0 0.219,0.217 0.799,0.808 90.001,0 0,0.131 0.043,0.799 0.808,90.001 0,0 0.131,0.043 0.799,0.808 90.001,0 0,0.218 -0,0.799 0.808,90.001 0,0 0.218,-0 0.799,0.808 90.001,0 0,0.132 -0.172,0.799 0.808,90.001 0,0 0.175,-0.086 0.799,0.808 90.001,0 0,0.044 -0.129,0.799 0.808,90.001 0,0 0.088,-0.258 0.799,0.808 90.001,0 0,0.044 -0.129c0.159,-1.272 0.816,-2.493 1.799,-3.371 1.966,1.394 4.252,1.797 6.122,0.876 1.892,-0.931 2.903,-3.018 2.941,-5.444 1.327,-0.259 2.813,0.014 3.936,0.656a0.799,0.808 90.001,0 0,0.174 0.129,0.799 0.808,90.001 0,0 0.131,0.043 0.799,0.808 90.001,0 0,0.088 -0.043,0.799 0.808,90.001 0,0 0.218,-0 0.799,0.808 90.001,0 0,0.087 -0.043,0.799 0.808,90.001 0,0 0.175,-0.086 0.799,0.808 90.001,0 0,0.132 -0.172,0.799 0.808,90.001 0,0 0.132,-0.172 0.799,0.808 90.001,0 0,0.045 -0.562,0.799 0.808,90.001 0,0 -0.043,-0.086 0.799,0.808 90.001,0 0,-0.262 -0.303,0.799 0.808,90.001 0,0 -0.131,-0.043c-1.386,-0.792 -3.097,-1.066 -4.766,-0.787 -0.125,-0.89 -0.309,-1.783 -0.695,-2.683 0.982,-1.073 2.47,-1.756 3.896,-1.81a0.799,0.808 90.001,0 0,0.131 0.043,0.799 0.808,90.001 0,0 0.087,-0.043 0.799,0.808 90.001,0 0,0.482 -0.345,0.799 0.808,90.001 0,0 0.044,-0.129 0.799,0.808 90.001,0 0,0.088 -0.476,0.799 0.808,90.001 0,0 -0.043,-0.086 0.799,0.808 90.001,0 0,-0.262 -0.303,0.799 0.808,90.001 0,0 -0.043,-0.086 0.799,0.808 90.001,0 0,-0.394 -0.131,0.799 0.808,90.001 0,0 -0.131,-0.043c-1.227,0.048 -2.518,0.369 -3.633,1.031 -0.388,0.233 -0.762,0.548 -1.095,0.864 -0.513,-0.821 -1.093,-1.559 -1.746,-2.166 0.47,-1.39 1.632,-2.605 2.98,-3.195a0.799,0.808 90.001,0 0,0.175 -0.086,0.799 0.808,90.001 0,0 0.132,-0.172 0.799,0.808 90.001,0 0,0.132 -0.172,0.799 0.808,90.001 0,0 0.132,-0.39 0.799,0.808 90.001,0 0,-0.043 -0.086,0.799 0.808,90.001 0,0 -0.174,-0.346 0.799,0.808 90.001,0 0,-0.043 -0.086,0.799 0.808,90.001 0,0 -0.437,-0.217 0.799,0.808 90.001,0 0,-0.175 0.086,0.799 0.808,90.001 0,0 -0.131,-0.043 0.799,0.808 90.001,0 0,-0.087 0.043,0.799 0.808,90.001 0,0 -0.131,-0.043c-1.584,0.694 -2.97,2.079 -3.681,3.756 -1.012,-0.644 -2.048,-1.087 -3.104,-1.173 0.53,-1.101 0.642,-2.414 0.05,-3.59 -1.023,-2.031 -3.541,-2.795 -5.596,-1.783z"
      android:fillColor="#ff2a2a"
-      android:strokeColor="#00000000"
-      android:fillAlpha="1"/>
+      android:strokeColor="#00000000"/>
  <path
-      android:pathData="m66.624,32.489c0.281,-0.138 1.896,2.465 3.62,5.889 1.724,3.424 2.893,6.354 2.613,6.492 -0.281,0.138 -1.94,-2.551 -3.663,-5.975 -1.724,-3.424 -2.85,-6.268 -2.569,-6.406z"
+      android:pathData="m66.624,36.489c0.281,-0.138 1.896,2.465 3.62,5.889 1.724,3.424 2.893,6.354 2.613,6.492 -0.281,0.138 -1.94,-2.551 -3.663,-5.975 -1.724,-3.424 -2.85,-6.268 -2.569,-6.406z"
      android:fillColor="#d40000"
-      android:strokeColor="#00000000"
-      android:fillAlpha="1"/>
+      android:strokeColor="#00000000"/>
 </vector>
@@ -1,38 +1,60 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
-	package="de.markusfisch.android.binaryeye"
 	android:installLocation="auto">
 	<supports-screens
 		android:largeScreens="true"
 		android:xlargeScreens="true"/>
+	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"
+		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="true"
+		android:fullBackupContent="@xml/backup_rules"
+		android:dataExtractionRules="@xml/extraction_rules"
 		android:supportsRtl="true"
+		android:resizeableActivity="true"
 		android:label="@string/app_name"
 		android:icon="@mipmap/ic_launcher"
 		android:theme="@style/AppTheme">
 		<activity
 			android:name=".activity.SplashActivity"
-			android:label="@string/app_name"
-			android:theme="@style/SplashTheme">
+			android:theme="@style/SplashTheme"
+			android:exported="true">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
 				<category android:name="android.intent.category.LAUNCHER"/>
 			</intent-filter>
+			<meta-data
+				android:name="android.app.shortcuts"
+				android:resource="@xml/shortcuts"/>
 		</activity>
 		<activity
 			android:name=".activity.CameraActivity"
-			android:label="@string/scan_code">
+			android:label="@string/scan_code"
+			android:exported="true">
 			<intent-filter android:label="@string/compose_barcode">
 				<action android:name="android.intent.action.SEND"/>
 				<category android:name="android.intent.category.DEFAULT"/>
@@ -46,15 +68,23 @@
 				<action android:name="android.intent.action.VIEW"/>
 				<category android:name="android.intent.category.DEFAULT"/>
 				<category android:name="android.intent.category.BROWSABLE"/>
-				<data
-					android:host="www.markusfisch.de"
-					android:pathPrefix="/BinaryEye"
-					android:scheme="http"/>
+				<data android:host="markusfisch.de"/>
+				<data android:pathPrefix="/BinaryEye"/>
+				<data android:scheme="http"/>
+				<data android:scheme="https"/>
+			</intent-filter>
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW"/>
+				<category android:name="android.intent.category.DEFAULT"/>
+				<category android:name="android.intent.category.BROWSABLE"/>
+				<data android:scheme="binaryeye" android:host="scan"/>
 			</intent-filter>
 		</activity>
 		<activity
 			android:name=".activity.PickActivity"
-			android:label="@string/scan_code">
+			android:label="@string/pick_code_to_scan"
+			android:exported="true"
+			tools:ignore="AppLinkUrlError">
 			<intent-filter android:label="@string/decode_barcode">
 				<action android:name="android.intent.action.SEND"/>
 				<category android:name="android.intent.category.DEFAULT"/>
@@ -63,12 +93,22 @@
 			<intent-filter android:label="@string/decode_barcode">
 				<action android:name="android.intent.action.VIEW"/>
 				<category android:name="android.intent.category.DEFAULT"/>
-				<data android:mimeType="image/*" android:scheme="file"/>
+				<data android:mimeType="image/*"/>
 			</intent-filter>
 		</activity>
 		<activity
 			android:name=".activity.MainActivity"
-			android:label="@string/app_name"/>
+			android:exported="true"/>
+		<service
+			android:name=".service.ScanTileService"
+			android:icon="@drawable/ic_action_scan"
+			android:label="@string/scan_code"
+			android:exported="true"
+			android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+			<intent-filter>
+				<action android:name="android.service.quicksettings.action.QS_TILE"/>
+			</intent-filter>
+		</service>
 		<provider
 			android:name="android.support.v4.content.FileProvider"
 			android:authorities="${applicationId}.provider"
@@ -78,5 +118,8 @@
 				android:name="android.support.FILE_PROVIDER_PATHS"
 				android:resource="@xml/file_paths"/>
 		</provider>
+		<meta-data
+			android:name="android.app.searchable"
+			android:resource="@xml/searchable"/>
 	</application>
 </manifest>
@@ -1,6 +1,7 @@
 package de.markusfisch.android.binaryeye.actions

 import de.markusfisch.android.binaryeye.actions.mail.MailAction
+import de.markusfisch.android.binaryeye.actions.mail.MatMsgAction
 import de.markusfisch.android.binaryeye.actions.otpauth.OtpauthAction
 import de.markusfisch.android.binaryeye.actions.search.OpenOrSearchAction
 import de.markusfisch.android.binaryeye.actions.sms.SmsAction
@@ -13,15 +14,18 @@ import de.markusfisch.android.binaryeye.actions.wifi.WifiAction
 object ActionRegistry {
 	val DEFAULT_ACTION: IAction = OpenOrSearchAction

-	val REGISTRY: Set<IAction> = setOf(
+	private val REGISTRY: Set<IAction> = setOf(
 		MailAction,
+		MatMsgAction,
 		OtpauthAction,
 		SmsAction,
 		TelAction,
 		VCardAction,
 		VEventAction,
-		WebAction,
-		WifiAction
+		WifiAction,
+		// Try WebAction last because recognizing colloquial URLs is
+		// very aggressive.
+		WebAction
 	)

 	fun getAction(data: ByteArray): IAction = REGISTRY.find {
@@ -2,9 +2,9 @@ package de.markusfisch.android.binaryeye.actions

 import android.content.Context
 import android.content.Intent
-import android.widget.Toast
-import de.markusfisch.android.binaryeye.app.execShareIntent
-import de.markusfisch.android.binaryeye.app.parseAndNormalizeUri
+import de.markusfisch.android.binaryeye.content.execShareIntent
+import de.markusfisch.android.binaryeye.content.openUrl
+import de.markusfisch.android.binaryeye.widget.toast

 interface IAction {
 	val iconResId: Int
@@ -18,34 +18,36 @@ abstract class IntentAction : IAction {
 	abstract val errorMsg: Int

 	final override suspend fun execute(context: Context, data: ByteArray) {
-		val intent =
-			createIntent(context, data) ?: return Toast.makeText(
-				context,
-				errorMsg,
-				Toast.LENGTH_LONG
-			).show()
-		execShareIntent(context, intent)
+		val intent = createIntent(context, data)
+		if (intent == null) {
+			context.toast(errorMsg)
+		} else {
+			context.execShareIntent(intent)
+		}
 	}

-	abstract suspend fun createIntent(context: Context, data: ByteArray): Intent?
+	abstract suspend fun createIntent(
+		context: Context,
+		data: ByteArray
+	): Intent?
 }

 abstract class SchemeAction : IAction {
 	abstract val scheme: String
-	open val intentAction: String = Intent.ACTION_VIEW
 	open val buildRegex: Boolean = false

 	final override fun canExecuteOn(data: ByteArray): Boolean {
 		val content = String(data)
 		return if (buildRegex) {
-			content.matches("""^$scheme://[\w\W]+$""".toRegex(RegexOption.IGNORE_CASE))
+			content.matches("""^$scheme://[\w\W]+$""".toRegex(
+				RegexOption.IGNORE_CASE)
+			)
 		} else {
 			content.startsWith("$scheme://", ignoreCase = true)
 		}
 	}

 	final override suspend fun execute(context: Context, data: ByteArray) {
-		val uri = parseAndNormalizeUri(String(data))
-		execShareIntent(context, Intent(intentAction, uri))
+		context.openUrl(String(data))
 	}
 }
@@ -1,132 +0,0 @@
-package de.markusfisch.android.binaryeye.activity
-
-import android.content.Intent
-import android.graphics.Bitmap
-import android.net.Uri
-import android.os.Bundle
-import android.os.Parcelable
-import android.provider.MediaStore
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.Toolbar
-import android.view.Menu
-import android.view.MenuItem
-import android.widget.Toast
-import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.app.initSystemBars
-import de.markusfisch.android.binaryeye.app.setSystemAndToolBarTransparency
-import de.markusfisch.android.binaryeye.graphics.crop
-import de.markusfisch.android.binaryeye.graphics.downsizeIfBigger
-import de.markusfisch.android.binaryeye.widget.CropImageView
-import de.markusfisch.android.binaryeye.zxing.Zxing
-import java.io.IOException
-
-class PickActivity : AppCompatActivity() {
-	private val zxing = Zxing()
-
-	private lateinit var cropImageView: CropImageView
-
-	override fun onCreate(state: Bundle?) {
-		super.onCreate(state)
-		setContentView(R.layout.activity_pick)
-		initSystemBars(this)
-
-		setSupportActionBar(findViewById(R.id.toolbar) as Toolbar)
-		supportActionBar?.setDisplayHomeAsUpEnabled(true)
-
-		supportFragmentManager.addOnBackStackChangedListener({
-			setSystemAndToolBarTransparency(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
-		}
-
-		if (bitmap == null) {
-			Toast.makeText(
-				applicationContext,
-				R.string.error_no_content,
-				Toast.LENGTH_SHORT
-			).show()
-			finish()
-			return
-		}
-
-		cropImageView = findViewById(R.id.image) as CropImageView
-		cropImageView.setImageBitmap(bitmap)
-
-		findViewById(R.id.scan).setOnClickListener {
-			val detail = crop(
-				bitmap,
-				cropImageView.normalizedRectInBounds,
-				cropImageView.imageRotation
-			)
-			detail?.let {
-				scanImage(detail)
-			}
-		}
-	}
-
-	override fun onCreateOptionsMenu(menu: Menu): Boolean {
-		menuInflater.inflate(R.menu.activity_pick, menu)
-		return true
-	}
-
-	override fun onOptionsItemSelected(item: MenuItem): Boolean {
-		return when (item.itemId) {
-			R.id.rotate -> {
-				rotateClockwise()
-				true
-			}
-			else -> super.onOptionsItemSelected(item)
-		}
-	}
-
-	private fun rotateClockwise() {
-		cropImageView.imageRotation = cropImageView.imageRotation + 90 % 360
-	}
-
-	private fun loadSentImage(intent: Intent): Bitmap? {
-		val uri = intent.getParcelableExtra<Parcelable>(
-			Intent.EXTRA_STREAM
-		) as? Uri ?: return null
-		return loadImageUri(uri)
-	}
-
-	private fun loadImageToOpen(intent: Intent): Bitmap? {
-		val uri = intent.data ?: return null
-		return loadImageUri(uri)
-	}
-
-	private fun loadImageUri(uri: Uri): Bitmap? = try {
-		downsizeIfBigger(
-			MediaStore.Images.Media.getBitmap(contentResolver, uri),
-			1024
-		)
-	} catch (e: IOException) {
-		null
-	}
-
-	private fun scanImage(bitmap: Bitmap) {
-		val result = zxing.decodePositiveNegative(bitmap)
-		if (result != null) {
-			showResult(this, result)
-			finish()
-			return
-		}
-		Toast.makeText(
-			applicationContext,
-			R.string.no_barcode_found,
-			Toast.LENGTH_SHORT
-		).show()
-	}
-}
@@ -0,0 +1,49 @@
+package de.markusfisch.android.binaryeye.actions.mail
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.actions.IntentAction
+
+object MatMsgAction : IntentAction() {
+	override val iconResId: Int = R.drawable.ic_action_mail
+	override val titleResId: Int = R.string.mail_send
+	override val errorMsg: Int = R.string.mail_error
+
+	override fun canExecuteOn(data: ByteArray): Boolean {
+		return String(data).startsWith("MATMSG:")
+	}
+
+	override suspend fun createIntent(
+		context: Context,
+		data: ByteArray
+	): Intent? {
+		val encoded = String(data)
+		// Allow arbitrary order.
+		val to = encoded.extractFirst("""[:;]TO:([\w.%@+-]+);""")
+		val sub = encoded.extractFirst("""[:;]SUB:([^;]+);""")
+		val body = encoded.extractFirst("""[:;]BODY:([^;]+);""")
+		// Allow incomplete but not completely missing data.
+		if (to == null && sub == null && body == null) {
+			return null
+		}
+		return Intent(
+			Intent.ACTION_SENDTO,
+			Uri.parse("mailto:")
+		).apply {
+			to?.let {
+				putExtra(Intent.EXTRA_EMAIL, to)
+			}
+			sub?.let {
+				putExtra(Intent.EXTRA_SUBJECT, sub)
+			}
+			body?.let {
+				putExtra(Intent.EXTRA_TEXT, body)
+			}
+		}
+	}
+}
+
+private fun String.extractFirst(regex: String) =
+	regex.toRegex().find(this)?.groupValues?.get(1)
@@ -1,15 +1,12 @@
 package de.markusfisch.android.binaryeye.actions.search

 import android.content.Context
-import android.content.Intent
-import android.widget.Toast
 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.urlEncode
 import de.markusfisch.android.binaryeye.app.prefs
-import java.net.URLEncoder
+import de.markusfisch.android.binaryeye.content.openUrl

 object OpenOrSearchAction : IAction {
 	override val iconResId: Int = R.drawable.ic_action_search
@@ -18,32 +15,39 @@ object OpenOrSearchAction : IAction {
 	override fun canExecuteOn(data: ByteArray): Boolean = false

 	override suspend fun execute(context: Context, data: ByteArray) {
-		val intent = openUri(context, String(data)) ?: return
-		execShareIntent(context, intent)
+		view(context, String(data), true)
 	}

-	private suspend fun openUri(context: Context, data: String, search: Boolean = true): Intent? {
-		val uri = parseAndNormalizeUri(data)
-		val intent = Intent(Intent.ACTION_VIEW, uri)
-		when {
-			intent.resolveActivity(context.packageManager) != null -> return intent
-			search -> return getSearchIntent(context, data)
-			else -> Toast.makeText(
-				context,
-				R.string.cannot_resolve_action,
-				Toast.LENGTH_SHORT
-			).show()
+	private suspend fun view(
+		context: Context,
+		url: String,
+		search: Boolean
+	) {
+		if (!context.openUrl(url) && search) {
+			openSearch(context, url)
 		}
-		return null
 	}

-	private suspend fun getSearchIntent(context: Context, query: String): Intent? {
+	private suspend fun openSearch(context: Context, query: String) {
+		val defaultSearchUrl = prefs.defaultSearchUrl
+		if (defaultSearchUrl.isNotEmpty()) {
+			view(
+				context,
+				defaultSearchUrl + query.urlEncode(),
+				false
+			)
+			return
+		}
 		val names = context.resources.getStringArray(
 			R.array.search_engines_names
 		).toMutableList()
 		val urls = context.resources.getStringArray(
 			R.array.search_engines_values
 		).toMutableList()
+		// Remove the "Always ask" entry. The arrays search_engines_*
+		// are used in the preferences too.
+		names.removeFirst()
+		urls.removeFirst()
 		if (prefs.openWithUrl.isNotEmpty()) {
 			names.add(prefs.openWithUrl)
 			urls.add(prefs.openWithUrl)
@@ -51,9 +55,9 @@ object OpenOrSearchAction : IAction {
 		val queryUri = alertDialog<String>(context) { resume ->
 			setTitle(R.string.pick_search_engine)
 			setItems(names.toTypedArray()) { _, which ->
-				resume(urls[which] + URLEncoder.encode(query, "utf-8"))
+				resume(urls[which] + query.urlEncode())
 			}
-		} ?: return null
-		return openUri(context, queryUri, false)
+		} ?: return
+		view(context, queryUri, false)
 	}
 }
@@ -7,8 +7,9 @@ import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.actions.IntentAction

 object SmsAction : IntentAction() {
-	private val smsRegex =
-		"""^sms(?:to)?:(\+?[0-9]+)(?::([\S\s]*))?$""".toRegex(RegexOption.IGNORE_CASE)
+	private val smsRegex = """^sms(?:to)?:(\+?[0-9]+)(?::([\S\s]*))?$""".toRegex(
+		RegexOption.IGNORE_CASE
+	)

 	override val iconResId: Int = R.drawable.ic_action_sms
 	override val titleResId: Int = R.string.sms_send
@@ -28,7 +29,9 @@ object SmsAction : IntentAction() {
 			Intent.ACTION_SENDTO,
 			Uri.parse("smsto:$number")
 		).apply {
-			if (message.isNotEmpty()) putExtra("sms_body", message)
+			if (message.isNotEmpty()) {
+				putExtra("sms_body", message)
+			}
 		}
 	}
 }
@@ -7,7 +7,9 @@ import de.markusfisch.android.binaryeye.actions.IntentAction
 import de.markusfisch.android.binaryeye.app.parseAndNormalizeUri

 object TelAction : IntentAction() {
-	private val telRegex = """^tel:(\+?[0-9]+)$""".toRegex(RegexOption.IGNORE_CASE)
+	private val telRegex = """^tel:(\+?[0-9]+)$""".toRegex(
+		RegexOption.IGNORE_CASE
+	)

 	override val iconResId: Int = R.drawable.ic_action_tel
 	override val titleResId: Int = R.string.tel_dial
@@ -17,7 +19,11 @@ object TelAction : IntentAction() {
 		return String(data).matches(telRegex)
 	}

-	override suspend fun createIntent(context: Context, data: ByteArray): Intent {
-		return Intent(Intent.ACTION_DIAL, parseAndNormalizeUri(String(data)))
-	}
+	override suspend fun createIntent(
+		context: Context,
+		data: ByteArray
+	): Intent = Intent(
+		Intent.ACTION_DIAL,
+		String(data).parseAndNormalizeUri()
+	)
 }
@@ -1,22 +1,32 @@
 package de.markusfisch.android.binaryeye.actions.vtype

+import java.util.*
+
 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()
+	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() }) { it.second }
+	}.groupBy({ it.first.uppercase(Locale.US) }) { it.second }
 }

 data class VTypeProperty(
@@ -8,6 +8,8 @@ import android.provider.ContactsContract
 import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.actions.IntentAction
 import de.markusfisch.android.binaryeye.actions.vtype.VTypeParser
+import java.util.*
+import kotlin.collections.ArrayList

 object VCardAction : IntentAction() {
 	override val iconResId: Int
@@ -18,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 {
@@ -46,7 +57,10 @@ object VCardAction : IntentAction() {
 						putExtra(extraPhoneType, phoneType)
 					} ?: putExtra(extraPhoneType, it)
 				}
-				putExtra(extraPhone, phoneProperty.value.toLowerCase().removePrefix("tel:"))
+				putExtra(
+					extraPhone,
+					phoneProperty.value.lowercase(Locale.US).removePrefix("tel:")
+				)
 			}
 			info["EMAIL"]?.forEachIndexed { index, mailProperty ->
 				val (extraMailType, extraMail) = when (index) {
@@ -115,27 +129,29 @@ object VCardAction : IntentAction() {
 	}

 	private val String.locationFormat: String
-		get() = """^([^;]*?);([^;]*?);([^;]*?);([^;]*?);([^;]*?);([^;]*?);([^;]*?)$""".toRegex().matchEntire(
-			this
-		)?.groupValues?.let {
-			listOf(
-				it[1],
-				it[2],
-				it[3],
-				"${it[4]} ${it[6]}",
-				"${it[5]} ${it[7]}"
-			).filter { line -> line.isNotBlank() }
-				.joinToString("\n").takeIf { location -> location.isNotBlank() }
-		} ?: this
+		get() = """^([^;]*?);([^;]*?);([^;]*?);([^;]*?);([^;]*?);([^;]*?);([^;]*?)$""".toRegex()
+			.matchEntire(
+				this
+			)?.groupValues?.let {
+				listOf(
+					it[1],
+					it[2],
+					it[3],
+					"${it[4]} ${it[6]}",
+					"${it[5]} ${it[7]}"
+				).filter { line -> line.isNotBlank() }
+					.joinToString("\n").takeIf { location -> location.isNotBlank() }
+			} ?: this

 	private val String.nameFormat: String
-		get() = """^([^;]*?);([^;]*?);([^;]*?);([^;]*?);([^;]*?)$""".toRegex().matchEntire(this)?.groupValues?.let {
-			listOf(it[4], it[2], it[3], it[1], it[5]).joinToString(" ")
-				.takeIf { name -> name.isNotBlank() }
-		} ?: this
+		get() = """^([^;]*?);([^;]*?);([^;]*?);([^;]*?);([^;]*?)$""".toRegex()
+			.matchEntire(this)?.groupValues?.let {
+				listOf(it[4], it[2], it[3], it[1], it[5]).joinToString(" ")
+					.takeIf { name -> name.isNotBlank() }
+			} ?: this

 	private val String.mailType: Int?
-		get() = when (this.toUpperCase()) {
+		get() = when (this.uppercase(Locale.US)) {
 			"HOME" -> ContactsContract.CommonDataKinds.Email.TYPE_HOME
 			"WORK" -> ContactsContract.CommonDataKinds.Email.TYPE_WORK
 			"OTHER" -> ContactsContract.CommonDataKinds.Email.TYPE_OTHER
@@ -144,7 +160,7 @@ object VCardAction : IntentAction() {
 		}

 	private val String.phoneType: Int?
-		get() = when (this.toUpperCase()) {
+		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
@@ -169,7 +185,7 @@ object VCardAction : IntentAction() {
 		}

 	private val String.addressType: Int?
-		get() = when (this.toUpperCase()) {
+		get() = when (this.toUpperCase(Locale.US)) {
 			"HOME" -> ContactsContract.CommonDataKinds.StructuredPostal.TYPE_HOME
 			"WORK" -> ContactsContract.CommonDataKinds.StructuredPostal.TYPE_WORK
 			"OTHER" -> ContactsContract.CommonDataKinds.StructuredPostal.TYPE_OTHER
@@ -10,7 +10,7 @@ import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.actions.IntentAction
 import de.markusfisch.android.binaryeye.actions.vtype.VTypeParser
 import java.text.SimpleDateFormat
-import java.util.Date
+import java.util.*

 object VEventAction : IntentAction() {
 	override val iconResId: Int
@@ -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)
@@ -42,18 +45,25 @@ object VEventAction : IntentAction() {
 			}
 			info["DTSTART"]?.singleOrNull()?.also { eventStart ->
 				dateFormats.simpleFindParse(eventStart.value)?.also {
-					putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, it.time)
+					putExtra(
+						CalendarContract.EXTRA_EVENT_BEGIN_TIME,
+						it.localTime()
+					)
 				}
 			}
 			info["DTEND"]?.singleOrNull()?.also { eventEnd ->
 				dateFormats.simpleFindParse(eventEnd.value)?.also {
-					putExtra(CalendarContract.EXTRA_EVENT_END_TIME, it.time)
+					putExtra(
+						CalendarContract.EXTRA_EVENT_END_TIME,
+						it.localTime()
+					)
 				}
 			}
 		}
 	}

-	@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"),
@@ -76,3 +86,6 @@ object VEventAction : IntentAction() {
 		null
 	}
 }
+
+private fun Date.localTime() = time - timezoneOffset * 60000L
+
@@ -1,11 +1,27 @@
 package de.markusfisch.android.binaryeye.actions.web

+import android.content.Context
 import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.actions.SchemeAction
+import de.markusfisch.android.binaryeye.actions.IAction
+import de.markusfisch.android.binaryeye.content.openUrl
+
+object WebAction : IAction {
+	private val colloquialRegex = """^(http[s]*://)*([a-z0-9]+[a-z0-9-]*[a-z0-9]+[.])+[a-z]{2,}([?#/]+[\w/=&;._-]*)*$""".toRegex(
+		RegexOption.IGNORE_CASE
+	)

-object WebAction : SchemeAction() {
 	override val iconResId: Int = R.drawable.ic_action_open
 	override val titleResId: Int = R.string.open_url
-	override val scheme: String = "https?"
-	override val buildRegex: Boolean = true
+
+	override fun canExecuteOn(data: ByteArray): Boolean {
+		return String(data).trim().matches(colloquialRegex)
+	}
+
+	override suspend fun execute(context: Context, data: ByteArray) {
+		var url = String(data).trim()
+		if (!url.startsWith("http") && !url.startsWith("ftp")) {
+			url = "http://${url}"
+		}
+		context.openUrl(url)
+	}
 }
@@ -1,90 +1,33 @@
 package de.markusfisch.android.binaryeye.actions.wifi

 import android.content.Context
-import android.content.Context.WIFI_SERVICE
-import android.net.wifi.WifiConfiguration
-import android.net.wifi.WifiManager
-import android.widget.Toast
 import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.actions.IAction
+import de.markusfisch.android.binaryeye.widget.toast
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext
-import kotlinx.coroutines.withTimeoutOrNull

 object WifiAction : IAction {
 	override val iconResId = R.drawable.ic_action_wifi
 	override val titleResId = R.string.connect_to_wifi

-	override fun canExecuteOn(data: ByteArray): Boolean =
-		WifiConfigurationFactory.parse(String(data)) != null
+	var password: String? = null

-	override suspend fun execute(context: Context, data: ByteArray) = withContext(Dispatchers.IO) {
-		val wifiConfig = WifiConfigurationFactory.parse(
+	override fun canExecuteOn(data: ByteArray): Boolean =
+		WifiConnector.parse(String(data)) {
+			password = it
+		} != null
+
+	override suspend fun execute(
+		context: Context,
+		data: ByteArray
+	) = withContext(Dispatchers.IO) {
+		val wifiConfig = WifiConnector.parse(
 			String(data)
 		) ?: return@withContext
-		val wifiManager = context.applicationContext.getSystemService(
-			WIFI_SERVICE
-		) as WifiManager
-
-		wifiManager.enableWifi(context)
-		wifiManager.mayRemoveOldNetwork(wifiConfig)
-		wifiManager.enableNewNetwork(wifiConfig)
+		val message = WifiConnector.addNetwork(context, wifiConfig)
 		withContext(Dispatchers.Main) {
-			Toast.makeText(
-				context,
-				R.string.wifi_added,
-				Toast.LENGTH_LONG
-			).show()
+			context.toast(message)
 		}
 	}
-
-	private suspend fun WifiManager.enableWifi(context: Context): Boolean {
-		if (!isWifiEnabled) {
-			if (!setWifiEnabled(true)) {
-				withContext(Dispatchers.Main) {
-					Toast.makeText(
-						context,
-						R.string.wifi_config_failed,
-						Toast.LENGTH_LONG
-					).show()
-				}
-				return false
-			}
-			// wait for wifi to really be enabled, takes some time
-			withTimeoutOrNull(10000) {
-				while (!isWifiEnabled) delay(500)
-			} ?: if (!isWifiEnabled) {
-				withContext(Dispatchers.Main) {
-					Toast.makeText(
-						context,
-						R.string.wifi_config_failed,
-						Toast.LENGTH_LONG
-					).show()
-				}
-				return false
-			}
-		}
-		return true
-	}
-
-	private suspend fun WifiManager.mayRemoveOldNetwork(
-		wifiConfig: WifiConfiguration
-	) {
-		configuredNetworks?.firstOrNull {
-			it.SSID == wifiConfig.SSID &&
-					it.allowedKeyManagement == wifiConfig.allowedKeyManagement
-		}?.networkId?.also {
-			removeNetwork(it)
-		}
-	}
-
-	private suspend fun WifiManager.enableNewNetwork(
-		wifiConfig: WifiConfiguration
-	) {
-		val id = addNetwork(wifiConfig)
-		disconnect()
-		enableNetwork(id, true)
-		reconnect()
-	}
 }
@@ -1,8 +1,20 @@
 package de.markusfisch.android.binaryeye.actions.wifi

+import android.content.Context
 import android.net.wifi.WifiConfiguration
 import android.net.wifi.WifiEnterpriseConfig
+import android.net.wifi.WifiManager
+import android.net.wifi.WifiNetworkSuggestion
 import android.os.Build
+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:
@@ -28,26 +40,67 @@ import android.os.Build
 *
 * The fields can appear in any order. Only "S:" is required.
 */
-object WifiConfigurationFactory {
-	fun parse(input: String): WifiConfiguration? {
+object WifiConnector {
+	fun parse(
+		input: String,
+		passwordBlock: ((password: String?) -> Unit)? = null
+	): Any? {
 		val inputMap = parseMap(input) ?: return null
 		val parsedData = SimpleDataAccessor.of(inputMap) ?: return null
-		return WifiConfiguration().apply(parsedData)
+		passwordBlock?.apply {
+			invoke(parsedData.password)
+		}
+		return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+			// WifiConfiguration is deprecated in Android Q.
+			@Suppress("DEPRECATION")
+			WifiConfiguration().apply(parsedData)
+		} else {
+			WifiNetworkSuggestion.Builder().apply(parsedData)
+		}
+	}
+
+	fun addNetwork(context: Context, config: Any): Int {
+		val wifiManager = context.applicationContext.getSystemService(
+			Context.WIFI_SERVICE
+		) as WifiManager
+		return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+			// WifiConfiguration is deprecated in Android Q.
+			@Suppress("DEPRECATION")
+			val wifiConfig = config as WifiConfiguration
+			if (wifiManager.enableWifi() &&
+				wifiManager.removeOldNetwork(wifiConfig) &&
+				wifiManager.enableNewNetwork(wifiConfig)
+			) {
+				R.string.wifi_added
+			} else {
+				R.string.wifi_config_failed
+			}
+		} else {
+			val suggestion = (config as WifiNetworkSuggestion.Builder).build()
+			val suggestions = listOf(suggestion)
+			// Remove previous conflicting network suggestion.
+			wifiManager.removeNetworkSuggestions(suggestions)
+			val result = wifiManager.addNetworkSuggestions(suggestions)
+			if (result == WifiManager.STATUS_NETWORK_SUGGESTIONS_SUCCESS) {
+				R.string.wifi_added
+			} else {
+				R.string.wifi_config_failed
+			}
+		}
 	}

 	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 creator doesn't escape
+		// 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() to pair.groupValues[2]
+				pair.groupValues[1].uppercase(Locale.US) to pair.groupValues[2]
 			}.toMap()
 		}
 	}
@@ -55,26 +108,19 @@ object WifiConfigurationFactory {
 	internal class SimpleDataAccessor private constructor(
 		private val inputMap: Map<String, String>
 	) {
-		private val hexRegex = """^[0-9a-f]+$""".toRegex(
-			RegexOption.IGNORE_CASE
-		)
-		// keep possibility of wrongly not escaped \ by explicitly searching
-		// for special chars
-		private val escapedRegex = """\\([\\;,":])""".toRegex()
-
-		// 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").quotedUnlessHex.unescaped
+			get() = inputMap.getValue("S").unescape
 		internal val securityType: String
-			get() = inputMap["T"]?.unescaped ?: ""
+			get() = inputMap["T"]?.unescape ?: ""
 		internal val password: String?
-			get() = inputMap["P"]?.quotedUnlessHex?.unescaped
+			get() = inputMap["P"]?.unescape
 		internal val hidden: Boolean
-			get() = inputMap["H"]?.unescaped == "true"
+			get() = inputMap["H"]?.unescape == "true"
 		internal val anonymousIdentity: String
-			get() = inputMap["AI"]?.unescaped ?: ""
+			get() = inputMap["AI"]?.unescape ?: inputMap["A"]?.unescape ?: ""
 		internal val identity: String
-			get() = inputMap["I"]?.unescaped ?: ""
+			get() = inputMap["I"]?.unescape ?: ""
 		internal val eapMethod: Int?
 			get() = if (inputMap["E"].isNullOrEmpty()) {
 				requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) {
@@ -109,16 +155,6 @@ object WifiConfigurationFactory {
 				else -> null
 			}

-		private val String.unescaped: String
-			get() = this.replace(escapedRegex) { escaped ->
-				escaped.groupValues[1]
-			}
-
-		private val String.quotedUnlessHex: String
-			get() = if (matches(hexRegex) || (startsWith("\"") &&
-						endsWith("\""))
-			) this else "\"$this\""
-
 		internal companion object {
 			internal fun of(inputMap: Map<String, String>): SimpleDataAccessor? {
 				return SimpleDataAccessor(inputMap).takeUnless {
@@ -128,19 +164,75 @@ object WifiConfigurationFactory {
 		}
 	}

+	@RequiresApi(Build.VERSION_CODES.Q)
+	private fun WifiNetworkSuggestion.Builder.apply(
+		data: SimpleDataAccessor
+	): WifiNetworkSuggestion.Builder? {
+		fun WifiNetworkSuggestion.Builder.applyCommon(
+			data: SimpleDataAccessor
+		): WifiNetworkSuggestion.Builder {
+			setSsid(data.ssid)
+			return this
+		}
+
+		fun WifiNetworkSuggestion.Builder.applySecurity(
+			data: SimpleDataAccessor
+		): WifiNetworkSuggestion.Builder? {
+			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 }
+						})
+					}
+				}
+			} catch (e: IllegalArgumentException) {
+				// Don't accept passphrases that aren't ASCII encodeable.
+				return null
+			}
+			return this
+		}
+
+		return this.applyCommon(data).applySecurity(data)
+	}
+
+	// WifiConfiguration is deprecated in Android Q.
+	@Suppress("DEPRECATION")
 	private fun WifiConfiguration.apply(
 		data: SimpleDataAccessor
 	): WifiConfiguration? {
+		val ssidWithQuotes = data.ssid.quote
+		val passwordWithQuotes = data.password?.quoteUnlessHex
+
 		fun WifiConfiguration.applyCommon(
 			data: SimpleDataAccessor
-		): WifiConfiguration? {
+		): WifiConfiguration {
 			allowedAuthAlgorithms.clear()
 			allowedGroupCiphers.clear()
 			allowedKeyManagement.clear()
 			allowedPairwiseCiphers.clear()
 			allowedProtocols.clear()

-			SSID = data.ssid
+			SSID = ssidWithQuotes
 			hiddenSSID = data.hidden
 			return this
 		}
@@ -151,7 +243,7 @@ object WifiConfigurationFactory {
 			when (data.securityType) {
 				"", "nopass" -> allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE)
 				"WEP" -> @Suppress("DEPRECATION") /* WEP as insecure */ {
-					data.password?.also {
+					passwordWithQuotes?.let {
 						wepKeys[0] = it
 					} ?: return null
 					wepTxKeyIndex = 0
@@ -163,7 +255,7 @@ object WifiConfigurationFactory {
 					allowedGroupCiphers.set(WifiConfiguration.GroupCipher.WEP104)
 				}
 				"WPA" -> {
-					data.password?.also {
+					passwordWithQuotes?.let {
 						preSharedKey = it
 					} ?: return null
 					allowedAuthAlgorithms.set(WifiConfiguration.AuthAlgorithm.OPEN)
@@ -179,13 +271,13 @@ object WifiConfigurationFactory {
 					allowedGroupCiphers.set(WifiConfiguration.GroupCipher.CCMP)
 				}
 				"WPA2-EAP" -> requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) {
-					data.password?.also {
+					passwordWithQuotes?.let {
 						preSharedKey = it
 					} ?: return null
 					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)
@@ -202,10 +294,80 @@ object WifiConfigurationFactory {
 			}
 			return this
 		}
-		return this.applyCommon(data)?.applySecurity(data)
+
+		return this.applyCommon(data).applySecurity(data)
 	}

 	private inline fun <T> requireSdk(version: Int, block: () -> T): T? {
 		return if (Build.VERSION.SDK_INT >= version) return block() else null
 	}
 }
+
+// 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 ->
+		escaped.groupValues[1]
+	}
+
+private val String.quote: String
+	get() = if (startsWith("\"") && endsWith("\"")) this else "\"$this\""
+
+private val String.quoteUnlessHex: String
+	get() = if (isHex()) this else this.quote
+
+// Unfortunately, we can never know whether a string consisting only
+// of 0-f is a hex string. So we just make this one assumption that
+// a string of 0-f that is exactly 64 characters long, is _probably_
+// a hex string for raw PSK. Of course, this may fail for any string
+// that just happens to be 64 characters long and contains just 0-f.
+private val hexRegex = """^[0-9a-f]+$""".toRegex(
+	RegexOption.IGNORE_CASE
+)
+
+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.
+	@Suppress("DEPRECATION")
+	return isWifiEnabled || setWifiEnabled(true)
+}
+
+// WifiConfiguration is deprecated in Android Q.
+@Suppress("DEPRECATION")
+private fun WifiManager.removeOldNetwork(
+	wifiConfig: WifiConfiguration
+): Boolean {
+	try {
+		configuredNetworks?.firstOrNull {
+			it.SSID == wifiConfig.SSID &&
+					it.allowedKeyManagement == wifiConfig.allowedKeyManagement
+		}?.networkId?.also {
+			removeNetwork(it)
+		}
+	} catch (e: SecurityException) {
+		// 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.
+@Suppress("DEPRECATION")
+private fun WifiManager.enableNewNetwork(
+	wifiConfig: WifiConfiguration
+): Boolean {
+	val id = addNetwork(wifiConfig)
+	if (id == -1) {
+		return false
+	}
+	disconnect()
+	return if (enableNetwork(id, true)) {
+		reconnect()
+		true
+	} else {
+		false
+	}
+}
@@ -1,46 +1,90 @@
 package de.markusfisch.android.binaryeye.activity

 import android.app.Activity
+import android.app.AlertDialog
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
+import android.graphics.Matrix
+import android.graphics.Rect
+import android.graphics.RectF
 import android.hardware.Camera
+import android.media.AudioManager
+import android.media.ToneGenerator
 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 android.widget.Toast
 import com.google.zxing.Result
 import com.google.zxing.ResultMetadataType
 import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.app.db
-import de.markusfisch.android.binaryeye.app.hasCameraPermission
-import de.markusfisch.android.binaryeye.app.initSystemBars
-import de.markusfisch.android.binaryeye.app.prefs
+import de.markusfisch.android.binaryeye.adapter.prettifyFormatName
+import de.markusfisch.android.binaryeye.app.*
+import de.markusfisch.android.binaryeye.content.copyToClipboard
+import de.markusfisch.android.binaryeye.content.execShareIntent
+import de.markusfisch.android.binaryeye.content.openUrl
+import de.markusfisch.android.binaryeye.database.toScan
+import de.markusfisch.android.binaryeye.graphics.getFrameToViewMatrix
+import de.markusfisch.android.binaryeye.graphics.map
+import de.markusfisch.android.binaryeye.net.sendAsync
+import de.markusfisch.android.binaryeye.os.error
+import de.markusfisch.android.binaryeye.os.getVibrator
+import de.markusfisch.android.binaryeye.os.vibrate
 import de.markusfisch.android.binaryeye.rs.Preprocessor
+import de.markusfisch.android.binaryeye.view.initSystemBars
+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 kotlin.math.max
+import kotlin.math.min
+import kotlin.math.roundToInt

 class CameraActivity : AppCompatActivity() {
-	private val zxing = Zxing()
+	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 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 finishAfterShowingResult = false
 	private var frontFacing = false
+	private var bulkMode = prefs.bulkMode
+	private var restrictFormat: String? = null
+	private var ignoreNext: String? = null
 	private var fallbackBuffer: IntArray? = null

 	override fun onRequestPermissionsResult(
@@ -49,14 +93,10 @@ class CameraActivity : AppCompatActivity() {
 		grantResults: IntArray
 	) {
 		when (requestCode) {
-			REQUEST_CAMERA -> if (grantResults.isNotEmpty() &&
+			PERMISSION_CAMERA -> if (grantResults.isNotEmpty() &&
 				grantResults[0] != PackageManager.PERMISSION_GRANTED
 			) {
-				Toast.makeText(
-					this,
-					R.string.no_camera_no_fun,
-					Toast.LENGTH_SHORT
-				).show()
+				toast(R.string.no_camera_no_fun)
 				finish()
 			}
 		}
@@ -79,23 +119,33 @@ 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 = getVibrator()
+
 		initSystemBars(this)
 		setSupportActionBar(findViewById(R.id.toolbar) as Toolbar)

-		vibrator = getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
-
 		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"
@@ -106,23 +156,64 @@ class CameraActivity : AppCompatActivity() {

 	override fun onDestroy() {
 		super.onDestroy()
-		preprocessor?.destroy()
+		resetPreProcessor()
 		fallbackBuffer = null
 		saveZoom()
+		detectorView.saveCropHandlePos()
+		rs.destroy()
 	}

 	override fun onResume() {
 		super.onResume()
 		System.gc()
-		returnResult = "com.google.zxing.client.android.SCAN" == intent.action
-		if (hasCameraPermission(this, REQUEST_CAMERA)) {
+		updateHints()
+		if (prefs.bulkMode && bulkMode != prefs.bulkMode) {
+			bulkMode = prefs.bulkMode
+			invalidateOptionsMenu()
+			ignoreNext = null
+		}
+		setReturnTarget(intent)
+		if (hasCameraPermission()) {
 			openCamera()
 		}
 	}

+	private fun updateHints() {
+		val restriction = restrictFormat
+		val formats = if (restriction != null) {
+			title = getString(
+				R.string.scan_format,
+				prettifyFormatName(restriction)
+			)
+			setOf(restriction)
+		} else {
+			setTitle(R.string.scan_code)
+			prefs.barcodeFormats
+		}
+		zxing.updateHints(prefs.tryHarder, formats)
+	}
+
+	private fun setReturnTarget(intent: Intent?) {
+		when {
+			intent?.action == "com.google.zxing.client.android.SCAN" -> {
+				returnResult = true
+			}
+			intent?.dataString?.isReturnUrl() == true -> {
+				finishAfterShowingResult = true
+				returnUrlTemplate = intent.data?.getQueryParameter("ret")
+			}
+		}
+	}
+
+	private fun resetPreProcessor() {
+		preprocessor?.destroy()
+		preprocessor = null
+	}
+
 	private fun openCamera() {
 		cameraView.openAsync(
 			CameraView.findCameraId(
+				@Suppress("DEPRECATION")
 				if (frontFacing) {
 					Camera.CameraInfo.CAMERA_FACING_FRONT
 				} else {
@@ -145,23 +236,39 @@ 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)
+		restrictFormat = savedState.getString(RESTRICT_FORMAT)
 	}

 	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)
+		outState.putString(RESTRICT_FORMAT, restrictFormat)
 		super.onSaveInstanceState(outState)
 	}

+	override fun dispatchTouchEvent(ev: MotionEvent): Boolean {
+		// Always give crop handle precedence over other controls
+		// because it can easily overlap and would then be inaccessible.
+		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 -> {
@@ -169,11 +276,11 @@ class CameraActivity : AppCompatActivity() {
 				true
 			}
 			R.id.pick_file -> {
-				val chooseFile = Intent(Intent.ACTION_GET_CONTENT)
-				chooseFile.type = "image/*"
 				startActivityForResult(
 					Intent.createChooser(
-						chooseFile,
+						Intent(Intent.ACTION_GET_CONTENT).apply {
+							type = "image/*"
+						},
 						getString(R.string.pick_file)
 					),
 					PICK_FILE_RESULT_CODE
@@ -184,6 +291,16 @@ class CameraActivity : AppCompatActivity() {
 				switchCamera()
 				true
 			}
+			R.id.bulk_mode -> {
+				bulkMode = bulkMode xor true
+				item.isChecked = bulkMode
+				ignoreNext = null
+				true
+			}
+			R.id.restrict_format -> {
+				showRestrictionDialog()
+				true
+			}
 			R.id.preferences -> {
 				startActivity(MainActivity.getPreferencesIntent(this))
 				true
@@ -196,20 +313,43 @@ class CameraActivity : AppCompatActivity() {
 		}
 	}

+	private fun createBarcode() {
+		startActivity(MainActivity.getEncodeIntent(this))
+	}
+
 	private fun switchCamera() {
 		closeCamera()
 		frontFacing = frontFacing xor true
 		openCamera()
 	}

+	private fun showRestrictionDialog() {
+		val names = resources.getStringArray(
+			R.array.barcode_formats_names
+		).toMutableList()
+		val formats = resources.getStringArray(
+			R.array.barcode_formats_values
+		).toMutableList()
+		if (restrictFormat != null) {
+			names.add(0, getString(R.string.remove_restriction))
+			formats.add(0, null)
+		}
+		AlertDialog.Builder(this).apply {
+			setTitle(R.string.restrict_format)
+			setItems(names.toTypedArray()) { _, which ->
+				restrictFormat = formats[which]
+				updateHints()
+			}
+			show()
+		}
+	}
+
 	private fun openReadme() {
-		startActivity(
-			Intent(
-				Intent.ACTION_VIEW, Uri.parse(
-					"https://github.com/markusfisch/BinaryEye/blob/master/README.md"
-				)
-			)
+		val intent = Intent(
+			Intent.ACTION_VIEW,
+			Uri.parse(getString(R.string.project_url))
 		)
+		execShareIntent(intent)
 	}

 	private fun handleSendText(intent: Intent) {
@@ -222,12 +362,55 @@ 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(
 				parameters: Camera.Parameters
 			) {
-				if (parameters.isZoomSupported) {
+				zoomBar.visibility = if (parameters.isZoomSupported) {
 					val max = parameters.maxZoom
 					if (zoomBar.max != max) {
 						zoomBar.max = max
@@ -235,8 +418,9 @@ class CameraActivity : AppCompatActivity() {
 						saveZoom()
 					}
 					parameters.zoom = zoomBar.progress
+					View.VISIBLE
 				} else {
-					zoomBar.visibility = View.GONE
+					View.GONE
 				}
 				val sceneModes = parameters.supportedSceneModes
 				sceneModes?.let {
@@ -252,33 +436,32 @@ class CameraActivity : AppCompatActivity() {
 			}

 			override fun onCameraError() {
-				Toast.makeText(
-					this@CameraActivity,
-					R.string.camera_error,
-					Toast.LENGTH_SHORT
-				).show()
+				this@CameraActivity.toast(R.string.camera_error)
 				finish()
 			}

 			override fun onCameraReady(camera: Camera) {
+				// Reset preprocessor to make sure it always fits the current
+				// frame orientation. Important for landscape to landscape
+				// orientation changes.
+				resetPreProcessor()
 				val frameWidth = cameraView.frameWidth
 				val frameHeight = cameraView.frameHeight
 				val frameOrientation = cameraView.frameOrientation
-				var decoding = true
+				ignoreNext = null
+				decoding = true
 				camera.setPreviewCallback { frameData, _ ->
 					if (decoding) {
-						val result = decodeFrame(
+						decodeFrame(
 							frameData,
 							frameWidth,
 							frameHeight,
 							frameOrientation
-						)
-						result?.let {
-							cameraView.post {
-								vibrator.vibrate(100)
-								showResult(this@CameraActivity, result)
+						)?.let { result ->
+							if (result.text != ignoreNext) {
+								postResult(result)
+								decoding = false
 							}
-							decoding = false
 						}
 					}
 				}
@@ -301,25 +484,24 @@ class CameraActivity : AppCompatActivity() {
 				progress: Int,
 				fromUser: Boolean
 			) {
-				setZoom(progress)
+				cameraView.camera?.setZoom(progress)
 			}

 			override fun onStartTrackingTouch(seekBar: SeekBar) {}

 			override fun onStopTrackingTouch(seekBar: SeekBar) {}
 		})
+		restoreZoom()
 	}

-	private fun setZoom(zoom: Int) {
-		val camera: Camera? = cameraView.camera
-		camera?.let {
-			try {
-				val params = camera.parameters
-				params.zoom = zoom
-				camera.parameters = params
-			} catch (e: RuntimeException) {
-				// ignore; there's nothing we can do
-			}
+	@Suppress("DEPRECATION")
+	private fun Camera.setZoom(zoom: Int) {
+		try {
+			val params = parameters
+			params.zoom = zoom
+			parameters = params
+		} catch (e: RuntimeException) {
+			// Ignore. There's nothing we can do.
 		}
 	}

@@ -338,29 +520,43 @@ 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()
+		detectorView.restoreCropHandlePos()
+	}
+
+	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() }
 		}
 	}

+	@Suppress("DEPRECATION")
 	private fun toggleTorchMode() {
-		val camera = cameraView.camera
-		val parameters = camera?.parameters
-		parameters?.flashMode = if (flash) {
+		val camera = cameraView.camera ?: return
+		val parameters = camera.parameters ?: return
+		parameters.flashMode = if (
+			parameters.flashMode != Camera.Parameters.FLASH_MODE_OFF
+		) {
 			Camera.Parameters.FLASH_MODE_OFF
 		} else {
 			Camera.Parameters.FLASH_MODE_TORCH
 		}
-		parameters?.let {
-			try {
-				camera.parameters = parameters
-				flash = flash xor true
-			} catch (e: RuntimeException) {
-				// ignore; there's nothing we can do
-			}
+		try {
+			camera.parameters = parameters
+		} catch (e: RuntimeException) {
+			toast(e.message ?: getString(R.string.error_flash))
 		}
 	}

@@ -371,75 +567,260 @@ class CameraActivity : AppCompatActivity() {
 		frameOrientation: Int
 	): Result? {
 		frameData ?: return null
-		invert = invert xor true
-		val pp = preprocessor ?: Preprocessor(
-			this,
+		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()
+			null
+		}
+	}
+
+	private fun createPreprocessorAndMapping(
+		frameWidth: Int,
+		frameHeight: Int,
+		frameOrientation: Int
+	): Preprocessor {
+		val frameRoi = calculateFrameRect(
 			frameWidth,
 			frameHeight,
 			frameOrientation
 		)
-		pp.process(frameData)
-		preprocessor = pp
-		return zxing.decode(
-			frameData,
+		val pp = Preprocessor(
+			rs,
+			frameWidth,
+			frameHeight,
+			frameRoi
+		)
+		val viewRect = if (frameRoi != null) {
+			detectorView.roi
+		} else {
+			cameraView.previewRect
+		}
+		nativeMappingMatrix = getFrameToViewMatrix(
 			pp.outWidth,
 			pp.outHeight,
-			invert
+			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 this app was invoked via a deep link but without
+					// a return URI, we probably don't want to return to
+					// the camera screen after scanning, but to the caller.
+					if (finishAfterShowingResult) {
+						finish()
+					}
+				}
+			}
+			if (bulkMode) {
+				ignoreNext = result.text
+				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"
+		private const val RESTRICT_FORMAT = "restrict_format"
 	}
 }

 fun showResult(
 	activity: Activity,
 	result: Result,
-	isResult: Boolean = false
+	vibrator: Vibrator,
+	bulkMode: Boolean = false,
 ) {
-	val rawBytes = getRawBytes(result)
+	if (prefs.copyImmediately) {
+		activity.copyToClipboard(result.text)
+	}
+	val scan = result.toScan()
 	if (prefs.useHistory) {
-		GlobalScope.launch {
-			db.insertScan(
-				System.currentTimeMillis(),
-				result.text,
-				rawBytes,
-				result.barcodeFormat.toString()
+		scan.id = db.insertScan(scan)
+	}
+	if (prefs.sendScanActive && prefs.sendScanUrl.isNotEmpty()) {
+		if (prefs.sendScanType == "4") {
+			activity.openUrl(
+				prefs.sendScanUrl + scan.content.urlEncode()
 			)
+			return
+		}
+		scan.sendAsync(
+			prefs.sendScanUrl,
+			prefs.sendScanType
+		) { code, body ->
+			if (code == null || code < 200 || code > 299) {
+				vibrator.error()
+				if (!activity.isSilent()) {
+					beepBeepBeep()
+				}
+			}
+			if (body != null && body.isNotEmpty()) {
+				activity.toast(body)
+			} else if (code == null || code > 299) {
+				activity.toast(R.string.background_request_failed)
+			}
 		}
 	}
-	if (isResult) {
-		activity.setResult(Activity.RESULT_OK, getReturnIntent(result))
-		activity.finish()
-	} else {
+	if (!bulkMode) {
 		activity.startActivity(
-			MainActivity.getDecodeIntent(
-				activity,
-				result.text,
-				result.barcodeFormat,
-				rawBytes
-			)
+			MainActivity.getDecodeIntent(activity, scan)
 		)
 	}
 }

-fun getRawBytes(result: Result): ByteArray? {
-	val metadata = result.resultMetadata ?: return null
-	val segments = metadata[ResultMetadataType.BYTE_SEGMENTS] ?: return null
-	var bytes = ByteArray(0)
-	@Suppress("UNCHECKED_CAST")
-	for (seg in segments as Iterable<ByteArray>) {
-		bytes += seg
-	}
-	// byte segments can never be shorter than the text.
-	// Zxing cuts off content prefixes like "WIFI:"
-	return if (bytes.size >= result.text.length) bytes else null
-}
-
 fun getReturnIntent(result: Result): Intent {
 	val intent = Intent()
 	intent.putExtra("SCAN_RESULT", result.text)
@@ -450,34 +831,29 @@ fun getReturnIntent(result: Result): Intent {
 	if (result.rawBytes?.isNotEmpty() == true) {
 		intent.putExtra("SCAN_RESULT_BYTES", result.rawBytes)
 	}
-	val metadata = result.resultMetadata
-	metadata?.let {
-		val orientation = metadata[ResultMetadataType.UPC_EAN_EXTENSION]
-		orientation?.let {
+	result.resultMetadata?.let { metadata ->
+		metadata[ResultMetadataType.ORIENTATION]?.let {
 			intent.putExtra(
 				"SCAN_RESULT_ORIENTATION",
-				orientation.toString()
+				it.toString()
 			)
 		}
-		val ecLevel = metadata[ResultMetadataType.ERROR_CORRECTION_LEVEL]
-		ecLevel?.let {
+		metadata[ResultMetadataType.ERROR_CORRECTION_LEVEL]?.let {
 			intent.putExtra(
 				"SCAN_RESULT_ERROR_CORRECTION_LEVEL",
-				ecLevel.toString()
+				it.toString()
 			)
 		}
-		val upcEanExtension = metadata[ResultMetadataType.UPC_EAN_EXTENSION]
-		upcEanExtension?.let {
+		metadata[ResultMetadataType.UPC_EAN_EXTENSION]?.let {
 			intent.putExtra(
 				"SCAN_RESULT_UPC_EAN_EXTENSION",
-				upcEanExtension.toString()
+				it.toString()
 			)
 		}
-		val segments = metadata[ResultMetadataType.BYTE_SEGMENTS]
-		segments?.let {
+		metadata[ResultMetadataType.BYTE_SEGMENTS]?.let {
 			var i = 0
 			@Suppress("UNCHECKED_CAST")
-			for (seg in segments as Iterable<ByteArray>) {
+			for (seg in it as Iterable<ByteArray>) {
 				intent.putExtra("SCAN_RESULT_BYTE_SEGMENTS_$i", seg)
 				++i
 			}
@@ -485,3 +861,43 @@ fun getReturnIntent(result: Result): Intent {
 	}
 	return intent
 }
+
+private fun String.isReturnUrl() = listOf(
+	"binaryeye://scan",
+	"http://markusfisch.de/BinaryEye",
+	"https://markusfisch.de/BinaryEye"
+).firstOrNull { startsWith(it) } != null
+
+private fun completeUrl(urlTemplate: String, result: Result) = Uri.parse(
+	urlTemplate
+		.replace("{RESULT}", result.text.urlEncode())
+		.replace("{RESULT_BYTES}", result.rawBytes?.toHexString() ?: "")
+		.replace(
+			"{FORMAT}", result.barcodeFormat.toString().urlEncode()
+		)
+		.replace(
+			"{META}", result.resultMetadata?.toString()?.urlEncode() ?: ""
+		)
+		// And support {CODE} from the old ZXing app, too.
+		.replace("{CODE}", result.text.urlEncode())
+)
+
+private fun Context.isSilent(): Boolean {
+	val am = getSystemService(Context.AUDIO_SERVICE) as AudioManager
+	return when (am.ringerMode) {
+		AudioManager.RINGER_MODE_SILENT,
+		AudioManager.RINGER_MODE_VIBRATE -> true
+		else -> false
+	}
+}
+
+private fun beepBeepBeep() {
+	ToneGenerator(AudioManager.STREAM_ALARM, 100).startTone(
+		ToneGenerator.TONE_CDMA_CONFIRM,
+		1000
+	)
+}
+
+private fun isPortrait(
+	orientation: Int
+) = orientation == 90 || orientation == 270
@@ -2,21 +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 com.google.zxing.BarcodeFormat
 import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.app.initSystemBars
-import de.markusfisch.android.binaryeye.app.setFragment
-import de.markusfisch.android.binaryeye.app.setSystemAndToolBarTransparency
+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.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) {
@@ -27,40 +45,27 @@ 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)

-		setSupportActionBar(findViewById(R.id.toolbar) as Toolbar)
+		initSystemBars(this)
+		val toolbar = findViewById(R.id.toolbar) as Toolbar
+		recordToolbarHeight(toolbar)
+		setSupportActionBar(toolbar)
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)

-		supportFragmentManager.addOnBackStackChangedListener({
-			setSystemAndToolBarTransparency(this@MainActivity)
-		})
+		supportFragmentManager.addOnBackStackChangedListener {
+			colorSystemAndToolBars(this@MainActivity)
+		}

 		if (state == null) {
-			setFragment(
-				supportFragmentManager, when {
-					intent?.hasExtra(PREFERENCES) == true ->
-						PreferencesFragment()
-					intent?.hasExtra(HISTORY) == true ->
-						HistoryFragment()
-					intent?.hasExtra(ENCODE) == true ->
-						EncodeFragment.newInstance(
-							intent.getStringExtra(ENCODE)
-						)
-					intent?.hasExtra(DECODED_TEXT) == true ->
-						DecodeFragment.newInstance(
-							intent.getStringExtra(DECODED_TEXT),
-							intent.getSerializableExtra(
-								DECODED_FORMAT
-							) as BarcodeFormat,
-							intent.getByteArrayExtra(DECODED_RAW)
-						)
-					else -> DecodeFragment()
-				}
-			)
+			supportFragmentManager?.setFragment(getFragmentForIntent(intent))
 		}
 	}

@@ -68,9 +73,22 @@ class MainActivity : AppCompatActivity() {
 		private const val PREFERENCES = "preferences"
 		private const val HISTORY = "history"
 		private const val ENCODE = "encode"
-		private const val DECODED_TEXT = "decoded_text"
-		private const val DECODED_FORMAT = "decoded_format"
-		private const val DECODED_RAW = "decoded_raw"
+		const val DECODED = "decoded"
+
+		private fun getFragmentForIntent(intent: Intent?): Fragment {
+			intent ?: return PreferencesFragment()
+			return when {
+				intent.hasExtra(PREFERENCES) -> PreferencesFragment()
+				intent.hasExtra(HISTORY) -> HistoryFragment()
+				intent.hasExtra(ENCODE) -> EncodeFragment.newInstance(
+					intent.getStringExtra(ENCODE)!!
+				)
+				intent.hasExtra(DECODED) -> DecodeFragment.newInstance(
+					intent.getParcelableExtra(DECODED)!!
+				)
+				else -> PreferencesFragment()
+			}
+		}

 		fun getPreferencesIntent(context: Context): Intent {
 			val intent = Intent(context, MainActivity::class.java)
@@ -105,18 +123,9 @@ class MainActivity : AppCompatActivity() {
 			return intent
 		}

-		fun getDecodeIntent(
-			context: Context,
-			text: String,
-			format: BarcodeFormat,
-			raw: ByteArray? = null
-		): Intent {
+		fun getDecodeIntent(context: Context, scan: Scan): Intent {
 			val intent = Intent(context, MainActivity::class.java)
-			intent.putExtra(DECODED_TEXT, text)
-			intent.putExtra(DECODED_FORMAT, format)
-			if (raw != null) {
-				intent.putExtra(DECODED_RAW, raw)
-			}
+			intent.putExtra(DECODED, scan)
 			return intent
 		}
 	}
@@ -0,0 +1,217 @@
+package de.markusfisch.android.binaryeye.activity
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.Bitmap
+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.applyLocale
+import de.markusfisch.android.binaryeye.app.prefs
+import de.markusfisch.android.binaryeye.graphics.crop
+import de.markusfisch.android.binaryeye.graphics.loadImageUri
+import de.markusfisch.android.binaryeye.graphics.mapResultToView
+import de.markusfisch.android.binaryeye.os.getVibrator
+import de.markusfisch.android.binaryeye.os.vibrate
+import de.markusfisch.android.binaryeye.rs.fixTransparency
+import de.markusfisch.android.binaryeye.view.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.*
+
+class PickActivity : AppCompatActivity() {
+	private val zxing = Zxing()
+	private val parentJob = Job()
+	private val scope = CoroutineScope(Dispatchers.IO + parentJob)
+
+	private lateinit var rs: RenderScript
+	private lateinit var vibrator: Vibrator
+	private lateinit var cropImageView: CropImageView
+	private lateinit var detectorView: DetectorView
+
+	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)
+
+		// 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 = getVibrator()
+
+		initSystemBars(this)
+		val toolbar = findViewById(R.id.toolbar) as Toolbar
+		recordToolbarHeight(toolbar)
+		setSupportActionBar(toolbar)
+
+		supportFragmentManager.addOnBackStackChangedListener {
+			colorSystemAndToolBars(this@PickActivity)
+		}
+
+		val bitmap = fixTransparency(rs, getBitmapFromIntent())
+		if (bitmap == null) {
+			applicationContext.toast(R.string.error_no_content)
+			finish()
+			return
+		}
+
+		cropImageView = findViewById(R.id.image) as CropImageView
+		cropImageView.restrictTranslation = false
+		cropImageView.setImageBitmap(bitmap)
+		cropImageView.onScan = {
+			scanWithinBounds(bitmap)
+		}
+
+		detectorView = findViewById(R.id.detector_view) as DetectorView
+		detectorView.onRoiChanged = {
+			scanWithinBounds(bitmap)
+		}
+		detectorView.setPaddingFromWindowInsets()
+		detectorView.restoreCropHandlePos()
+
+		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 = Rect(detectorView.roi)
+		val rectInView = if (roi.width() < 1) {
+			cropImageView.getBoundsRect()
+		} else {
+			roi
+		}
+		val imageRect = cropImageView.mappedRect
+		val rectInImage = normalizeRoi(imageRect, rectInView)
+		val cropped = bitmap.crop(
+			rectInImage,
+			cropImageView.imageRotation
+		) ?: return
+		scope.launch {
+			result = zxing.decodePositiveNegative(cropped)
+			result?.let {
+				withContext(Dispatchers.Main) {
+					if (isFinishing) {
+						return@withContext
+					}
+					vibrator.vibrate()
+					val rc = Rect()
+					imageRect.round(rc)
+					if (!rectInView.intersect(rc)) {
+						return@withContext
+					}
+					detectorView.update(
+						mapResultToView(
+							cropped.width,
+							cropped.height,
+							0,
+							rectInView,
+							it.resultPoints,
+							detectorView.coordinates
+						)
+					)
+				}
+			}
+		}
+	}
+
+	override fun onDestroy() {
+		super.onDestroy()
+		detectorView.saveCropHandlePos()
+		rs.destroy()
+		parentJob.cancel()
+	}
+
+	override fun onCreateOptionsMenu(menu: Menu): Boolean {
+		menuInflater.inflate(R.menu.activity_pick, menu)
+		return true
+	}
+
+	override fun onOptionsItemSelected(item: MenuItem): Boolean {
+		return when (item.itemId) {
+			R.id.rotate -> {
+				rotateClockwise()
+				true
+			}
+			else -> super.onOptionsItemSelected(item)
+		}
+	}
+
+	private fun rotateClockwise() {
+		cropImageView.imageRotation = cropImageView.imageRotation + 90 % 360
+	}
+
+	private fun loadSentImage(intent: Intent): Bitmap? {
+		val uri = intent.getParcelableExtra<Parcelable>(
+			Intent.EXTRA_STREAM
+		) as? Uri ?: return null
+		return contentResolver.loadImageUri(uri)
+	}
+
+	private fun loadImageToOpen(intent: Intent): Bitmap? {
+		val uri = intent.data ?: return null
+		return contentResolver.loadImageUri(uri)
+	}
+
+	private fun showResult() {
+		val r = result
+		if (r != null) {
+			showResult(this, r, vibrator)
+			finish()
+		} else {
+			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
+	)
+}
@@ -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.

+		intent?.setRestartCount()
 		startActivity(Intent(applicationContext, CameraActivity::class.java))
 		finish()
 	}
@@ -8,48 +8,91 @@ 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) {
+	var selectedScanId = 0L
+	var selectedScanPosition = -1
+
+	private val idIndex = cursor.getColumnIndex(Database.SCANS_ID)
 	private val timeIndex = cursor.getColumnIndex(Database.SCANS_DATETIME)
+	private val nameIndex = cursor.getColumnIndex(Database.SCANS_NAME)
 	private val contentIndex = cursor.getColumnIndex(Database.SCANS_CONTENT)
 	private val formatIndex = cursor.getColumnIndex(Database.SCANS_FORMAT)

+	fun select(id: Long, position: Int) {
+		selectedScanId = id
+		selectedScanPosition = position
+	}
+
+	fun clearSelection() {
+		selectedScanId = 0L
+		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
-	): View {
-		return LayoutInflater.from(parent.context).inflate(
-			R.layout.row_scan, parent, false
-		)
-	}
+	): View? = LayoutInflater.from(parent.context).inflate(
+		R.layout.row_scan, parent, false
+	)

 	override fun bindView(
 		view: View,
 		context: Context,
 		cursor: Cursor
 	) {
-		val holder = getViewHolder(view)
-		val content = cursor.getString(contentIndex)
-		holder.timeView.text = cursor.getString(timeIndex)
-		holder.contentView.text = if (content.isEmpty()) {
-			context.getString(R.string.binary_data)
-		} else {
-			content
+		getViewHolder(view).apply {
+			timeView.text = formatDateTime(cursor.getString(timeIndex))
+			val name = cursor.getString(nameIndex)
+			val content = cursor.getString(contentIndex)
+			var icon = 0
+			contentView.text = when {
+				name?.isNotEmpty() == true -> {
+					icon = R.drawable.ic_label
+					name
+				}
+				content?.isEmpty() == true -> context.getString(
+					R.string.binary_data
+				)
+				else -> content
+			}
+			contentView.setCompoundDrawablesWithIntrinsicBounds(
+				icon, 0, 0, 0
+			)
+			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
 		}
-		holder.formatView.text = cursor.getString(formatIndex)
 	}

-	private fun getViewHolder(view: View): ViewHolder {
-		return view.tag as ViewHolder? ?: ViewHolder(
-			view.findViewById(R.id.time),
-			view.findViewById(R.id.content),
-			view.findViewById(R.id.format)
-		).also {
-			view.tag = it
-		}
+	private fun getViewHolder(
+		view: View
+	): ViewHolder = view.tag as ViewHolder? ?: ViewHolder(
+		view.findViewById(R.id.time),
+		view.findViewById(R.id.content),
+		view.findViewById(R.id.format)
+	).also {
+		view.tag = it
 	}

 	private data class ViewHolder(
@@ -58,3 +101,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
+}
@@ -0,0 +1,23 @@
+package de.markusfisch.android.binaryeye.app
+
+import android.content.Context
+import android.app.AlertDialog
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+suspend inline fun <T : Any> alertDialog(
+	context: Context,
+	crossinline build: AlertDialog.Builder.(resume: (T?) -> Unit) -> Unit
+): T? = withContext(Dispatchers.Main) {
+	suspendCoroutine { continuation ->
+		AlertDialog.Builder(context).apply {
+			setOnCancelListener {
+				continuation.resume(null)
+			}
+			build(continuation::resume)
+			show()
+		}
+	}
+}
@@ -1,22 +1,21 @@
 package de.markusfisch.android.binaryeye.app

-import android.app.Application
+import android.support.multidex.MultiDexApplication;
 import android.support.v8.renderscript.RenderScript
+import de.markusfisch.android.binaryeye.database.Database
 import de.markusfisch.android.binaryeye.preference.Preferences
-import de.markusfisch.android.binaryeye.repository.DatabaseRepository

-val db = DatabaseRepository()
+val db = Database()
 val prefs = Preferences()

-class BinaryEyeApp : Application() {
+class BinaryEyeApp : MultiDexApplication() {
 	override fun onCreate() {
 		super.onCreate()
-
-		// 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()
+		}
 	}
 }
@@ -1,62 +0,0 @@
-package de.markusfisch.android.binaryeye.app
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
-import android.support.v7.app.AlertDialog
-import android.view.View
-import de.markusfisch.android.binaryeye.R
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
-
-fun setFragment(fm: FragmentManager?, fragment: Fragment) {
-	fm?.let { getTransaction(fm, fragment).commit() }
-}
-
-fun addFragment(fm: FragmentManager?, fragment: Fragment) {
-	fm?.let { getTransaction(fm, fragment).addToBackStack(null).commit() }
-}
-
-@SuppressLint("CommitTransaction")
-private fun getTransaction(
-	fm: FragmentManager,
-	fragment: Fragment
-) = fm.beginTransaction().replace(R.id.content_frame, fragment)
-
-suspend inline fun View.useVisibility(
-	whileExecuting: Int = View.VISIBLE,
-	otherwise: Int = View.GONE,
-	crossinline block: suspend () -> Unit
-) {
-	if (visibility == whileExecuting) {
-		return
-	}
-	withContext(Dispatchers.Main) {
-		visibility = whileExecuting
-	}
-	try {
-		block()
-	} finally {
-		withContext(Dispatchers.Main) {
-			visibility = otherwise
-		}
-	}
-}
-
-suspend inline fun <T : Any> alertDialog(
-	context: Context,
-	crossinline build: AlertDialog.Builder.(resume: (T?) -> Unit) -> Unit
-): T? = withContext(Dispatchers.Main) {
-	suspendCoroutine<T?> { continuation ->
-		AlertDialog.Builder(context).apply {
-			setOnCancelListener {
-				continuation.resume(null)
-			}
-			build(continuation::resume)
-			show()
-		}
-	}
-}
@@ -2,11 +2,29 @@ package de.markusfisch.android.binaryeye.app

 import android.net.Uri
 import android.os.Build
+import java.io.UnsupportedEncodingException
+import java.net.URLEncoder

 private val nonPrintable = "[\\x00-\\x08\\x0e-\\x1f]".toRegex()
+fun String.hasNonPrintableCharacters() = nonPrintable.containsMatchIn(this)

-fun hasNonPrintableCharacters(s: String) = nonPrintable.containsMatchIn(s)
+private val nonAlNum = "[^a-zA-Z0-9]".toRegex()
+private val multipleDots = "[…]+".toRegex()
+fun String.foldNonAlNum() = replace(nonAlNum, "…")
+	.replace(multipleDots, "…")

-fun parseAndNormalizeUri(input: String): Uri = Uri.parse(input).let {
-	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) it.normalizeScheme() else it
+fun String.urlEncode(): String = try {
+	URLEncoder.encode(this, "UTF-8")
+} catch (e: UnsupportedEncodingException) {
+	this
 }
+
+fun String.parseAndNormalizeUri(): Uri = Uri.parse(this).let {
+	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+		it.normalizeScheme()
+	} else {
+		it
+	}
+}
+
+fun ByteArray.toHexString() = joinToString("") { "%02X".format(it) }
@@ -1,57 +0,0 @@
-package de.markusfisch.android.binaryeye.app
-
-import android.app.Activity
-import android.content.Context
-import android.os.Environment
-import android.support.annotation.MainThread
-import android.widget.EditText
-import de.markusfisch.android.binaryeye.R
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.collect
-import java.io.File
-import java.io.IOException
-
-fun addSuffixIfNotGiven(name: String, suffix: String): String {
-	val trimmed = name.trim()
-	return if (suffix.isNotEmpty() && !trimmed.endsWith(suffix)) {
-		"$trimmed$suffix"
-	} else {
-		trimmed
-	}
-}
-
-// Dialogs doesn't have any root layout, need to be inflated with null root
-@Suppress("InflateParams")
-@MainThread
-suspend fun Activity.askForFileName(suffix: String = ""): String? {
-	val view = layoutInflater.inflate(R.layout.dialog_save_file, null)
-	val editText = view.findViewById<EditText>(R.id.file_name)
-	return alertDialog<String>(this as Context) { resume ->
-		setView(view)
-		setPositiveButton(android.R.string.ok) { _, _ ->
-			resume(editText.text.toString())
-		}
-	}?.let { name ->
-		addSuffixIfNotGiven(name, suffix)
-	}
-}
-
-suspend fun Flow<ByteArray>.writeToFile(name: String): Int {
-	return try {
-		val file = File(
-			Environment.getExternalStoragePublicDirectory(
-				Environment.DIRECTORY_DOWNLOADS
-			),
-			name
-		)
-		if (file.exists()) {
-			return R.string.error_file_exists
-		}
-		collect { bytes ->
-			file.appendBytes(bytes)
-		}
-		R.string.saved_in_downloads
-	} catch (e: IOException) {
-		R.string.error_saving_binary_data
-	}
-}
@@ -1,23 +0,0 @@
-package de.markusfisch.android.binaryeye.app
-
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.emitAll
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.scanReduce
-
-fun Flow<ByteArray>.addDelimiter(delimiter: String) = addDelimiter(
-	delimiter.toByteArray(),
-	ByteArray::plus
-)
-
-inline fun <T, R> Flow<T>.addDelimiter(
-	delimiter: R,
-	crossinline append: R.(T) -> T
-): Flow<T> = scanReduce { _, content ->
-	delimiter.append(content)
-}
-
-infix fun <T> T.asFlowWith(other: Flow<T>) = flow<T> {
-	emit(this@asFlowWith)
-	emitAll(other)
-}
@@ -0,0 +1,19 @@
+package de.markusfisch.android.binaryeye.app
+
+import android.annotation.SuppressLint
+import android.support.v4.app.Fragment
+import android.support.v4.app.FragmentManager
+import de.markusfisch.android.binaryeye.R
+
+fun FragmentManager.setFragment(fragment: Fragment) {
+	getTransaction(fragment).commit()
+}
+
+fun FragmentManager.addFragment(fragment: Fragment) {
+	getTransaction(fragment).addToBackStack(null).commit()
+}
+
+@SuppressLint("CommitTransaction")
+private fun FragmentManager.getTransaction(
+	fragment: Fragment
+) = beginTransaction().replace(R.id.content_frame, fragment)
@@ -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)
+}
@@ -6,33 +6,46 @@ import android.content.pm.PackageManager
 import android.support.v4.app.ActivityCompat
 import android.support.v4.content.ContextCompat

-fun hasCameraPermission(activity: Activity, requestCode: Int): Boolean {
-	return hasPermission(activity, Manifest.permission.CAMERA, requestCode)
-}
+var permissionGrantedCallback: (() -> Any)? = null

-fun hasWritePermission(activity: Activity, requestCode: Int = 1): Boolean {
+const val PERMISSION_CAMERA = 1
+fun Activity.hasCameraPermission() = hasPermission(
+	Manifest.permission.CAMERA,
+	PERMISSION_CAMERA
+)
+
+const val PERMISSION_WRITE = 2
+fun Activity.hasWritePermission(callback: () -> Any): Boolean {
+	permissionGrantedCallback = callback
 	return hasPermission(
-		activity,
 		Manifest.permission.WRITE_EXTERNAL_STORAGE,
-		requestCode
+		PERMISSION_WRITE
 	)
 }

-fun hasPermission(
-	activity: Activity,
+const val PERMISSION_LOCATION = 3
+fun Activity.hasLocationPermission(callback: () -> Any): Boolean {
+	permissionGrantedCallback = callback
+	return hasPermission(
+		Manifest.permission.ACCESS_FINE_LOCATION,
+		PERMISSION_LOCATION
+	)
+}
+
+private fun Activity.hasPermission(
 	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(
+		this,
+		permission
+	) != PackageManager.PERMISSION_GRANTED
+) {
+	ActivityCompat.requestPermissions(
+		this,
+		arrayOf(permission),
+		requestCode
+	)
+	false
+} else {
+	true
 }
@@ -0,0 +1,24 @@
+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 Intent.setRestartCount() {
+	restartCount = getIntExtra(RESTART_COUNT, restartCount)
+}
+
+fun Activity.restartApp() {
+	if (restartCount < 3) {
+		startActivity(Intent(this, SplashActivity::class.java).apply {
+			addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+			putExtra(RESTART_COUNT, ++restartCount)
+		})
+		finish()
+	}
+	Runtime.getRuntime().exit(0)
+}
@@ -1,54 +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 android.widget.Toast
-import de.markusfisch.android.binaryeye.BuildConfig
-import de.markusfisch.android.binaryeye.R
-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 {
-		Toast.makeText(
-			context,
-			R.string.cannot_resolve_action,
-			Toast.LENGTH_SHORT
-		).show()
-	}
-}
-
-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
-		)
-	}
-}
@@ -1,83 +0,0 @@
-package de.markusfisch.android.binaryeye.app
-
-import android.content.Context
-import android.graphics.drawable.ColorDrawable
-import android.graphics.Rect
-import android.os.Build
-import android.support.v4.content.ContextCompat
-import android.support.v4.view.ViewCompat
-import android.support.v7.app.AppCompatActivity
-import android.view.View
-import android.widget.AbsListView
-import de.markusfisch.android.binaryeye.R
-
-val windowInsets = Rect()
-val systemBarScrollListener = 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
-		view.post {
-			val scrolled = firstVisibleItem > 0 ||
-					(totalItemCount > 0 && view.getChildAt(0).top < 0)
-			val scrollable = if (scrolled) true else totalItemCount > 0 &&
-					view.getChildAt(view.lastVisiblePosition).bottom > view.height
-			setSystemAndToolBarTransparency(view.context, scrolled, scrollable)
-		}
-	}
-
-	override fun onScrollStateChanged(
-		view: AbsListView,
-		scrollState: Int
-	) {
-	}
-}
-
-fun setSystemAndToolBarTransparency(
-	context: Context,
-	scrolled: Boolean = false,
-	scrollable: Boolean = false
-) {
-	val opaqueColor = ContextCompat.getColor(context, R.color.primary)
-	val transparentColor = 0x00000000
-	val topColor = if (scrolled) opaqueColor else transparentColor
-	val bottomColor = if (scrolled || scrollable) opaqueColor else transparentColor
-	val activity = context as AppCompatActivity
-	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-		val window = activity.window
-		window.statusBarColor = topColor
-		window.navigationBarColor = bottomColor
-	}
-	activity.supportActionBar?.setBackgroundDrawable(ColorDrawable(topColor))
-}
-
-fun initSystemBars(activity: AppCompatActivity) {
-	activity.findViewById(R.id.main_layout)?.also { view ->
-		setWindowInsetListener(view)
-	}
-	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-		activity.window.decorView.systemUiVisibility =
-			View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
-					View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
-					View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-	}
-	setSystemAndToolBarTransparency(activity)
-}
-
-private fun setWindowInsetListener(view: View) {
-	ViewCompat.setOnApplyWindowInsetsListener(view) { _, insets ->
-		if (insets.hasSystemWindowInsets()) {
-			val left = insets.systemWindowInsetLeft
-			val top = insets.systemWindowInsetTop
-			val right = insets.systemWindowInsetRight
-			val bottom = insets.systemWindowInsetBottom
-			view.setPadding(left, top, right, bottom)
-			windowInsets.set(left, top, right, bottom)
-		}
-		insets.consumeSystemWindowInsets()
-	}
-}
@@ -0,0 +1,17 @@
+package de.markusfisch.android.binaryeye.content
+
+import android.content.ClipData
+import android.content.Context
+import android.os.Build
+
+fun Context.copyToClipboard(text: String) {
+	val service = getSystemService(Context.CLIPBOARD_SERVICE)
+	if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
+		@Suppress("DEPRECATION")
+		(service as android.text.ClipboardManager).text = text
+	} else {
+		(service as android.content.ClipboardManager).setPrimaryClip(
+			ClipData.newPlainText("plain text", text)
+		)
+	}
+}
@@ -0,0 +1,76 @@
+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.app.parseAndNormalizeUri
+import de.markusfisch.android.binaryeye.widget.toast
+import java.io.File
+
+fun Context.execShareIntent(intent: Intent): Boolean = if (
+	!startIntent(intent)
+) {
+	toast(R.string.cannot_resolve_action)
+	false
+} else {
+	true
+}
+
+fun Context.startIntent(intent: Intent): Boolean = try {
+	// Avoid using `intent.resolveActivity()` at API level 30+ due
+	// to the new package visibility restrictions. In order for
+	// `resolveActivity()` to "see" another package, we would need
+	// to list that package/intent in a `<queries>` block in the
+	// Manifest. But since we used `resolveActivity()` only to avoid
+	// an exception if the Intent cannot be resolved, it's much easier
+	// and more robust to just try and catch that exception if
+	// necessary.
+	startActivity(intent)
+	true
+} catch (e: ActivityNotFoundException) {
+	false
+}
+
+fun Context.openUrl(url: String): Boolean = openUri(url.parseAndNormalizeUri())
+
+fun Context.openUri(uri: Uri): Boolean = execShareIntent(
+	Intent(Intent.ACTION_VIEW, uri)
+)
+
+fun Context.shareText(text: String, mimeType: String = "text/plain") {
+	execShareIntent(Intent(Intent.ACTION_SEND).apply {
+		putExtra(Intent.EXTRA_TEXT, text)
+		type = mimeType
+	})
+}
+
+fun Context.shareFile(file: File, mimeType: String) {
+	getUriForFile(file)?.let {
+		shareUri(it, mimeType)
+	}
+}
+
+private fun Context.getUriForFile(file: File): Uri? = if (
+	Build.VERSION.SDK_INT < Build.VERSION_CODES.N
+) {
+	Uri.fromFile(file)
+} else {
+	FileProvider.getUriForFile(
+		this,
+		BuildConfig.APPLICATION_ID + ".provider",
+		file
+	)
+}
+
+private fun Context.shareUri(uri: Uri, mimeType: String) {
+	execShareIntent(Intent(Intent.ACTION_SEND).apply {
+		putExtra(Intent.EXTRA_STREAM, uri)
+		addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+		type = mimeType
+	})
+}
@@ -1,122 +0,0 @@
-package de.markusfisch.android.binaryeye.data
-
-import android.content.ContentValues
-import android.content.Context
-import android.database.Cursor
-import android.database.sqlite.SQLiteDatabase
-import android.database.sqlite.SQLiteOpenHelper
-import android.text.format.DateFormat
-import de.markusfisch.android.binaryeye.app.hasNonPrintableCharacters
-
-class Database {
-	private lateinit var db: SQLiteDatabase
-
-	fun open(context: Context) {
-		db = OpenHelper(context).writableDatabase
-	}
-
-	fun getScans(): Cursor? = db.rawQuery(
-		"""SELECT
-			$SCANS_ID,
-			$SCANS_DATETIME,
-			$SCANS_CONTENT,
-			$SCANS_FORMAT
-			FROM $SCANS
-			ORDER BY $SCANS_DATETIME DESC
-		""", null
-	)
-
-	fun getScan(id: Long): Cursor? = db.rawQuery(
-		"""SELECT
-			$SCANS_DATETIME,
-			$SCANS_CONTENT,
-			$SCANS_RAW,
-			$SCANS_FORMAT
-			FROM $SCANS
-			WHERE $SCANS_ID = ?
-		""", arrayOf("$id")
-	)
-
-	fun hasBinaryData(): Cursor? = db.rawQuery(
-		"""SELECT
-			1
-			FROM $SCANS
-			WHERE $SCANS_RAW IS NOT NULL
-			LIMIT 1
-		""", null
-	)
-
-	fun insertScan(
-		timestamp: Long,
-		content: String,
-		raw: ByteArray?,
-		format: String
-	): Long {
-		val cv = ContentValues()
-		cv.put(
-			SCANS_DATETIME, DateFormat.format(
-				"yyyy-MM-dd HH:mm:ss",
-				timestamp
-			).toString()
-		)
-		if (hasNonPrintableCharacters(content) && raw != null) {
-			cv.put(SCANS_CONTENT, "")
-			cv.put(SCANS_RAW, raw)
-		} else {
-			cv.put(SCANS_CONTENT, content)
-		}
-		cv.put(SCANS_FORMAT, format)
-		return db.insert(SCANS, null, cv)
-	}
-
-	fun removeScan(id: Long) {
-		db.delete(SCANS, "$SCANS_ID = ?", arrayOf("$id"))
-	}
-
-	fun removeScans() {
-		db.delete(SCANS, null, null)
-	}
-
-	private class OpenHelper(context: Context) :
-		SQLiteOpenHelper(context, "history.db", null, 2) {
-		override fun onCreate(db: SQLiteDatabase) {
-			createScans(db)
-		}
-
-		override fun onUpgrade(
-			db: SQLiteDatabase,
-			oldVersion: Int,
-			newVersion: Int
-		) {
-			if (oldVersion < 2) {
-				addRawColumn(db)
-			}
-		}
-	}
-
-	companion object {
-		const val SCANS = "scans"
-		const val SCANS_ID = "_id"
-		const val SCANS_DATETIME = "_datetime"
-		const val SCANS_CONTENT = "content"
-		const val SCANS_RAW = "raw"
-		const val SCANS_FORMAT = "format"
-
-		private fun createScans(db: SQLiteDatabase) {
-			db.execSQL("DROP TABLE IF EXISTS $SCANS")
-			db.execSQL(
-				"""CREATE TABLE $SCANS (
-					$SCANS_ID INTEGER PRIMARY KEY AUTOINCREMENT,
-					$SCANS_DATETIME DATETIME NOT NULL,
-					$SCANS_CONTENT TEXT NOT NULL,
-					$SCANS_RAW BLOB,
-					$SCANS_FORMAT TEXT NOT NULL
-				)"""
-			)
-		}
-
-		private fun addRawColumn(db: SQLiteDatabase) {
-			db.execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_RAW BLOB")
-		}
-	}
-}
@@ -1,85 +0,0 @@
-package de.markusfisch.android.binaryeye.data.csv
-
-import de.markusfisch.android.binaryeye.app.addDelimiter
-import de.markusfisch.android.binaryeye.app.asFlowWith
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.asFlow
-import kotlinx.coroutines.flow.emitAll
-import kotlinx.coroutines.flow.flattenConcat
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.map
-
-fun <T> csvBuilder(config: CSVBuilder<T>.() -> Unit): CSVBuilder<T> {
-	return CSVBuilder<T>().apply(config)
-}
-
-class CSVBuilder<T> {
-	private val columns = mutableListOf<ColumnBuilder>()
-
-	fun column(config: ColumnBuilder.() -> Unit): ColumnBuilder {
-		return ColumnBuilder().apply(config).also {
-			columns.add(it)
-		}
-	}
-
-	inner class ColumnBuilder {
-		var isBinary = false
-		var name: String? = null
-		internal var gettingBy: ((T) -> ByteArray)? = null
-
-		fun gettingBy(getter: (T) -> ByteArray) {
-			gettingBy = getter
-		}
-
-		fun gettingByString(getter: (T) -> String): Unit = gettingBy {
-			getter(it).toByteArray()
-		}
-	}
-
-	fun buildWith(inputs: Flow<T>, delimiter: String): Flow<ByteArray> = flow {
-		val columnsFlow = columns.asFlow()
-
-		val header = columnsFlow.buildHeader(delimiter)
-
-		val contentLines = inputs.buildContent(columnsFlow, delimiter)
-
-		emitAll(header)
-		emit("\n".toByteArray())
-		emitAll(contentLines)
-	}
-
-	private fun Flow<ColumnBuilder>.buildHeader(delimiter: String) = map {
-		it.name?.escaped(delimiter)?.toByteArray()
-			?: throw IllegalStateException("You need to provide a name for csv column")
-	}.addDelimiter(delimiter)
-
-	private fun Flow<T>.buildContent(
-		columnsFlow: Flow<ColumnBuilder>,
-		delimiter: String
-	): Flow<ByteArray> = map { input ->
-		input.getLine(columnsFlow, delimiter)
-	}.addDelimiter("\n".toByteArray()) { other: Flow<ByteArray> ->
-		// this: ByteArray
-		this asFlowWith other
-	}.flattenConcat()
-
-	private fun T.getLine(columnsFlow: Flow<ColumnBuilder>, delimiter: String): Flow<ByteArray> =
-		columnsFlow.map { column ->
-			column.gettingBy?.run {
-				var result = invoke(this@getLine)
-				if (!column.isBinary) {
-					result = String(result).escaped(delimiter).toByteArray()
-				}
-				return@run result
-			} ?: throw IllegalStateException("You need to provide a getter for the value")
-		}.addDelimiter(delimiter)
-
-	private fun Any.escaped(delimiter: String): String {
-		val any = this.toString()
-		return when {
-			any.run { contains('"') || contains('\n') || contains(delimiter) } ->
-				"\"${any.replace("\"", "\"\"").replace(delimiter, "\"$delimiter")}\""
-			else -> any
-		}
-	}
-}
@@ -0,0 +1,93 @@
+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 java.io.ByteArrayOutputStream
+import java.io.OutputStream
+
+fun Context.exportCsv(
+	name: String,
+	cursor: Cursor,
+	delimiter: String
+) = writeExternalFile(name, "text/csv") { outputStream ->
+	exportCsv(outputStream, cursor, delimiter)
+}
+
+fun Cursor.exportCsv(delimiter: String): String {
+	val outputStream = ByteArrayOutputStream()
+	exportCsv(outputStream, this, delimiter)
+	return outputStream.toString()
+}
+
+private fun exportCsv(
+	outputStream: OutputStream,
+	cursor: Cursor,
+	delimiter: String
+) {
+	if (!cursor.moveToFirst()) {
+		return
+	}
+	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 {
+		cursor.getColumnIndex(it)
+	}
+	val contentIndex = cursor.getColumnIndex(Database.SCANS_CONTENT)
+	val rawIndex = cursor.getColumnIndex(Database.SCANS_RAW)
+	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)
+		)
+	} while (cursor.moveToNext())
+}
+
+private fun Cursor.toCsvRecord(
+	indices: List<Int>,
+	delimiter: String,
+	deviation: Pair<Int, String>?
+): ByteArray {
+	val sb = StringBuilder()
+	indices.forEach {
+		val value = if (deviation?.first == it) {
+			deviation.second
+		} else {
+			this.getString(it)
+		}
+		sb.append(value?.quoteAndEscape() ?: "")
+		sb.append(delimiter)
+	}
+	sb.append("\n")
+	return sb.toString().toByteArray()
+}
+
+private fun String.quoteAndEscape() = "\"${
+	this
+		.replace("\n", " ")
+		.replace("\"", "\"\"")
+}\""
@@ -0,0 +1,18 @@
+package de.markusfisch.android.binaryeye.database
+
+import android.database.Cursor
+
+fun Cursor.getString(name: String): String {
+	val idx = getColumnIndex(name)
+	return if (idx < 0) "" else getString(idx) ?: ""
+}
+
+fun Cursor.getBlob(name: String): ByteArray? {
+	val idx = getColumnIndex(name)
+	return if (idx < 0) null else getBlob(idx)
+}
+
+fun Cursor.getLong(name: String): Long {
+	val idx = getColumnIndex(name)
+	return if (idx < 0) 0L else getLong(idx)
+}
@@ -0,0 +1,274 @@
+package de.markusfisch.android.binaryeye.database
+
+import android.content.ContentValues
+import android.content.Context
+import android.database.Cursor
+import android.database.sqlite.SQLiteDatabase
+import android.database.sqlite.SQLiteOpenHelper
+import de.markusfisch.android.binaryeye.app.prefs
+
+class Database {
+	private lateinit var db: SQLiteDatabase
+
+	fun open(context: Context) {
+		db = OpenHelper(context).writableDatabase
+	}
+
+	fun getScans(query: String? = null): Cursor? = db.rawQuery(
+		"""SELECT
+			$SCANS_ID,
+			$SCANS_DATETIME,
+			$SCANS_NAME,
+			$SCANS_CONTENT,
+			$SCANS_FORMAT
+			FROM $SCANS
+			${getWhereClause(query)}
+			ORDER BY $SCANS_DATETIME DESC
+		""".trimMargin(), getWhereArguments(query)
+	)
+
+	fun getScansDetailed(query: String? = null): Cursor? = db.rawQuery(
+		"""SELECT
+			$SCANS_ID,
+			$SCANS_DATETIME,
+			$SCANS_NAME,
+			$SCANS_CONTENT,
+			$SCANS_RAW,
+			$SCANS_FORMAT,
+			$SCANS_ERROR_CORRECTION_LEVEL,
+			$SCANS_ISSUE_NUMBER,
+			$SCANS_ORIENTATION,
+			$SCANS_OTHER_META_DATA,
+			$SCANS_PDF417_EXTRA_METADATA,
+			$SCANS_POSSIBLE_COUNTRY,
+			$SCANS_SUGGESTED_PRICE,
+			$SCANS_UPC_EAN_EXTENSION
+			FROM $SCANS
+			${getWhereClause(query)}
+			ORDER BY $SCANS_DATETIME DESC
+		""".trimMargin(), getWhereArguments(query)
+	)
+
+	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) {
+		val instr = "%$query%"
+		arrayOf(instr, instr)
+	} else {
+		null
+	}
+
+	fun getScan(id: Long): Scan? = db.rawQuery(
+		"""SELECT
+			$SCANS_ID,
+			$SCANS_DATETIME,
+			$SCANS_NAME,
+			$SCANS_CONTENT,
+			$SCANS_RAW,
+			$SCANS_FORMAT,
+			$SCANS_ERROR_CORRECTION_LEVEL,
+			$SCANS_ISSUE_NUMBER,
+			$SCANS_ORIENTATION,
+			$SCANS_OTHER_META_DATA,
+			$SCANS_PDF417_EXTRA_METADATA,
+			$SCANS_POSSIBLE_COUNTRY,
+			$SCANS_SUGGESTED_PRICE,
+			$SCANS_UPC_EAN_EXTENSION
+			FROM $SCANS
+			WHERE $SCANS_ID = ?
+		""".trimMargin(), arrayOf("$id")
+	)?.use {
+		if (it.moveToFirst()) {
+			Scan(
+				it.getString(SCANS_CONTENT),
+				it.getBlob(SCANS_RAW),
+				it.getString(SCANS_FORMAT),
+				it.getString(SCANS_ERROR_CORRECTION_LEVEL),
+				it.getString(SCANS_ISSUE_NUMBER),
+				it.getString(SCANS_ORIENTATION),
+				it.getString(SCANS_OTHER_META_DATA),
+				it.getString(SCANS_PDF417_EXTRA_METADATA),
+				it.getString(SCANS_POSSIBLE_COUNTRY),
+				it.getString(SCANS_SUGGESTED_PRICE),
+				it.getString(SCANS_UPC_EAN_EXTENSION),
+				it.getString(SCANS_DATETIME),
+				it.getLong(SCANS_ID)
+			)
+		} else {
+			null
+		}
+	}
+
+	fun insertScan(scan: Scan): Long = db.insert(
+		SCANS,
+		null,
+		ContentValues().apply {
+			put(SCANS_DATETIME, scan.dateTime)
+			val isRaw = scan.raw != null
+			if (isRaw) {
+				put(SCANS_CONTENT, "")
+				put(SCANS_RAW, scan.raw)
+			} else {
+				put(SCANS_CONTENT, scan.content)
+			}
+			put(SCANS_FORMAT, scan.format)
+			scan.errorCorrectionLevel?.let {
+				put(SCANS_ERROR_CORRECTION_LEVEL, it)
+			}
+			scan.issueNumber?.let { put(SCANS_ISSUE_NUMBER, it) }
+			scan.orientation?.let { put(SCANS_ORIENTATION, it) }
+			scan.otherMetaData?.let { put(SCANS_OTHER_META_DATA, it) }
+			scan.pdf417ExtraMetaData?.let { put(SCANS_PDF417_EXTRA_METADATA, it) }
+			scan.possibleCountry?.let { put(SCANS_POSSIBLE_COUNTRY, it) }
+			scan.suggestedPrice?.let { put(SCANS_SUGGESTED_PRICE, it) }
+			scan.upcEanExtension?.let { put(SCANS_UPC_EAN_EXTENSION, it) }
+			if (prefs.ignoreConsecutiveDuplicates) {
+				val id = getIdOfLastScan(
+					get(SCANS_CONTENT) as String,
+					if (isRaw) get(SCANS_RAW) as ByteArray else null,
+					scan.format
+				)
+				if (id > 0L) {
+					return id
+				}
+			}
+		}
+	)
+
+	private fun getIdOfLastScan(
+		content: String,
+		raw: ByteArray?,
+		format: String
+	): Long = db.rawQuery(
+		"""SELECT
+				$SCANS_ID,
+				$SCANS_CONTENT,
+				$SCANS_RAW,
+				$SCANS_FORMAT
+				FROM $SCANS
+				ORDER BY $SCANS_ID DESC
+				LIMIT 1
+			""".trimMargin(), null
+	)?.use {
+		if (it.count > 0 &&
+			it.moveToFirst() &&
+			it.getString(SCANS_CONTENT) == content &&
+			(raw == null || it.getBlob(SCANS_RAW)
+				?.contentEquals(raw) == true) &&
+			it.getString(SCANS_FORMAT) == format
+		) {
+			it.getLong(SCANS_ID)
+		} else {
+			0L
+		}
+	} ?: 0L
+
+	fun removeScan(id: Long) {
+		db.delete(SCANS, "$SCANS_ID = ?", arrayOf("$id"))
+	}
+
+	fun removeScans(query: String? = null) {
+		db.delete(SCANS, getWhereClause(query, ""), getWhereArguments(query))
+	}
+
+	fun renameScan(id: Long, name: String) {
+		val cv = ContentValues()
+		cv.put(SCANS_NAME, name)
+		db.update(SCANS, cv, "$SCANS_ID = ?", arrayOf("$id"))
+	}
+
+	private class OpenHelper(context: Context) :
+		SQLiteOpenHelper(context, FILE_NAME, null, 4) {
+		override fun onCreate(db: SQLiteDatabase) {
+			createScans(db)
+		}
+
+		override fun onUpgrade(
+			db: SQLiteDatabase,
+			oldVersion: Int,
+			newVersion: Int
+		) {
+			if (oldVersion < 2) {
+				addRawColumn(db)
+			}
+			if (oldVersion < 3) {
+				addMetaDataColumns(db)
+			}
+			if (oldVersion < 4) {
+				addNameColumn(db)
+			}
+		}
+	}
+
+	companion object {
+		const val FILE_NAME = "history.db"
+		const val SCANS = "scans"
+		const val SCANS_ID = "_id"
+		const val SCANS_DATETIME = "_datetime"
+		const val SCANS_NAME = "name"
+		const val SCANS_CONTENT = "content"
+		const val SCANS_RAW = "raw"
+		const val SCANS_FORMAT = "format"
+		const val SCANS_ERROR_CORRECTION_LEVEL = "error_correction_level"
+		const val SCANS_ISSUE_NUMBER = "issue_number"
+		const val SCANS_ORIENTATION = "orientation"
+		const val SCANS_OTHER_META_DATA = "other_meta_data"
+		const val SCANS_PDF417_EXTRA_METADATA = "pdf417_extra_metadata"
+		const val SCANS_POSSIBLE_COUNTRY = "possible_country"
+		const val SCANS_SUGGESTED_PRICE = "suggested_price"
+		const val SCANS_UPC_EAN_EXTENSION = "upc_ean_extension"
+
+		private fun createScans(db: SQLiteDatabase) {
+			db.execSQL("DROP TABLE IF EXISTS $SCANS".trimMargin())
+			db.execSQL(
+				"""CREATE TABLE $SCANS (
+					$SCANS_ID INTEGER PRIMARY KEY AUTOINCREMENT,
+					$SCANS_DATETIME DATETIME NOT NULL,
+					$SCANS_NAME TEXT,
+					$SCANS_CONTENT TEXT NOT NULL,
+					$SCANS_RAW BLOB,
+					$SCANS_FORMAT TEXT NOT NULL,
+					$SCANS_ERROR_CORRECTION_LEVEL TEXT,
+					$SCANS_ISSUE_NUMBER INT,
+					$SCANS_ORIENTATION INT,
+					$SCANS_OTHER_META_DATA TEXT,
+					$SCANS_PDF417_EXTRA_METADATA TEXT,
+					$SCANS_POSSIBLE_COUNTRY TEXT,
+					$SCANS_SUGGESTED_PRICE TEXT,
+					$SCANS_UPC_EAN_EXTENSION TEXT
+				)""".trimMargin()
+			)
+		}
+
+		private fun addRawColumn(db: SQLiteDatabase) {
+			db.execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_RAW BLOB".trimMargin())
+		}
+
+		private fun addMetaDataColumns(db: SQLiteDatabase) {
+			db.apply {
+				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_ERROR_CORRECTION_LEVEL TEXT".trimMargin())
+				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_ISSUE_NUMBER INT".trimMargin())
+				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_ORIENTATION INT".trimMargin())
+				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_OTHER_META_DATA TEXT".trimMargin())
+				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_PDF417_EXTRA_METADATA TEXT".trimMargin())
+				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_POSSIBLE_COUNTRY TEXT".trimMargin())
+				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_SUGGESTED_PRICE TEXT".trimMargin())
+				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_UPC_EAN_EXTENSION TEXT".trimMargin())
+			}
+		}
+
+		private fun addNameColumn(db: SQLiteDatabase) {
+			db.execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_NAME TEXT".trimMargin())
+		}
+	}
+}
@@ -0,0 +1,23 @@
+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 Activity.exportDatabase(fileName: String): Boolean {
+	val dbFile = File(
+		Environment.getDataDirectory(),
+		"//data//${packageName}//databases//${Database.FILE_NAME}"
+	)
+	if (!dbFile.exists()) {
+		return false
+	}
+	return writeExternalFile(
+		fileName,
+		"application/vnd.sqlite3"
+	) {
+		FileInputStream(dbFile).copyTo(it)
+	}
+}
@@ -0,0 +1,74 @@
+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 Context.exportJson(
+	name: String,
+	cursor: Cursor
+) = writeExternalFile(name, "application/json") { outputStream ->
+	cursor.exportJson()?.let {
+		outputStream.write(it.toByteArray())
+	}
+}
+
+fun Cursor.exportJson(): String? {
+	if (!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(getColumnIndex(it), it)
+	}
+	val contentIndex = getColumnIndex(Database.SCANS_CONTENT)
+	val rawIndex = getColumnIndex(Database.SCANS_RAW)
+	val root = JSONArray()
+	do {
+		var deviation: Pair<Int, String>? = null
+		if (getString(contentIndex)?.isEmpty() == true) {
+			deviation = Pair(
+				contentIndex,
+				getBlob(rawIndex).toHexString()
+			)
+		}
+		root.put(toJsonObject(indices, deviation))
+	} while (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
+	}
+}
@@ -0,0 +1,187 @@
+package de.markusfisch.android.binaryeye.database
+
+import android.os.Parcel
+import android.os.Parcelable
+import android.text.format.DateFormat
+import com.google.zxing.Result
+import com.google.zxing.ResultMetadataType
+import de.markusfisch.android.binaryeye.app.hasNonPrintableCharacters
+
+data class Scan(
+	val content: String,
+	val raw: ByteArray?,
+	val format: String,
+	val errorCorrectionLevel: String?,
+	val issueNumber: String?,
+	val orientation: String?,
+	val otherMetaData: String?,
+	val pdf417ExtraMetaData: String?,
+	val possibleCountry: String?,
+	val suggestedPrice: String?,
+	val upcEanExtension: String?,
+	val dateTime: String = getDateTime(),
+	var id: Long = 0L
+) : Parcelable {
+	// Needs to be overwritten manually, as ByteArray is an array and
+	// this isn't handled well by Kotlin
+	override fun equals(other: Any?): Boolean {
+		if (this === other) {
+			return true
+		}
+		if (javaClass != other?.javaClass) {
+			return false
+		}
+
+		other as Scan
+
+		return id == other.id &&
+				dateTime == other.dateTime &&
+				content == other.content &&
+				((raw == null && other.raw == null) ||
+						(raw != null && other.raw != null && raw.contentEquals(other.raw))) &&
+				format == other.format &&
+				errorCorrectionLevel == other.errorCorrectionLevel &&
+				issueNumber == other.issueNumber &&
+				orientation == other.orientation &&
+				otherMetaData == other.otherMetaData &&
+				pdf417ExtraMetaData == other.pdf417ExtraMetaData &&
+				possibleCountry == other.possibleCountry &&
+				suggestedPrice == other.suggestedPrice &&
+				upcEanExtension == other.upcEanExtension
+	}
+
+	// Needs to be overwritten manually, as ByteArray is an array and
+	// this isn't handled well by Kotlin
+	override fun hashCode(): Int {
+		var result = id.hashCode()
+		result = 31 * result + dateTime.hashCode()
+		result = 31 * result + content.hashCode()
+		result = 31 * result + (raw?.contentHashCode() ?: 0)
+		result = 31 * result + format.hashCode()
+		result = 31 * result + (errorCorrectionLevel?.hashCode() ?: 0)
+		result = 31 * result + (issueNumber?.hashCode() ?: 0)
+		result = 31 * result + (orientation?.hashCode() ?: 0)
+		result = 31 * result + (otherMetaData?.hashCode() ?: 0)
+		result = 31 * result + (pdf417ExtraMetaData?.hashCode() ?: 0)
+		result = 31 * result + (possibleCountry?.hashCode() ?: 0)
+		result = 31 * result + (suggestedPrice?.hashCode() ?: 0)
+		result = 31 * result + (upcEanExtension?.hashCode() ?: 0)
+		return result
+	}
+
+	private constructor(parcel: Parcel) : this(
+		content = parcel.readString() ?: "",
+		raw = parcel.readSizedByteArray(),
+		format = parcel.readString() ?: "",
+		errorCorrectionLevel = parcel.readString(),
+		issueNumber = parcel.readString(),
+		orientation = parcel.readString(),
+		otherMetaData = parcel.readString(),
+		pdf417ExtraMetaData = parcel.readString(),
+		possibleCountry = parcel.readString(),
+		suggestedPrice = parcel.readString(),
+		upcEanExtension = parcel.readString(),
+		dateTime = parcel.readString() ?: "",
+		id = parcel.readLong()
+	)
+
+	override fun writeToParcel(parcel: Parcel, flags: Int) {
+		parcel.apply {
+			writeString(content)
+			writeSizedByteArray(raw)
+			writeString(format)
+			writeString(errorCorrectionLevel)
+			writeString(issueNumber)
+			writeString(orientation)
+			writeString(otherMetaData)
+			writeString(pdf417ExtraMetaData)
+			writeString(possibleCountry)
+			writeString(suggestedPrice)
+			writeString(upcEanExtension)
+			writeString(dateTime)
+			writeLong(id)
+		}
+	}
+
+	override fun describeContents() = 0
+
+	companion object {
+		@JvmField
+		val CREATOR = object : Parcelable.Creator<Scan> {
+			override fun createFromParcel(parcel: Parcel) = Scan(parcel)
+			override fun newArray(size: Int) = arrayOfNulls<Scan>(size)
+		}
+	}
+}
+
+private fun getDateTime(time: Long = System.currentTimeMillis()) = DateFormat.format(
+	"yyyy-MM-dd HH:mm:ss",
+	time
+).toString()
+
+private fun Parcel.writeSizedByteArray(array: ByteArray?) {
+	val size = array?.size ?: 0
+	writeInt(size)
+	if (size > 0) {
+		writeByteArray(array)
+	}
+}
+
+private fun Parcel.readSizedByteArray(): ByteArray? {
+	val size = readInt()
+	return if (size > 0) {
+		val array = ByteArray(size)
+		readByteArray(array)
+		array
+	} else {
+		null
+	}
+}
+
+fun Result.toScan(): Scan {
+	val content: String
+	val raw: ByteArray?
+	if (text.hasNonPrintableCharacters()) {
+		content = ""
+		raw = getRawData() ?: text.toByteArray()
+	} else {
+		content = text
+		raw = null
+	}
+	return Scan(
+		content,
+		raw,
+		barcodeFormat.toString(),
+		getMetaString(ResultMetadataType.ERROR_CORRECTION_LEVEL),
+		getMetaString(ResultMetadataType.ISSUE_NUMBER),
+		getMetaString(ResultMetadataType.ORIENTATION),
+		getMetaString(ResultMetadataType.OTHER),
+		getMetaString(ResultMetadataType.PDF417_EXTRA_METADATA),
+		getMetaString(ResultMetadataType.POSSIBLE_COUNTRY),
+		getMetaString(ResultMetadataType.SUGGESTED_PRICE),
+		getMetaString(ResultMetadataType.UPC_EAN_EXTENSION)
+	)
+}
+
+private fun Result.getRawData(): ByteArray? {
+	val metadata = resultMetadata ?: return null
+	val segments = metadata[ResultMetadataType.BYTE_SEGMENTS] ?: return null
+	var bytes = ByteArray(0)
+	@Suppress("UNCHECKED_CAST")
+	for (seg in segments as Iterable<ByteArray>) {
+		bytes += seg
+	}
+	// If the byte segments are shorter than the converted string, the
+	// content of the QR Code has been encoded with different encoding
+	// modes (e.g. some parts in alphanumeric, some in byte encoding).
+	// This is because Zxing only records byte segments for byte encoded
+	// parts. Please note the byte segments can actually be longer than
+	// the string because Zxing cuts off prefixes like "WIFI:".
+	return if (bytes.size >= text.length) bytes else null
+}
+
+private fun Result.getMetaString(
+	key: ResultMetadataType
+): String? = this.resultMetadata?.let {
+	it[key]?.toString()
+}
@@ -1,34 +1,51 @@
 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.os.Environment
 import android.support.v4.app.Fragment
-import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
+import android.view.*
 import android.widget.EditText
-import android.widget.ImageView
-import android.widget.Toast
 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.zxing.Zxing
-import kotlinx.coroutines.Dispatchers.Main
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
+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.encodeAsBitmap
+import de.markusfisch.android.binaryeye.zxing.encodeAsSvg
+import de.markusfisch.android.binaryeye.zxing.encodeAsText
+import kotlinx.coroutines.*
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
+import java.io.OutputStream
+import java.util.*

 class BarcodeFragment : Fragment() {
-	private var barcode: Bitmap? = null
+	private enum class FileType {
+		PNG, SVG, TXT
+	}
+
+	private val parentJob = Job()
+	private val scope = CoroutineScope(Dispatchers.IO + parentJob)
+
+	private var barcodeBitmap: Bitmap? = null
+	private var barcodeSvg: String? = null
+	private var barcodeTxt: String? = null
+	private var content: String = ""
+	private var format: BarcodeFormat? = null

 	override fun onCreate(state: Bundle?) {
 		super.onCreate(state)
@@ -40,7 +57,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,
@@ -51,59 +69,132 @@ 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)
 			}
-			Toast.makeText(activity, message, Toast.LENGTH_SHORT).show()
+			message?.let {
+				ac.toast(message)
+			}
 			fragmentManager.popBackStack()
 			return null
 		}
-		view.findViewById<ImageView>(R.id.barcode).setImageBitmap(barcode)
+		this.content = content
+		this.format = format
+
+		val imageView = view.findViewById<ConfinedScalingImageView>(
+			R.id.barcode
+		)
+		imageView.setImageBitmap(barcodeBitmap)
+		imageView.post {
+			// 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)
+			it.context?.apply {
+				pickFileType(R.string.share_as) { fileType ->
+					shareAs(fileType)
+				}
 			}
 		}

+		(view.findViewById(R.id.inset_layout) as View).setPaddingFromWindowInsets()
+		imageView.doOnApplyWindowInsets { v, insets ->
+			(v as ConfinedScalingImageView).insets.set(insets)
+		}
+
 		return view
 	}

+	override fun onDestroyView() {
+		super.onDestroyView()
+		parentJob.cancel()
+	}
+
 	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
 		inflater.inflate(R.menu.fragment_barcode, menu)
 	}

 	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 -> {
+				context.pickFileType(R.string.export_as) {
+					askForFileNameAndSave(it)
+				}
 				true
 			}
 			else -> super.onOptionsItemSelected(item)
 		}
 	}

-	private fun askForFileNameAndSave() {
+	private fun Context.pickFileType(
+		title: Int,
+		action: (FileType) -> Unit
+	) {
+		val fileTypes = FileType.values()
+		AlertDialog.Builder(this)
+			.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(fileType: FileType) {
 		val ac = activity ?: return
+		// Write permission is only required before Android Q.
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&
+			!ac.hasWritePermission { askForFileNameAndSave(fileType) }
+		) {
+			return
+		}
 		val view = ac.layoutInflater.inflate(R.layout.dialog_save_file, null)
 		val editText = view.findViewById<EditText>(R.id.file_name)
+		editText.setText(encodeFileName("${format.toString()}_$content"))
 		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) { _, _ ->
@@ -111,56 +202,47 @@ class BarcodeFragment : Fragment() {
 			.show()
 	}

-	private fun saveAsFile(bitmap: Bitmap, path: String) {
-		if (!hasWritePermission(activity)) {
-			return
-		}
-		GlobalScope.launch {
-			val success = saveBitmap(
-				bitmap,
-				File(
-					Environment.getExternalStoragePublicDirectory(
-						Environment.DIRECTORY_DOWNLOADS
-					),
-					path
-				)
-			)
-			GlobalScope.launch(Main) {
-				val ac = activity
-				ac?.let {
-					Toast.makeText(
-						ac,
-						if (success) {
-							R.string.saved_in_downloads
-						} else {
-							R.string.error_saving_binary_data
-						},
-						Toast.LENGTH_LONG
-					).show()
-				}
+	private fun saveAs(
+		fileName: String,
+		mimeType: String,
+		write: (outputStream: OutputStream) -> Unit
+	) {
+		val ac = activity ?: return
+		scope.launch(Dispatchers.IO) {
+			val message = ac.writeExternalFile(fileName, mimeType, write).toSaveResult()
+			withContext(Dispatchers.Main) {
+				ac.toast(message)
 			}
 		}
 	}

-	private fun share(bitmap: Bitmap) {
-		GlobalScope.launch {
+	private fun Context.shareAs(fileType: FileType) {
+		when (fileType) {
+			FileType.PNG -> barcodeBitmap?.let { share(it) }
+			FileType.SVG -> barcodeSvg?.let { shareText(it, MIME_SVG) }
+			FileType.TXT -> barcodeTxt?.let { shareText(it) }
+		}
+	}
+
+	private fun Context.share(bitmap: Bitmap) {
+		scope.launch(Dispatchers.IO) {
 			val file = File(
-				context.externalCacheDir,
+				externalCacheDir,
 				"shared_barcode.png"
 			)
-			val success = saveBitmap(bitmap, file)
-			GlobalScope.launch(Main) {
+			val success = try {
+				FileOutputStream(file).use {
+					bitmap.saveAsPng(it)
+				}
+				true
+			} catch (e: IOException) {
+				false
+			}
+			withContext(Dispatchers.Main) {
 				if (success) {
-					shareFile(context, file, "image/png")
+					shareFile(file, "image/png")
 				} else {
-					val ac = activity
-					ac?.let {
-						Toast.makeText(
-							ac,
-							R.string.error_saving_binary_data,
-							Toast.LENGTH_LONG
-						).show()
-					}
+					toast(R.string.error_saving_file)
 				}
 			}
 		}
@@ -169,16 +251,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
@@ -187,13 +277,9 @@ class BarcodeFragment : Fragment() {
 	}
 }

-private fun saveBitmap(bitmap: Bitmap, file: File): Boolean {
-	return try {
-		val fos = FileOutputStream(file)
-		bitmap.compress(Bitmap.CompressFormat.PNG, 90, fos)
-		fos.close()
-		true
-	} catch (e: IOException) {
-		false
-	}
-}
+private fun Bitmap.saveAsPng(outputStream: OutputStream, quality: Int = 90) =
+	compress(Bitmap.CompressFormat.PNG, quality, outputStream)
+
+private val fileNameCharacters = "[^A-Za-z0-9]".toRegex()
+private fun encodeFileName(name: String): String =
+	fileNameCharacters.replace(name, "_").take(16).trim('_').lowercase(Locale.getDefault())
@@ -1,50 +1,57 @@
 package de.markusfisch.android.binaryeye.fragment

-import android.content.Context
+import android.os.Build
 import android.os.Bundle
+import android.support.design.widget.FloatingActionButton
 import android.support.v4.app.Fragment
-import android.text.ClipboardManager
 import android.text.Editable
 import android.text.TextWatcher
-import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
+import android.view.*
 import android.widget.EditText
-import android.widget.ImageView
+import android.widget.TableLayout
+import android.widget.TableRow
 import android.widget.TextView
-import android.widget.Toast
-import com.google.zxing.BarcodeFormat
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
+import com.google.zxing.qrcode.encoder.Encoder
 import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.actions.ActionRegistry
-import de.markusfisch.android.binaryeye.app.addFragment
-import de.markusfisch.android.binaryeye.app.askForFileName
-import de.markusfisch.android.binaryeye.app.hasNonPrintableCharacters
-import de.markusfisch.android.binaryeye.app.hasWritePermission
-import de.markusfisch.android.binaryeye.app.shareText
-import de.markusfisch.android.binaryeye.app.writeToFile
+import de.markusfisch.android.binaryeye.actions.wifi.WifiAction
+import de.markusfisch.android.binaryeye.actions.wifi.WifiConnector
+import de.markusfisch.android.binaryeye.activity.MainActivity
+import de.markusfisch.android.binaryeye.adapter.prettifyFormatName
+import de.markusfisch.android.binaryeye.app.*
+import de.markusfisch.android.binaryeye.content.copyToClipboard
+import de.markusfisch.android.binaryeye.content.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
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.flowOf
 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 format: BarcodeFormat
-	private lateinit var actionMenuItem: MenuItem
-
-	private var action = ActionRegistry.DEFAULT_ACTION
-	private var isBinary = false
-	private val content: String
-		get() = contentView.text.toString()
+	private lateinit var format: String
+	private lateinit var fab: FloatingActionButton

 	private val parentJob = Job()
 	private val scope: CoroutineScope = CoroutineScope(Dispatchers.Main + parentJob)
+	private val content: String
+		get() = contentView.text.toString()
+
+	private var closeAutomatically = false
+	private var action = ActionRegistry.DEFAULT_ACTION
+	private var isBinary = false
+	private var raw: ByteArray = ByteArray(0)
+	private var id = 0L

 	override fun onCreate(state: Bundle?) {
 		super.onCreate(state)
@@ -56,7 +63,7 @@ class DecodeFragment : Fragment() {
 		container: ViewGroup?,
 		state: Bundle?
 	): View {
-		activity.setTitle(R.string.content)
+		activity?.setTitle(R.string.content)

 		val view = inflater.inflate(
 			R.layout.fragment_decode,
@@ -64,13 +71,20 @@ class DecodeFragment : Fragment() {
 			false
 		)

-		val inputContent = arguments?.getString(CONTENT) ?: ""
-		isBinary = hasNonPrintableCharacters(inputContent) or inputContent.isEmpty()
-		val raw = arguments?.getByteArray(RAW) ?: inputContent.toByteArray()
-		format = arguments?.getSerializable(FORMAT) as BarcodeFormat? ?: BarcodeFormat.QR_CODE
+		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 = scan.raw != null
+		raw = scan.raw ?: inputContent.toByteArray()
+		format = scan.format

 		contentView = view.findViewById(R.id.content)
-		val shareFab = view.findViewById<ImageView>(R.id.share)
+		fab = view.findViewById(R.id.open)

 		if (!isBinary) {
 			contentView.setText(inputContent)
@@ -95,26 +109,47 @@ class DecodeFragment : Fragment() {
 				) {
 				}
 			})
-			shareFab.setOnClickListener { v ->
-				shareText(v.context, content)
+			fab.setOnClickListener {
+				executeAction(content.toByteArray())
+			}
+			if (prefs.openImmediately) {
+				executeAction(content.toByteArray())
 			}
 		} else {
-			contentView.setText(R.string.binary_data)
+			contentView.setText(String(raw).foldNonAlNum())
 			contentView.isEnabled = false
-			shareFab.setImageResource(R.drawable.ic_action_save)
-			shareFab.setOnClickListener {
+			fab.setImageResource(R.drawable.ic_action_save)
+			fab.setOnClickListener {
 				askForFileNameAndSave(raw)
 			}
 		}

 		formatView = view.findViewById(R.id.format)
+		dataView = view.findViewById(R.id.data)
+		metaView = view.findViewById(R.id.meta)
 		hexView = view.findViewById(R.id.hex)

 		updateViewsAndAction(raw)

+		if (!isBinary) {
+			fillDataView(dataView, inputContent)
+		}
+
+		if (prefs.showMetaData) {
+			fillMetaView(metaView, scan)
+		}
+
+		(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)) {
@@ -123,104 +158,221 @@ class DecodeFragment : Fragment() {
 		formatView.text = resources.getQuantityString(
 			R.plurals.barcode_info,
 			bytes.size,
-			format.toString(),
+			prettifyFormatName(format),
 			bytes.size
 		)
-		hexView.text = hexDump(bytes, 33)
-		if (::actionMenuItem.isInitialized && prevAction !== action) {
-			actionMenuItem.setIcon(action.iconResId)
-			actionMenuItem.setTitle(action.titleResId)
+		hexView.text = if (prefs.showHexDump) hexDump(bytes) else ""
+		if (prevAction !== action) {
+			fab.setImageResource(action.iconResId)
+			if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+				fab.setOnLongClickListener { v ->
+					v.context.toast(action.titleResId)
+					true
+				}
+			} else {
+				fab.tooltipText = getString(action.titleResId)
+			}
+		}
+	}
+
+	private fun fillDataView(tableLayout: TableLayout, content: String) {
+		val items = LinkedHashMap<Int, String?>()
+		if (action is WifiAction) {
+			WifiConnector.parseMap(content)?.let { wifiData ->
+				items.putAll(
+					linkedMapOf(
+						R.string.entry_type to getString(R.string.wifi_network),
+						R.string.wifi_ssid to wifiData["S"],
+						R.string.wifi_password to wifiData["P"],
+						R.string.wifi_type to wifiData["T"],
+						R.string.wifi_hidden to wifiData["H"],
+						R.string.wifi_eap to wifiData["E"],
+						R.string.wifi_identity to wifiData["I"],
+						R.string.wifi_anonymous_identity to wifiData["A"],
+						R.string.wifi_phase2 to wifiData["PH2"]
+					)
+				)
+			}
+		}
+		fillDataTable(tableLayout, items)
+	}
+
+	private fun fillMetaView(tableLayout: TableLayout, scan: Scan) {
+		val items = 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
+		)
+		if (prefs.showQrVersion && scan.format == "QR_CODE") {
+			items.putAll(
+				linkedMapOf(
+					R.string.qr_version to "${scan.version()}"
+				)
+			)
+		}
+		fillDataTable(tableLayout, items)
+	}
+
+	private fun fillDataTable(
+		tableLayout: TableLayout,
+		items: LinkedHashMap<Int, String?>
+	) {
+		val ctx = tableLayout.context
+		val spaceBetween = (16f * ctx.resources.displayMetrics.density).toInt()
+		items.forEach { item ->
+			val text = item.value
+			if (!text.isNullOrBlank()) {
+				val tr = TableRow(ctx)
+				val keyView = TextView(ctx)
+				keyView.setText(item.key)
+				val valueView = TextView(ctx)
+				valueView.setPadding(spaceBetween, 0, 0, 0)
+				valueView.text = text
+				tr.addView(keyView)
+				tr.addView(valueView)
+				tableLayout.addView(tr)
+			}
+		}
+		if (tableLayout.childCount > 0) {
+			tableLayout.setPadding(0, 0, 0, spaceBetween)
 		}
 	}

 	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
 		inflater.inflate(R.menu.fragment_decode, menu)
-		actionMenuItem = menu.findItem(R.id.open_url)
-		actionMenuItem.setIcon(action.iconResId)
-		actionMenuItem.setTitle(action.titleResId)
 		if (isBinary) {
 			menu.findItem(R.id.copy_to_clipboard).isVisible = false
-			menu.findItem(R.id.open_url).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_to_clipboard -> {
-				copyToClipboard(content)
+			R.id.copy_password -> {
+				copyPasswordToClipboard()
+				maybeBackOrFinish()
 				true
 			}
-			R.id.open_url -> {
-				executeAction(content.toByteArray())
+			R.id.copy_to_clipboard -> {
+				copyToClipboard(textOrHex())
+				maybeBackOrFinish()
+				true
+			}
+			R.id.share -> {
+				context?.apply {
+					shareText(textOrHex())
+					maybeBackOrFinish()
+				}
 				true
 			}
 			R.id.create -> {
-				addFragment(
-					fragmentManager,
+				fragmentManager?.addFragment(
 					EncodeFragment.newInstance(content, format)
 				)
 				true
 			}
+			R.id.remove -> {
+				db.removeScan(id)
+				backOrFinish()
+				true
+			}
 			else -> super.onOptionsItemSelected(item)
 		}
 	}

-	private fun copyToClipboard(text: String) {
-		activity ?: return
+	private fun textOrHex() = if (isBinary) {
+		raw.toHexString()
+	} else {
+		content
+	}

-		val cm = activity.getSystemService(
-			Context.CLIPBOARD_SERVICE
-		) as ClipboardManager
-		cm.text = text
-		Toast.makeText(
-			activity,
-			R.string.put_into_clipboard,
-			Toast.LENGTH_SHORT
-		).show()
+	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)
+			toast(R.string.copied_to_clipboard)
+		}
+	}
+
+	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()) scope.launch {
-			action.execute(activity, content)
+		val ac = activity ?: return
+		if (content.isNotEmpty()) {
+			if (action is WifiAction &&
+				Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&
+				!ac.hasLocationPermission { executeAction(content) }
+			) {
+				return
+			}
+			scope.launch {
+				action.execute(ac, content)
+				maybeBackOrFinish()
+			}
 		}
 	}

 	private fun askForFileNameAndSave(raw: ByteArray) {
 		val ac = activity ?: return
-		if (!hasWritePermission(ac)) return
+		// Write permission is only required before Android Q.
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&
+			!ac.hasWritePermission { askForFileNameAndSave(raw) }
+		) {
+			return
+		}
 		scope.launch(Dispatchers.Main) {
 			val name = ac.askForFileName() ?: return@launch
-			val message = flowOf(raw).writeToFile(name)
-			Toast.makeText(
-				ac,
-				message,
-				Toast.LENGTH_SHORT
-			).show()
+			val message = ac.writeExternalFile(
+				name,
+				"application/octet-stream"
+			) {
+				it.write(raw)
+			}.toSaveResult()
+			ac.toast(message)
 		}
 	}

-	override fun onDestroyView() {
-		parentJob.cancel()
-		super.onDestroyView()
-	}
-
 	companion object {
-		private const val CONTENT = "content"
-		private const val FORMAT = "format"
-		private const val RAW = "raw"
+		private const val SCAN = "scan"

-		fun newInstance(
-			content: String,
-			format: BarcodeFormat,
-			raw: ByteArray? = null
-		): Fragment {
+		fun newInstance(scan: Scan): Fragment {
 			val args = Bundle()
-			args.putString(CONTENT, content)
-			args.putSerializable(FORMAT, format)
-			if (raw != null) {
-				args.putByteArray(RAW, raw)
-			}
+			args.putParcelable(SCAN, scan)
 			val fragment = DecodeFragment()
 			fragment.arguments = args
 			return fragment
@@ -228,7 +380,7 @@ class DecodeFragment : Fragment() {
 	}
 }

-private fun hexDump(bytes: ByteArray, charsPerLine: Int): String {
+private fun hexDump(bytes: ByteArray, charsPerLine: Int = 33): String {
 	if (charsPerLine < 4 || bytes.isEmpty()) {
 		return ""
 	}
@@ -241,10 +393,8 @@ private fun hexDump(bytes: ByteArray, charsPerLine: Int): 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
 		var atLineEnd = posInLine == 0
@@ -268,3 +418,8 @@ private fun hexDump(bytes: ByteArray, charsPerLine: Int): String {
 	}
 	return dump.toString()
 }
+
+private fun Scan.version(): Int = Encoder.encode(
+	content,
+	ErrorCorrectionLevel.valueOf(errorCorrectionLevel ?: "L")
+).version.versionNumber
@@ -1,21 +1,30 @@
 package de.markusfisch.android.binaryeye.fragment

-import android.content.Context
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.inputmethod.InputMethodManager
 import android.widget.*
 import com.google.zxing.BarcodeFormat
+import com.google.zxing.EncodeHintType
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
 import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.adapter.prettifyFormatName
 import de.markusfisch.android.binaryeye.app.addFragment
+import de.markusfisch.android.binaryeye.app.prefs
+import de.markusfisch.android.binaryeye.view.hideSoftKeyboard
+import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
+import java.util.*

 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
+
 	private val writers = arrayListOf(
 		BarcodeFormat.AZTEC,
 		BarcodeFormat.CODABAR,
@@ -34,8 +43,9 @@ class EncodeFragment : Fragment() {
 		inflater: LayoutInflater,
 		container: ViewGroup?,
 		state: Bundle?
-	): View {
-		activity.setTitle(R.string.compose_barcode)
+	): View? {
+		val ac = activity ?: return null
+		ac.setTitle(R.string.compose_barcode)

 		val view = inflater.inflate(
 			R.layout.fragment_encode,
@@ -44,50 +54,103 @@ class EncodeFragment : Fragment() {
 		)

 		formatView = view.findViewById(R.id.format)
-		formatView.adapter = ArrayAdapter<String>(
-			activity,
-			android.R.layout.simple_list_item_1,
-			writers.map { it.name }
+		val formatAdapter = ArrayAdapter(
+			ac,
+			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)
 		initSizeBar()

-		val contentView = view.findViewById<EditText>(R.id.content)
+		contentView = view.findViewById(R.id.content)

 		val args = arguments
-		args?.let {
-			contentView.setText(args.getString(CONTENT))
-			formatView.setSelection(
-				writers.indexOf(
-					args.getSerializable(FORMAT) as BarcodeFormat?
-				)
-			)
+		args?.also {
+			contentView.setText(it.getString(CONTENT))
 		}

-		view.findViewById<View>(R.id.encode).setOnClickListener { v ->
-			val format = writers[formatView.selectedItemPosition]
-			val size = getSize(sizeBarView.progress)
-			val content = contentView.text.toString()
-			if (content.isEmpty()) {
-				Toast.makeText(
-					v.context,
-					R.string.error_no_content,
-					Toast.LENGTH_SHORT
-				).show()
-			} else {
-				hideSoftKeyboard(contentView)
-				addFragment(
-					fragmentManager,
-					BarcodeFragment.newInstance(content, format, size)
-				)
+		val barcodeFormat = args?.getString(FORMAT)
+		if (barcodeFormat != null) {
+			formatView.setSelection(
+				writers.indexOf(resolveFormat(barcodeFormat))
+			)
+		} else if (state == null) {
+			formatView.post {
+				formatView.setSelection(prefs.indexOfLastSelectedFormat)
 			}
 		}

+		view.findViewById<View>(R.id.encode).setOnClickListener {
+			encode()
+		}
+
+		(view.findViewById(R.id.inset_layout) as View).setPaddingFromWindowInsets()
+		(view.findViewById(R.id.scroll_view) as View).setPaddingFromWindowInsets()
+
 		return view
 	}

+	override fun onPause() {
+		super.onPause()
+		prefs.indexOfLastSelectedFormat = formatView.selectedItemPosition
+	}
+
+	private fun encode() {
+		val hints = EnumMap<EncodeHintType, Any>(EncodeHintType::class.java)
+		val format = writers[formatView.selectedItemPosition]
+		if (format == BarcodeFormat.QR_CODE) {
+			hints[EncodeHintType.ERROR_CORRECTION] = arrayListOf(
+				ErrorCorrectionLevel.L,
+				ErrorCorrectionLevel.M,
+				ErrorCorrectionLevel.Q,
+				ErrorCorrectionLevel.H
+			)[errorCorrectionLevel.selectedItemPosition]
+		}
+		val size = getSize(sizeBarView.progress)
+		val content = contentView.text.toString()
+		if (content.isEmpty()) {
+			Toast.makeText(
+				context,
+				R.string.error_no_content,
+				Toast.LENGTH_SHORT
+			).show()
+		} else {
+			activity?.hideSoftKeyboard(contentView)
+			fragmentManager?.addFragment(
+				BarcodeFragment.newInstance(content, format, size, hints)
+			)
+		}
+	}
+
 	private fun initSizeBar() {
 		updateSize(sizeBarView.progress)
 		sizeBarView.setOnSeekBarChangeListener(
@@ -113,29 +176,26 @@ class EncodeFragment : Fragment() {

 	private fun getSize(power: Int) = 128 * (power + 1)

-	private fun hideSoftKeyboard(view: View) {
-		val im = activity?.getSystemService(
-			Context.INPUT_METHOD_SERVICE
-		) as InputMethodManager?
-		im?.let {
-			im.hideSoftInputFromWindow(view.windowToken, 0)
-		}
-	}
-
 	companion object {
 		private const val CONTENT = "content"
 		private const val FORMAT = "format"

 		fun newInstance(
 			content: String,
-			format: BarcodeFormat = BarcodeFormat.AZTEC
+			format: String? = null
 		): Fragment {
 			val args = Bundle()
 			args.putString(CONTENT, content)
-			args.putSerializable(FORMAT, format)
+			format?.let { args.putString(FORMAT, it) }
 			val fragment = EncodeFragment()
 			fragment.arguments = args
 			return fragment
 		}
 	}
 }
+
+private fun resolveFormat(name: String): BarcodeFormat = try {
+	BarcodeFormat.valueOf(name)
+} catch (_: IllegalArgumentException) {
+	BarcodeFormat.QR_CODE
+}
@@ -1,50 +1,121 @@
 package de.markusfisch.android.binaryeye.fragment

+import android.annotation.SuppressLint
 import android.app.AlertDialog
+import android.app.SearchManager
 import android.content.Context
+import android.database.Cursor
+import android.os.Build
 import android.os.Bundle
-import android.support.annotation.WorkerThread
+import android.os.Parcelable
+import android.support.v4.app.ActivityCompat
 import android.support.v4.app.Fragment
+import android.support.v4.content.ContextCompat
+import android.support.v7.app.AppCompatActivity
+import android.support.v7.view.ActionMode
+import android.support.v7.widget.SearchView
 import android.support.v7.widget.SwitchCompat
-import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
+import android.view.*
+import android.widget.EditText
 import android.widget.ListView
-import android.widget.Toast
-import com.google.zxing.BarcodeFormat
 import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.adapter.ScansAdapter
-import de.markusfisch.android.binaryeye.app.addFragment
-import de.markusfisch.android.binaryeye.app.alertDialog
-import de.markusfisch.android.binaryeye.app.askForFileName
-import de.markusfisch.android.binaryeye.app.db
-import de.markusfisch.android.binaryeye.app.hasWritePermission
-import de.markusfisch.android.binaryeye.app.prefs
-import de.markusfisch.android.binaryeye.app.shareText
-import de.markusfisch.android.binaryeye.app.systemBarScrollListener
-import de.markusfisch.android.binaryeye.app.useVisibility
-import de.markusfisch.android.binaryeye.app.writeToFile
-import de.markusfisch.android.binaryeye.data.csv.csvBuilder
-import de.markusfisch.android.binaryeye.repository.DatabaseRepository
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.mapNotNull
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
+import de.markusfisch.android.binaryeye.app.*
+import de.markusfisch.android.binaryeye.content.copyToClipboard
+import de.markusfisch.android.binaryeye.content.shareText
+import de.markusfisch.android.binaryeye.database.Database
+import de.markusfisch.android.binaryeye.database.getString
+import de.markusfisch.android.binaryeye.database.exportCsv
+import de.markusfisch.android.binaryeye.database.exportDatabase
+import de.markusfisch.android.binaryeye.database.exportJson
+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() {
+	private lateinit var useHistorySwitch: SwitchCompat
 	private lateinit var listView: ListView
 	private lateinit var fab: View
 	private lateinit var progressView: View

 	private val parentJob = Job()
 	private val scope = CoroutineScope(Dispatchers.IO + parentJob)
+	private val actionModeCallback = object : ActionMode.Callback {
+		override fun onCreateActionMode(
+			mode: ActionMode,
+			menu: Menu
+		): Boolean {
+			mode.menuInflater.inflate(
+				R.menu.fragment_history_edit,
+				menu
+			)
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+				lockStatusBarColor()
+				val ac = activity ?: return false
+				ac.window.statusBarColor = ContextCompat.getColor(
+					ac,
+					R.color.accent_dark
+				)
+			}
+			return true
+		}
+
+		override fun onPrepareActionMode(
+			mode: ActionMode,
+			menu: Menu
+		): Boolean {
+			return false
+		}
+
+		override fun onActionItemClicked(
+			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(
+							ac,
+							it.selectedScanId,
+							getScanName(it.selectedScanPosition)
+						)
+					}
+					closeActionMode()
+					true
+				}
+				R.id.remove_scan -> {
+					scansAdapter?.let {
+						askToRemoveScan(ac, it.selectedScanId)
+					}
+					closeActionMode()
+					true
+				}
+				else -> false
+			}
+		}
+
+		override fun onDestroyActionMode(mode: ActionMode) {
+			closeActionMode()
+		}
+	}
+
+	private var scansAdapter: ScansAdapter? = null
+	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)
@@ -55,8 +126,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,
@@ -64,21 +136,26 @@ class HistoryFragment : Fragment() {
 			false
 		)

-		val useHistorySwitch = view.findViewById(
+		useHistorySwitch = view.findViewById(
 			R.id.use_history
 		) as SwitchCompat
 		initHistorySwitch(useHistorySwitch)

 		listView = view.findViewById(R.id.scans)
-		listView.emptyView = useHistorySwitch
 		listView.setOnItemClickListener { _, _, _, id ->
 			showScan(id)
 		}
-		listView.setOnItemLongClickListener { _, v, _, id ->
-			askToRemoveScan(v.context, id)
+		listView.setOnItemLongClickListener { _, v, position, id ->
+			v.isSelected = true
+			scansAdapter?.select(id, position)
+			if (actionMode == null && ac is AppCompatActivity) {
+				actionMode = ac.delegate.startSupportActionMode(
+					actionModeCallback
+				)
+			}
 			true
 		}
-		listView.setOnScrollListener(systemBarScrollListener)
+		listView.setOnScrollListener(systemBarListViewScrollListener)

 		fab = view.findViewById(R.id.share)
 		fab.setOnClickListener { v ->
@@ -87,32 +164,68 @@ class HistoryFragment : Fragment() {

 		progressView = view.findViewById(R.id.progress_view)

+		(view.findViewById(R.id.inset_layout) as View).setPaddingFromWindowInsets()
+		listView.setPaddingFromWindowInsets()
+
+		update()
+
 		return view
 	}

 	override fun onDestroy() {
 		super.onDestroy()
-		(listView.adapter as ScansAdapter?)?.changeCursor(null)
+		scansAdapter?.changeCursor(null)
 		parentJob.cancel()
 	}

-	override fun onResume() {
-		super.onResume()
-		update(context)
+	override fun onPause() {
+		super.onPause()
+		listViewState = listView.onSaveInstanceState()
 	}

 	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
 		inflater.inflate(R.menu.fragment_history, menu)
+		initSearchView(menu.findItem(R.id.search))
+		menu.setGroupVisible(R.id.scans_available, scansAdapter?.count != 0)
+		clearListMenuItem = menu.findItem(R.id.clear)
+		exportHistoryMenuItem = menu.findItem(R.id.export_history)
+	}
+
+	private fun initSearchView(item: MenuItem?) {
+		item ?: return
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
+			item.isVisible = false
+		} else {
+			val ac = activity ?: return
+			val searchView = item.actionView as SearchView
+			val searchManager = ac.getSystemService(
+				Context.SEARCH_SERVICE
+			) as SearchManager
+			searchView.setSearchableInfo(
+				searchManager.getSearchableInfo(ac.componentName)
+			)
+			searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+				override fun onQueryTextSubmit(query: String): Boolean {
+					update(query)
+					return false
+				}
+
+				override fun onQueryTextChange(query: String): Boolean {
+					update(query)
+					return false
+				}
+			})
+		}
 	}

 	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)
@@ -128,136 +241,167 @@ class HistoryFragment : Fragment() {
 		}
 	}

-	private fun update(context: Context) {
+	private fun updateAndClearFilter() {
+		filter = null
+		update()
+	}
+
+	private fun update(query: String? = null) {
+		query?.let { filter = it }
 		scope.launch {
-			val cursor = db.getScansCursor()
+			val cursor = db.getScans(filter)
 			withContext(Dispatchers.Main) {
-				fab.visibility = if (cursor != null && cursor.count > 0) {
+				val ac = activity ?: return@withContext
+				val hasScans = cursor != null && cursor.count > 0
+				if (filter == null) {
+					if (!hasScans) {
+						listView.emptyView = useHistorySwitch
+					}
+					ActivityCompat.invalidateOptionsMenu(ac)
+				}
+				enableMenuItems(hasScans)
+				fab.visibility = if (hasScans) {
 					View.VISIBLE
 				} else {
 					View.GONE
 				}
-				cursor?.let {
-					if (listView.adapter == null) {
-						listView.adapter = ScansAdapter(context, cursor)
-					} else {
-						val adapter = listView.adapter as ScansAdapter
-						adapter.changeCursor(cursor)
-						adapter.notifyDataSetChanged()
+				cursor?.let { cursor ->
+					// Close previous cursor.
+					scansAdapter?.also { it.changeCursor(null) }
+					scansAdapter = ScansAdapter(ac, cursor)
+					listView.adapter = scansAdapter
+					listViewState?.also {
+						listView.onRestoreInstanceState(it)
 					}
 				}
 			}
 		}
 	}

+	private fun enableMenuItems(enabled: Boolean) {
+		clearListMenuItem?.isEnabled = enabled
+		exportHistoryMenuItem?.isEnabled = enabled
+	}
+
+	private fun closeActionMode() {
+		unlockStatusBarColor()
+		scansAdapter?.clearSelection()
+		actionMode?.finish()
+		actionMode = null
+		scansAdapter?.notifyDataSetChanged()
+	}
+
 	private fun showScan(id: Long) = db.getScan(id)?.also { scan ->
+		closeActionMode()
 		try {
-			addFragment(
-				fragmentManager,
-				DecodeFragment.newInstance(
-					scan.content,
-					BarcodeFormat.valueOf(scan.format),
-					scan.raw
-				)
-			)
+			fragmentManager?.addFragment(DecodeFragment.newInstance(scan))
 		} catch (e: IllegalArgumentException) {
-			// shouldn't ever happen
+			// Ignore, can never happen.
 		}
 	}

+	private fun getScanName(position: Int): String? {
+		val cursor = scansAdapter?.getItem(position) as Cursor?
+		return cursor?.getString(Database.SCANS_NAME)
+	}
+
+	// Dialogs don't have a parent layout.
+	@SuppressLint("InflateParams")
+	private fun askForName(context: Context, id: Long, text: String?) {
+		val view = LayoutInflater.from(context).inflate(
+			R.layout.dialog_enter_name, null
+		)
+		val nameView = view.findViewById<EditText>(R.id.name)
+		nameView.setText(text)
+		AlertDialog.Builder(context)
+			.setView(view)
+			.setPositiveButton(android.R.string.ok) { _, _ ->
+				val name = nameView.text.toString()
+				db.renameScan(id, name)
+				update()
+			}
+			.setNegativeButton(android.R.string.cancel) { _, _ -> }
+			.show()
+	}
+
 	private fun askToRemoveScan(context: Context, id: Long) {
 		AlertDialog.Builder(context)
 			.setMessage(R.string.really_remove_scan)
 			.setPositiveButton(android.R.string.ok) { _, _ ->
 				db.removeScan(id)
-				update(context)
+				if (scansAdapter?.count == 1) {
+					updateAndClearFilter()
+				} else {
+					update()
+				}
 			}
 			.setNegativeButton(android.R.string.cancel) { _, _ ->
 			}
 			.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()
-				update(context)
+				db.removeScans(filter)
+				updateAndClearFilter()
 			}
 			.setNegativeButton(android.R.string.cancel) { _, _ ->
 			}
 			.show()
 	}

-	private fun askToExportToFile(context: Context) = scope.launch {
-		progressView.useVisibility {
-			if (!hasWritePermission(activity)) {
-				return@useVisibility
-			}
-			val (getBinaries, scans) = getScans {
-				alertDialog(context) { resume ->
-					setTitle(R.string.csv_allow_binary)
-					setMessage(R.string.csv_allow_binary_message)
-					setPositiveButton(R.string.no) { _, _ ->
-						resume(false)
-					}
-					setNegativeButton(android.R.string.yes) { _, _ ->
-						resume(true)
-					}
-					setNeutralButton(android.R.string.cancel) { _, _ ->
-						resume(null)
-					}
+	private fun askToExportToFile() {
+		scope.launch {
+			val ac = activity ?: return@launch
+			progressView.useVisibility {
+				// Write permission is only required before Android Q.
+				if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&
+					!ac.hasWritePermission { askToExportToFile() }
+				) {
+					return@useVisibility
 				}
-			} ?: return@useVisibility
-			val 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])
+				val options = ac.resources.getStringArray(
+					R.array.export_options_values
+				)
+				val delimiter = alertDialog<String>(ac) { 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" -> ac.exportDatabase(name)
+					else -> db.getScansDetailed(filter)?.use {
+						when (delimiter) {
+							"json" -> ac.exportJson(name, it)
+							else -> ac.exportCsv(name, it, delimiter)
+						}
+					} ?: false
+				}.toSaveResult()
+				withContext(Dispatchers.Main) {
+					ac.toast(message)
 				}
-			} ?: return@useVisibility
-			val name = withContext(Dispatchers.Main) {
-				activity.askForFileName(suffix = "csv")
-			} ?: return@useVisibility
-			val csv = scans.toCSV(delimiter, getBinaries)
-			val toastMessage = csv.writeToFile(name)
-			withContext(Dispatchers.Main) {
-				Toast.makeText(
-					context,
-					toastMessage,
-					Toast.LENGTH_SHORT
-				).show()
 			}
 		}
 	}

-	private fun Flow<DatabaseRepository.Scan>.toCSV(
-		delimiter: String,
-		allowBinary: Boolean
-	): Flow<ByteArray> {
-		return csvBuilder<DatabaseRepository.Scan> {
-			column {
-				name = "DATE"
-				gettingByString { it.timestamp }
-			}
-			column {
-				name = "TYPE"
-				gettingByString { it.format }
-			}
-			column {
-				name = "CONTENT"
-				gettingByString { it.content }
-			}
-			if (allowBinary) column {
-				isBinary = true
-				name = "BINARY_CONTENT"
-				gettingBy { it.raw ?: ByteArray(0) }
-			}
-		}.buildWith(this, delimiter)
-	}
-
 	private fun pickListSeparatorAndShare(context: Context) {
 		val separators = context.resources.getStringArray(
 			R.array.list_separators_values
@@ -270,33 +414,37 @@ class HistoryFragment : Fragment() {
 			.show()
 	}

-	private fun shareScans(separator: String) {
-		scope.launch {
-			progressView.useVisibility {
-				val sb = StringBuilder()
-				getScans { false }?.second?.collect {
-					sb.append(it.content)
-					sb.append(separator)
-				}
-				val text = sb.toString()
-				if (text.isNotEmpty()) withContext(Dispatchers.Main) {
-					shareText(context, text)
+	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" -> cursor.exportText(details[1])
+					"csv" -> cursor.exportCsv(details[1])
+					else -> cursor.exportJson()
 				}
 			}
-		}
-	}
-
-	@WorkerThread
-	private suspend inline fun getScans(
-		crossinline binaryData: suspend () -> Boolean?
-	): Pair<Boolean, Flow<DatabaseRepository.Scan>>? {
-		val getBinaries: Boolean = db.hasBinaryData() && binaryData() ?: return null
-		return getBinaries to db.getScans().mapNotNull {
-			when {
-				it.content.isNotEmpty() -> db.getScan(it.id)
-				getBinaries -> db.getScan(it.id)
-				else -> null
+			text?.let {
+				withContext(Dispatchers.Main) {
+					context.shareText(it)
+				}
 			}
 		}
 	}
 }
+
+private fun Cursor.exportText(separator: String): String {
+	val sb = StringBuilder()
+	val contentIndex = getColumnIndex(Database.SCANS_CONTENT)
+	if (contentIndex > -1 && moveToFirst()) {
+		do {
+			val content = getString(contentIndex)
+			if (content?.isNotEmpty() == true) {
+				sb.append(content)
+				sb.append(separator)
+			}
+		} while (moveToNext())
+	}
+	return sb.toString()
+}
@@ -1,46 +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.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 useHistorySwitch: SwitchCompat
-	private lateinit var openWithUrlInput: EditText
-
-	override fun onCreateView(
-		inflater: LayoutInflater,
-		container: ViewGroup?,
-		state: Bundle?
-	): View? {
-		activity.setTitle(R.string.preferences)
-
-		val view = inflater.inflate(
-			R.layout.fragment_preferences,
-			container,
-			false
-		)
-
-		useHistorySwitch = view.findViewById<SwitchCompat>(R.id.use_history)
-		if (prefs.useHistory) {
-			useHistorySwitch.toggle()
+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)
+			}
 		}
+	}

-		openWithUrlInput = view.findViewById<EditText>(R.id.open_with_url)
-		openWithUrlInput.setText(prefs.openWithUrl)
+	override fun onCreatePreferences(state: Bundle?, rootKey: String?) {
+		addPreferencesFromResource(R.xml.preferences)
+		activity?.setTitle(R.string.preferences)
+		wireClearNetworkPreferences()
+	}

-		return view
+	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
+			}
+		)
+	}
+
+	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.useHistory = useHistorySwitch.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)
+}
@@ -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
+}
@@ -1,39 +1,66 @@
 package de.markusfisch.android.binaryeye.graphics

+import android.content.ContentResolver
 import android.graphics.Bitmap
+import android.graphics.BitmapFactory
 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 downsizeIfBigger(bitmap: Bitmap, maxSize: Int): Bitmap = if (
-	max(bitmap.width, bitmap.height) > maxSize
-) {
-	val srcWidth = bitmap.width
-	val srcHeight = bitmap.height
-	var newWidth = maxSize
-	var newHeight = maxSize
-	if (srcWidth > srcHeight) {
-		newHeight = (newWidth.toFloat() / srcWidth.toFloat() *
-				srcHeight.toFloat()).roundToInt()
-	} else {
-		newWidth = (newHeight.toFloat() / srcHeight.toFloat() *
-				srcWidth.toFloat()).roundToInt()
+fun ContentResolver.loadImageUri(uri: Uri): Bitmap? = try {
+	val options = BitmapFactory.Options()
+	openInputStream(uri)?.use {
+		options.inJustDecodeBounds = true
+		BitmapFactory.decodeStream(it, null, options)
+		options.inSampleSize = calculateInSampleSize(
+			options.outWidth,
+			options.outHeight
+		)
+		options.inJustDecodeBounds = false
 	}
-	Bitmap.createScaledBitmap(bitmap, newWidth, newHeight, true)
-} else {
-	bitmap
+	openInputStream(uri)?.use {
+		BitmapFactory.decodeStream(it, null, options)
+	}
+} catch (e: IOException) {
+	null
 }

-fun crop(bitmap: Bitmap, rect: RectF, rotation: Float) = try {
-	val w = bitmap.width
-	val h = bitmap.height
+private fun calculateInSampleSize(
+	width: Int,
+	height: Int,
+	reqWidth: Int = 1024,
+	reqHeight: Int = 1024
+): Int {
+	var inSampleSize = 1
+	if (height > reqHeight || width > reqWidth) {
+		val halfHeight = height / 2
+		val halfWidth = width / 2
+		while (
+			halfHeight / inSampleSize >= reqHeight ||
+			halfWidth / inSampleSize >= reqWidth
+		) {
+			inSampleSize *= 2
+		}
+	}
+	return inSampleSize
+}
+
+fun Bitmap.crop(rect: RectF, rotation: Float) = try {
+	val erected = erect(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(
-		erect(bitmap, rotation),
-		(rect.left * w).roundToInt(),
-		(rect.top * h).roundToInt(),
-		(rect.width() * w).roundToInt(),
-		(rect.height() * h).roundToInt()
+		erected,
+		x,
+		y,
+		min(w - x, (rect.right * w).roundToInt() - x),
+		min(h - y, (rect.bottom * h).roundToInt() - y)
 	)
 } catch (e: OutOfMemoryError) {
 	null
@@ -41,20 +68,20 @@ fun crop(bitmap: Bitmap, rect: RectF, rotation: Float) = try {
 	null
 }

-private fun erect(bitmap: Bitmap, rotation: Float): Bitmap = if (
+private fun Bitmap.erect(rotation: Float): Bitmap = if (
 	rotation % 360f != 0f
 ) {
-	val matrix = Matrix()
-	matrix.setRotate(rotation)
 	Bitmap.createBitmap(
-		bitmap,
+		this,
 		0,
 		0,
-		bitmap.width,
-		bitmap.height,
-		matrix,
+		width,
+		height,
+		Matrix().apply {
+			setRotate(rotation)
+		},
 		true
 	)
 } else {
-	bitmap
+	this
 }
@@ -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)
+}
@@ -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
+}
@@ -0,0 +1,62 @@
+package de.markusfisch.android.binaryeye.graphics
+
+import android.graphics.Matrix
+import android.graphics.Rect
+import com.google.zxing.ResultPoint
+
+fun mapResultToView(
+	frameWidth: Int,
+	frameHeight: Int,
+	frameOrientation: Int,
+	viewRect: Rect,
+	resultPoints: Array<ResultPoint?>,
+	targetArray: FloatArray
+): Int = getFrameToViewMatrix(
+	frameWidth,
+	frameHeight,
+	frameOrientation,
+	viewRect
+).map(
+	resultPoints,
+	targetArray
+)
+
+fun getFrameToViewMatrix(
+	frameWidth: Int,
+	frameHeight: Int,
+	frameOrientation: Int,
+	viewRect: Rect
+) = Matrix().apply {
+	// Normalize to frame dimensions for rotation.
+	postScale(
+		1f / frameWidth,
+		1f / frameHeight
+	)
+	// Rotate around center.
+	postRotate(frameOrientation.toFloat(), 0.5f, 0.5f)
+	// Scale up to view size.
+	postScale(viewRect.width().toFloat(), viewRect.height().toFloat())
+	// Apply view displacement.
+	postTranslate(viewRect.left.toFloat(), viewRect.top.toFloat())
+}
+
+fun 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
+}
@@ -0,0 +1,85 @@
+package de.markusfisch.android.binaryeye.io
+
+import android.app.Activity
+import android.content.ContentValues
+import android.content.Context
+import android.os.Build
+import android.os.Environment
+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
+import java.io.OutputStream
+
+fun addSuffixIfNotGiven(name: String, suffix: String): String {
+	val trimmed = name.trim()
+	return if (suffix.isNotEmpty() && !trimmed.endsWith(suffix)) {
+		"$trimmed$suffix"
+	} else {
+		trimmed
+	}
+}
+
+// Dialogs doesn't have any root layout, need to be inflated with null root
+@Suppress("InflateParams")
+@MainThread
+suspend fun Activity.askForFileName(suffix: String = ""): String? {
+	val view = layoutInflater.inflate(R.layout.dialog_save_file, null)
+	val editText = view.findViewById<EditText>(R.id.file_name)
+	return alertDialog<String>(this as Context) { resume ->
+		setView(view)
+		setPositiveButton(android.R.string.ok) { _, _ ->
+			resume(editText.text.toString())
+		}
+	}?.let { name ->
+		addSuffixIfNotGiven(name, suffix)
+	}
+}
+
+fun Boolean.toSaveResult() = if (this) {
+	R.string.saved_in_downloads
+} else {
+	R.string.error_saving_file
+}
+
+fun Context.writeExternalFile(
+	fileName: String,
+	mimeType: String,
+	write: (outputStream: OutputStream) -> Unit
+): Boolean = try {
+	openExternalOutputStream(fileName, mimeType).use { write(it) }
+	true
+} catch (e: IOException) {
+	false
+}
+
+private fun Context.openExternalOutputStream(
+	fileName: String,
+	mimeType: String
+): OutputStream = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+	@Suppress("DEPRECATION")
+	val file = File(
+		Environment.getExternalStoragePublicDirectory(
+			Environment.DIRECTORY_DOWNLOADS
+		),
+		fileName
+	)
+	if (file.exists()) {
+		throw IOException()
+	}
+	FileOutputStream(file)
+} else {
+	val resolver = contentResolver
+	val uri = resolver.insert(
+		MediaStore.Downloads.EXTERNAL_CONTENT_URI,
+		ContentValues().apply {
+			put(MediaStore.Downloads.DISPLAY_NAME, fileName)
+			put(MediaStore.Downloads.MIME_TYPE, mimeType)
+		}
+	) ?: throw IOException()
+	resolver.openOutputStream(uri) ?: throw IOException()
+}
@@ -0,0 +1,124 @@
+package de.markusfisch.android.binaryeye.net
+
+import de.markusfisch.android.binaryeye.app.toHexString
+import de.markusfisch.android.binaryeye.app.urlEncode
+import de.markusfisch.android.binaryeye.database.Scan
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+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
+
+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 + content.urlEncode()
+		)
+	}
+}
+
+private fun Scan.asUrlArguments(): String = getMap().map { (k, v) ->
+	"${k}=${v.urlEncode()}"
+}.joinToString("&")
+
+private fun Scan.asJson() = JSONObject().apply {
+	getMap().forEach { (k, v) -> put(k, v) }
+}
+
+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 dateTime
+).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?)
@@ -0,0 +1,62 @@
+package de.markusfisch.android.binaryeye.os
+
+import android.content.Context
+import android.os.Build
+import android.os.VibrationEffect
+import android.os.Vibrator
+import android.os.VibratorManager
+import de.markusfisch.android.binaryeye.app.prefs
+
+private const val DURATION_IN_MS = 100L
+
+private val beforeO = Build.VERSION.SDK_INT < Build.VERSION_CODES.O
+private val errorPatternTimings = longArrayOf(
+	50L, 100L, 50L, 100L, 50L
+)
+private val errorPatternAmplitudes = intArrayOf(
+	255, 0, 255, 0, 255
+)
+
+fun Context.getVibrator(): Vibrator = if (
+	Build.VERSION.SDK_INT < Build.VERSION_CODES.S
+) {
+	@Suppress("DEPRECATION")
+	getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
+} else {
+	(getSystemService(
+		Context.VIBRATOR_MANAGER_SERVICE
+	) as VibratorManager).defaultVibrator
+}
+
+fun Vibrator.vibrate() {
+	if (!prefs.vibrate) {
+		return
+	} else if (beforeO) {
+		@Suppress("DEPRECATION")
+		vibrate(DURATION_IN_MS)
+	} else {
+		vibrate(
+			VibrationEffect.createOneShot(
+				DURATION_IN_MS,
+				VibrationEffect.DEFAULT_AMPLITUDE
+			)
+		)
+	}
+}
+
+fun Vibrator.error() {
+	if (!prefs.vibrate) {
+		return
+	} else if (beforeO) {
+		@Suppress("DEPRECATION")
+		vibrate(errorPatternTimings, -1)
+	} else {
+		vibrate(
+			VibrationEffect.createWaveform(
+				errorPatternTimings,
+				errorPatternAmplitudes,
+				-1
+			)
+		)
+	}
+}
@@ -2,19 +2,182 @@ 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 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) {
+			apply(BARCODE_FORMATS, value)
+			field = value
+		}
+	var cropHandleX = -2 // -2 means set default roi.
+		set(value) {
+			apply(CROP_HANDLE_X, value)
+			field = value
+		}
+	var cropHandleY = -2
+		set(value) {
+			apply(CROP_HANDLE_Y, value)
+			field = value
+		}
+	var cropHandleOrientation = 0
+		set(value) {
+			apply(CROP_HANDLE_ORIENTATION, value)
+			field = value
+		}
+	var showCropHandle = true
+		set(value) {
+			apply(SHOW_CROP_HANDLE, value)
+			field = value
+		}
+	var zoomBySwiping = true
+		set(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) {
+			// 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) {
-			setBoolean(USE_HISTORY, 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 showQrVersion = false
+		set(value) {
+			apply(SHOW_QR_VERSION, 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 sendScanActive = true
+		set(value) {
+			apply(SEND_SCAN_ACTIVE, 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) {
+			apply(INDEX_OF_LAST_SELECTED_FORMAT, value)
+			field = value
+		}
+	var forceCompat = 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
 		}

@@ -24,24 +187,139 @@ class Preferences {
 	}

 	fun update() {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+			preferences.getStringSet(BARCODE_FORMATS, barcodeFormats)?.let {
+				barcodeFormats = it
+			}
+		}
+		cropHandleX = preferences.getInt(CROP_HANDLE_X, cropHandleX)
+		cropHandleY = preferences.getInt(CROP_HANDLE_Y, cropHandleY)
+		cropHandleOrientation = preferences.getInt(
+			CROP_HANDLE_ORIENTATION,
+			cropHandleOrientation
+		)
+		showCropHandle = preferences.getBoolean(
+			SHOW_CROP_HANDLE,
+			showCropHandle
+		)
+		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)
-		openWithUrl = preferences.getString(OPEN_WITH_URL, openWithUrl)
+		ignoreConsecutiveDuplicates = preferences.getBoolean(
+			IGNORE_CONSECUTIVE_DUPLICATES,
+			ignoreConsecutiveDuplicates
+		)
+		copyImmediately = preferences.getBoolean(
+			COPY_IMMEDIATELY,
+			copyImmediately
+		)
+		openImmediately = preferences.getBoolean(
+			OPEN_IMMEDIATELY,
+			openImmediately
+		)
+		showMetaData = preferences.getBoolean(SHOW_META_DATA, showMetaData)
+		showQrVersion = preferences.getBoolean(SHOW_QR_VERSION, showQrVersion)
+		showHexDump = preferences.getBoolean(SHOW_HEX_DUMP, showHexDump)
+		closeAutomatically = preferences.getBoolean(
+			CLOSE_AUTOMATICALLY,
+			closeAutomatically
+		)
+		preferences.getString(DEFAULT_SEARCH_URL, defaultSearchUrl)?.also {
+			defaultSearchUrl = it
+		}
+		preferences.getString(OPEN_WITH_URL, openWithUrl)?.also {
+			openWithUrl = it
+		}
+		sendScanActive = preferences.getBoolean(
+			SEND_SCAN_ACTIVE,
+			sendScanActive
+		)
+		preferences.getString(SEND_SCAN_URL, sendScanUrl)?.also {
+			sendScanUrl = it
+		}
+		preferences.getString(SEND_SCAN_TYPE, sendScanType)?.also {
+			sendScanType = it
+		}
+		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 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 USE_HISTORY = "use_history"
-		const val OPEN_WITH_URL = "open_with_url"
+		private const val BARCODE_FORMATS = "barcode_formats"
+		private const val CROP_HANDLE_X = "crop_handle_x"
+		private const val CROP_HANDLE_Y = "crop_handle_y"
+		private const val CROP_HANDLE_ORIENTATION = "crop_handle_orientation"
+		private const val SHOW_CROP_HANDLE = "show_crop_handle"
+		private const val ZOOM_BY_SWIPING = "zoom_by_swiping"
+		private const val AUTO_ROTATE = "auto_rotate"
+		private const val TRY_HARDER = "try_harder"
+		private const val BULK_MODE = "bulk_mode"
+		private const val BULK_MODE_DELAY = "bulk_mode_delay"
+		private const val SHOW_TOAST_IN_BULK_MODE = "show_toast_in_bulk_mode"
+		private const val VIBRATE = "vibrate"
+		private const val USE_HISTORY = "use_history"
+		private const val IGNORE_CONSECUTIVE_DUPLICATES = "ignore_consecutive_duplicates"
+		private const val OPEN_IMMEDIATELY = "open_immediately"
+		private const val COPY_IMMEDIATELY = "copy_immediately"
+		private const val SHOW_META_DATA = "show_meta_data"
+		private const val SHOW_QR_VERSION = "show_qr_version"
+		private const val SHOW_HEX_DUMP = "show_hex_dump"
+		private const val CLOSE_AUTOMATICALLY = "close_automatically"
+		private const val DEFAULT_SEARCH_URL = "default_search_url"
+		private const val OPEN_WITH_URL = "open_with_url"
+		private const val SEND_SCAN_ACTIVE = "send_scan_active"
+		private const val SEND_SCAN_URL = "send_scan_url"
+		private const val SEND_SCAN_TYPE = "send_scan_type"
+		private const val CUSTOM_LOCALE = "custom_locale"
+		private const val INDEX_OF_LAST_SELECTED_FORMAT = "index_of_last_selected_format"
+		private const val FORCE_COMPAT = "force_compat"
 	}
 }
@@ -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
+			}
+		)
+	}
+}
@@ -1,124 +0,0 @@
-package de.markusfisch.android.binaryeye.repository
-
-import android.content.Context
-import android.database.Cursor
-import de.markusfisch.android.binaryeye.data.Database
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.map
-
-class DatabaseRepository {
-	private val db = Database()
-
-	fun open(applicationContext: Context) {
-		db.open(applicationContext)
-	}
-
-	fun getScan(id: Long): Scan? = getScan(id) { _, cursor ->
-		val timeIndex = cursor.getColumnIndex(Database.SCANS_DATETIME)
-		val contentIndex = cursor.getColumnIndex(Database.SCANS_CONTENT)
-		val rawIndex = cursor.getColumnIndex(Database.SCANS_RAW)
-		val formatIndex = cursor.getColumnIndex(Database.SCANS_FORMAT)
-		Scan(
-			id = id,
-			timestamp = cursor.getString(timeIndex),
-			content = cursor.getString(contentIndex),
-			raw = cursor.getBlob(rawIndex),
-			format = cursor.getString(formatIndex)
-		)
-	}
-
-	fun <T> getScan(id: Long, map: (id: Long, Cursor) -> T): T? =
-		db.getScan(id)?.use { map(id, it.apply { moveToFirst() }) }
-
-	fun getScans(): Flow<SimpleScan> = getScans { cursor ->
-		val idIndex = cursor.getColumnIndex(Database.SCANS_ID)
-		val timeIndex = cursor.getColumnIndex(Database.SCANS_DATETIME)
-		val contentIndex = cursor.getColumnIndex(Database.SCANS_CONTENT)
-		val formatIndex = cursor.getColumnIndex(Database.SCANS_FORMAT)
-		SimpleScan(
-			id = cursor.getLong(idIndex),
-			timestamp = cursor.getString(timeIndex),
-			content = cursor.getString(contentIndex),
-			format = cursor.getString(formatIndex)
-		)
-	}
-
-	fun <T> getScans(map: suspend (Cursor) -> T): Flow<T> = flow {
-		db.getScans()?.use { results ->
-			results.asIterable.forEach {
-				emit(it)
-			}
-		}
-	}.map(map).flowOn(Dispatchers.IO)
-
-	fun getScansCursor(): Cursor? = db.getScans()
-
-	fun hasBinaryData() = db.hasBinaryData()?.use { it.count > 0 } ?: false
-
-	fun insertScan(
-		timestamp: Long,
-		content: String,
-		raw: ByteArray?,
-		format: String
-	): Long = db.insertScan(timestamp, content, raw, format)
-
-	fun removeScan(id: Long) = db.removeScan(id)
-
-	fun removeScans() = db.removeScans()
-
-	data class SimpleScan(
-		val id: Long,
-		val timestamp: String,
-		val content: String,
-		val format: String
-	)
-
-	data class Scan(
-		val id: Long,
-		val timestamp: String,
-		val content: String,
-		val raw: ByteArray?,
-		val format: String
-	) {
-		// Needed to be overwritten manually, as ByteArray is an array and this isn't handled well by Kotlin
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as Scan
-
-			if (id != other.id) return false
-			if (timestamp != other.timestamp) return false
-			if (content != other.content) return false
-			if (raw != null) {
-				if (other.raw == null) return false
-				if (!raw.contentEquals(other.raw)) return false
-			} else if (other.raw != null) return false
-			if (format != other.format) return false
-
-			return true
-		}
-
-		// Needed to be overwritten manually, as ByteArray is an array and this isn't handled well by Kotlin
-		override fun hashCode(): Int {
-			var result = id.hashCode()
-			result = 31 * result + timestamp.hashCode()
-			result = 31 * result + content.hashCode()
-			result = 31 * result + (raw?.contentHashCode() ?: 0)
-			result = 31 * result + format.hashCode()
-			return result
-		}
-	}
-}
-
-private val Cursor.asIterable: Iterable<Cursor>
-	get() = object : Iterable<Cursor> {
-		override fun iterator(): Iterator<Cursor> = object : Iterator<Cursor> {
-			override fun hasNext(): Boolean = position + 1 < count
-			override fun next(): Cursor =
-				if (moveToNext()) this@asIterable else throw IllegalStateException("You can't access more items, then there are")
-		}
-	}
@@ -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
+)
@@ -1,24 +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
@@ -37,15 +41,42 @@ class Preprocessor(
 			Allocation.USAGE_SCRIPT
 		)

-		val f = .75f
-		var w = Math.round(width * f)
-		var h = Math.round(height * f)
+		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,
@@ -53,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() {
@@ -82,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()
@@ -91,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)
 	}
 }
@@ -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)
+	}
+}
@@ -0,0 +1,13 @@
+package de.markusfisch.android.binaryeye.view
+
+import android.content.Context
+import android.view.View
+import android.view.inputmethod.InputMethodManager
+
+fun Context.hideSoftKeyboard(view: View) {
+	(getSystemService(
+		Context.INPUT_METHOD_SERVICE
+	) as InputMethodManager).hideSoftInputFromWindow(
+		view.windowToken, 0
+	)
+}
@@ -0,0 +1,131 @@
+package de.markusfisch.android.binaryeye.view
+
+import android.content.Context
+import android.content.ContextWrapper
+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 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.
+		view.post {
+			val scrolled = firstVisibleItem > 0 ||
+					(totalItemCount > 0 && firstChildScrolled(view))
+			val scrollable = scrolled || totalItemCount > 0 && lastChildOutOfView(view)
+			colorSystemAndToolBars(view.context, scrolled, scrollable)
+		}
+	}
+
+	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) {
+	}
+}
+
+private fun firstChildScrolled(listView: AbsListView): Boolean {
+	val child = listView.getChildAt(0)
+	return child != null && child.top < listView.paddingTop
+}
+
+private fun lastChildOutOfView(listView: AbsListView): Boolean {
+	val child = listView.getChildAt(listView.lastVisiblePosition)
+	return child != null && child.bottom >= listView.height
+}
+
+fun initSystemBars(activity: AppCompatActivity) {
+	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+		// 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
+	}
+	colorSystemAndToolBars(activity)
+}
+
+private var statusBarColorLocked = false
+fun lockStatusBarColor() {
+	statusBarColorLocked = true
+}
+
+fun unlockStatusBarColor() {
+	statusBarColorLocked = false
+}
+
+private var translucentPrimaryColor = 0
+private val actionBarBackground = ColorDrawable()
+fun colorSystemAndToolBars(
+	context: Context,
+	scrolled: Boolean = false,
+	scrollable: Boolean = false
+) {
+	if (translucentPrimaryColor == 0) {
+		translucentPrimaryColor = ContextCompat.getColor(
+			context,
+			R.color.primary_translucent
+		)
+	}
+	val topColor = if (scrolled) translucentPrimaryColor else 0
+	val activity = getAppCompatActivity(context) ?: return
+	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+		val window = activity.window
+		if (!statusBarColorLocked) {
+			window.statusBarColor = topColor
+		}
+		window.navigationBarColor = if (scrolled || scrollable) {
+			translucentPrimaryColor
+		} else {
+			0
+		}
+	}
+	activity.supportActionBar?.setBackgroundDrawable(
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+			// Avoid allocation on Honeycomb and better.
+			actionBarBackground.color = topColor
+			actionBarBackground
+		} else {
+			// ColorDrawable.setColor() doesn't exist pre Honeycomb.
+			ColorDrawable(topColor)
+		}
+	)
+}
+
+private fun getAppCompatActivity(context: Context): AppCompatActivity? {
+	var ctx = context
+	while (ctx is ContextWrapper) {
+		if (ctx is AppCompatActivity) {
+			return ctx
+		}
+		ctx = ctx.baseContext ?: break
+	}
+	return null
+}
@@ -0,0 +1,35 @@
+package de.markusfisch.android.binaryeye.view
+
+import android.graphics.Rect
+import android.view.View
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+suspend inline fun View.useVisibility(
+	whileExecuting: Int = View.VISIBLE,
+	otherwise: Int = View.GONE,
+	crossinline block: suspend () -> Unit
+) {
+	if (visibility == whileExecuting) {
+		return
+	}
+	withContext(Dispatchers.Main) {
+		visibility = whileExecuting
+	}
+	try {
+		block()
+	} finally {
+		withContext(Dispatchers.Main) {
+			visibility = otherwise
+		}
+	}
+}
+
+fun View.setPadding(rect: Rect) {
+	this.setPadding(
+		rect.left,
+		rect.top,
+		rect.right,
+		rect.bottom
+	)
+}
@@ -0,0 +1,61 @@
+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 var toolbarHeight = 0
+fun recordToolbarHeight(toolbar: Toolbar) {
+	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) {
+		f(this, insetsWithToolbar())
+	} else {
+		ViewCompat.setOnApplyWindowInsetsListener(this) { v, insets ->
+			f(v, insetsWithToolbar(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
+		})
+	}
+}
@@ -2,11 +2,14 @@ package de.markusfisch.android.binaryeye.widget

 import android.content.Context
 import android.graphics.Canvas
+import android.graphics.Rect
 import android.util.AttributeSet
-import de.markusfisch.android.binaryeye.app.setSystemAndToolBarTransparency
+import de.markusfisch.android.binaryeye.view.colorSystemAndToolBars
 import de.markusfisch.android.scalingimageview.widget.ScalingImageView

 open class ConfinedScalingImageView : ScalingImageView {
+	val insets = Rect()
+
 	constructor(context: Context, attrs: AttributeSet, defStyle: Int) :
 			super(context, attrs, defStyle)

@@ -15,6 +18,24 @@ open class ConfinedScalingImageView : ScalingImageView {

 	override fun onDraw(canvas: Canvas) {
 		super.onDraw(canvas)
-		setSystemAndToolBarTransparency(context, !bounds.contains(mappedRect))
+		colorSystemAndToolBars(context, !bounds.contains(mappedRect))
+	}
+
+	override fun layoutImage(
+		changed: Boolean,
+		left: Int,
+		top: Int,
+		right: Int,
+		bottom: Int
+	) {
+		if (changed) {
+			setBounds(
+				(left + insets.left).toFloat(),
+				(top + insets.top).toFloat(),
+				(right - insets.right).toFloat(),
+				(bottom - insets.bottom).toFloat()
+			)
+		}
+		centerRemap()
 	}
 }
@@ -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.setSystemAndToolBarTransparency
+import de.markusfisch.android.binaryeye.view.colorSystemAndToolBars

 class ConfinedScrollView : ScrollView {
 	private var scrollable = false
@@ -23,14 +23,14 @@ 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
-					setSystemAndToolBarTransparency(
+					colorSystemAndToolBars(
 						context,
-						false,
+						scrollY > 0,
 						scrollable
 					)
 				}
@@ -40,6 +40,6 @@ class ConfinedScrollView : ScrollView {

 	override fun onScrollChanged(x: Int, y: Int, oldx: Int, oldy: Int) {
 		super.onScrollChanged(x, y, oldx, oldy)
-		setSystemAndToolBarTransparency(context, y > 0, scrollable)
+		colorSystemAndToolBars(context, y > 0, scrollable)
 	}
 }
@@ -2,65 +2,32 @@ package de.markusfisch.android.binaryeye.widget

 import android.content.Context
 import android.graphics.Canvas
-import android.graphics.Paint
-import android.support.v4.content.ContextCompat
+import android.graphics.Rect
+import android.graphics.RectF
 import android.util.AttributeSet
-import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.app.windowInsets
 import kotlin.math.roundToInt

 class CropImageView(context: Context, attr: AttributeSet) :
 	ConfinedScalingImageView(context, attr) {
-	private val paint = Paint(Paint.ANTI_ALIAS_FLAG)
-	private val padding: Int = (context.resources.displayMetrics.density * 24f).roundToInt()
+	var onScan: (() -> Unit)? = null

-	init {
-		paint.color = ContextCompat.getColor(context, R.color.crop_bound)
-		paint.style = Paint.Style.STROKE
-		scaleType = ScaleType.CENTER_CROP
-	}
+	private val lastMappedRect = RectF()
+	private val onScanRunnable = Runnable { onScan?.invoke() }

-	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 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)
-	}
+	fun getBoundsRect() = Rect(
+		bounds.left.roundToInt(),
+		bounds.top.roundToInt(),
+		bounds.right.roundToInt(),
+		bounds.bottom.roundToInt()
+	)

 	override fun onDraw(canvas: Canvas) {
 		super.onDraw(canvas)
-		canvas.drawRect(bounds, paint)
+		val mr = mappedRect ?: return
+		if (mr != lastMappedRect) {
+			removeCallbacks(onScanRunnable)
+			postDelayed(onScanRunnable, 300)
+			lastMappedRect.set(mr)
+		}
 	}
 }
--- a/Show More
+++ b/Show More