Convert charset for PDF417 in an extension

And run it from PickActivity too to apply this conversion when
scanning from still images too.

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

@@ -461,18 +461,7 @@ class CameraActivity : AppCompatActivity() {
 							frameOrientation
 						)?.let { result ->
 							if (result.text != ignoreNext) {
-								if (result.barcodeFormat == BarcodeFormat.PDF_417 && result.text != null) {
-									val iso88591Text = result.text.toByteArray(Charset.forName("ISO-8859-1"))
-									val utf8Text = String(iso88591Text, Charset.forName("UTF-8"))
-									postResult(Result(utf8Text,
-										result.rawBytes,
-										result.numBits,
-										result.resultPoints,
-										result.barcodeFormat,
-										result.timestamp))
-								} else {
-									postResult(result)
-								}
+								postResult(result.redact())
 								decoding = false
 							}
 						}
@@ -790,6 +779,25 @@ class CameraActivity : AppCompatActivity() {
 	}
 }
 
+fun Result.redact() = if (
+	barcodeFormat == BarcodeFormat.PDF_417 &&
+	text != null
+) {
+	Result(
+		String(
+			text.toByteArray(Charset.forName("ISO-8859-1")),
+			Charset.forName("UTF-8")
+		),
+		rawBytes,
+		numBits,
+		resultPoints,
+		barcodeFormat,
+		timestamp
+	)
+} else {
+	this
+}
+
 fun showResult(
 	activity: Activity,
 	result: Result,

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

@@ -201,7 +201,7 @@ class PickActivity : AppCompatActivity() {
 	private fun showResult() {
 		val r = result
 		if (r != null) {
-			showResult(this, r, vibrator)
+			showResult(this, r.redact(), vibrator)
 			finish()
 		} else {
 			applicationContext.toast(R.string.no_barcode_found)