From e831f1f29e20365361db8befceb3e10ea1ffaf9e Mon Sep 17 00:00:00 2001
From: Maximilian Richt <richt@rami.io>
Date: Wed, 2 Oct 2024 15:45:53 +0200
Subject: [PATCH 1/5] Add support for HID qr code scanners to the pretixSCAN
 setup

---
 .../pretixscan/droid/ui/SetupActivity.kt      | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/SetupActivity.kt b/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/SetupActivity.kt
index fd3f3dc..4d38ca8 100644
--- a/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/SetupActivity.kt
+++ b/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/SetupActivity.kt
@@ -6,7 +6,9 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
+import android.text.Editable
 import android.util.Log
+import android.view.KeyEvent
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
@@ -31,6 +33,8 @@ import org.json.JSONObject
 import java.io.IOException
 import java.lang.Exception
 import javax.net.ssl.SSLException
+import android.text.method.TextKeyListener.Capitalize
+import android.text.method.TextKeyListener
 
 class SetupActivity : AppCompatActivity(), ScannerView.ResultHandler {
     lateinit var binding: ActivitySetupBinding
@@ -39,6 +43,8 @@ class SetupActivity : AppCompatActivity(), ScannerView.ResultHandler {
     var lastScanValue = ""
     var conf: AppConfig? = null
     var currentOpenAlert: AppCompatDialog? = null
+    var tkl = TextKeyListener(Capitalize.NONE, false)
+    var keyboardEditable = Editable.Factory.getInstance().newEditable("")
     private var ongoing_setup = false
     private val dataWedgeHelper = DataWedgeHelper(this)
     private val LOG_TAG = this::class.java.name
@@ -129,6 +135,25 @@ class SetupActivity : AppCompatActivity(), ScannerView.ResultHandler {
         handleScan(rawResult.text)
     }
 
+    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+        if (event.keyCode == KeyEvent.KEYCODE_ENTER) {
+            if (event.action == KeyEvent.ACTION_UP) {
+                handleScan(keyboardEditable.toString())
+                keyboardEditable.clear()
+            }
+            return true
+        }
+        val processed = when (event.action) {
+            KeyEvent.ACTION_DOWN -> tkl.onKeyDown(null, keyboardEditable, event.keyCode, event)
+            KeyEvent.ACTION_UP -> tkl.onKeyUp(null, keyboardEditable, event.keyCode, event)
+            else -> tkl.onKeyOther(null, keyboardEditable, event)
+        }
+        if (processed) {
+            return true
+        }
+        return super.dispatchKeyEvent(event)
+    }
+
     fun handleScan(res: String) {
         try {
             val jd = JSONObject(res)

From 6492b759924e49d756e90a6cc65af9e8407676c2 Mon Sep 17 00:00:00 2001
From: Maximilian Richt <richt@rami.io>
Date: Thu, 21 Nov 2024 18:45:26 +0100
Subject: [PATCH 2/5] Use common setup ui from libpretixui

---
 .../pretixscan/droid/ui/SetupActivity.kt      | 378 +++---------------
 .../src/main/res/layout/activity_setup.xml    |  86 +---
 .../main/res/layout/dialog_setup_manual.xml   |  36 --
 .../app/src/main/res/menu/menu_setup.xml      |   8 -
 .../app/src/main/res/values-de/strings.xml    |  15 -
 .../app/src/main/res/values/strings.xml       |  13 -
 pretixscan/libpretixui-repo                   |   2 +-
 7 files changed, 71 insertions(+), 467 deletions(-)
 delete mode 100644 pretixscan/app/src/main/res/layout/dialog_setup_manual.xml
 delete mode 100644 pretixscan/app/src/main/res/menu/menu_setup.xml

diff --git a/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/SetupActivity.kt b/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/SetupActivity.kt
index 4d38ca8..cd633af 100644
--- a/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/SetupActivity.kt
+++ b/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/SetupActivity.kt
@@ -1,71 +1,45 @@
 package eu.pretix.pretixscan.droid.ui
 
-import android.Manifest
-import android.app.ProgressDialog
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
-import android.text.Editable
-import android.util.Log
 import android.view.KeyEvent
-import android.view.Menu
-import android.view.MenuItem
-import android.view.View
-import android.widget.EditText
-import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.app.AppCompatDialog
-import androidx.core.content.ContextCompat
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import eu.pretix.libpretixsync.setup.*
-import eu.pretix.libpretixui.android.scanning.HardwareScanner
-import eu.pretix.libpretixui.android.scanning.ScanReceiver
-import eu.pretix.libpretixui.android.scanning.ScannerView
-import eu.pretix.pretixscan.droid.*
-import eu.pretix.pretixscan.droid.databinding.ActivitySetupBinding
+import androidx.core.os.bundleOf
+import androidx.fragment.app.commit
+import androidx.fragment.app.replace
+import eu.pretix.libpretixsync.setup.SetupManager
+import eu.pretix.libpretixui.android.setup.SetupCallable
+import eu.pretix.libpretixui.android.setup.SetupFragment
+import eu.pretix.pretixscan.droid.AndroidHttpClientFactory
+import eu.pretix.pretixscan.droid.AppConfig
+import eu.pretix.pretixscan.droid.BuildConfig
+import eu.pretix.pretixscan.droid.PretixScan
+import eu.pretix.pretixscan.droid.R
 import io.sentry.Sentry
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import org.json.JSONException
-import org.json.JSONObject
 import java.io.IOException
 import java.lang.Exception
-import javax.net.ssl.SSLException
-import android.text.method.TextKeyListener.Capitalize
-import android.text.method.TextKeyListener
-
-class SetupActivity : AppCompatActivity(), ScannerView.ResultHandler {
-    lateinit var binding: ActivitySetupBinding
-    val bgScope = CoroutineScope(Dispatchers.IO)
-    var lastScanTime = 0L
-    var lastScanValue = ""
-    var conf: AppConfig? = null
-    var currentOpenAlert: AppCompatDialog? = null
-    var tkl = TextKeyListener(Capitalize.NONE, false)
-    var keyboardEditable = Editable.Factory.getInstance().newEditable("")
-    private var ongoing_setup = false
-    private val dataWedgeHelper = DataWedgeHelper(this)
-    private val LOG_TAG = this::class.java.name
 
+class SetupActivity : AppCompatActivity(R.layout.activity_setup), SetupCallable {
     companion object {
-        const val PERMISSIONS_REQUEST_CAMERA = 1337
+        const val FRAGMENT_TAG = "SetupFragment"
     }
 
-    private val hardwareScanner = HardwareScanner(object : ScanReceiver {
-        override fun scanResult(result: String) {
-            handleScan(result)
-        }
-    })
+    private val dataWedgeHelper = DataWedgeHelper(this)
 
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivitySetupBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        conf = AppConfig(this)
 
-        checkPermission(Manifest.permission.CAMERA, PERMISSIONS_REQUEST_CAMERA)
+        if (savedInstanceState == null) {
+            val args = bundleOf(
+                SetupFragment.ARG_DEFAULT_HOST to if (BuildConfig.APPLICATION_ID.contains("eu.pretix")) "https://pretix.eu" else ""
+            )
+            supportFragmentManager.commit {
+                setReorderingAllowed(true)
+                replace<SetupFragment>(R.id.content, FRAGMENT_TAG, args)
+            }
+        }
+
         if (dataWedgeHelper.isInstalled) {
             try {
                 dataWedgeHelper.install()
@@ -73,280 +47,60 @@ class SetupActivity : AppCompatActivity(), ScannerView.ResultHandler {
                 e.printStackTrace()
             }
         }
-        binding.btSwitchCamera.setOnClickListener {
-            if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
-                hardwareScanner.stop(this)
-                conf!!.useCamera = true
-                binding.scannerView.setResultHandler(this)
-                binding.scannerView.startCamera()
-                binding.llHardwareScan.visibility = if (conf!!.useCamera) View.GONE else View.VISIBLE
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
-            if (conf!!.useCamera) {
-                binding.scannerView.setResultHandler(this)
-                binding.scannerView.startCamera()
-            }
-        }
-        binding.llHardwareScan.visibility = if (conf!!.useCamera) View.GONE else View.VISIBLE
-        hardwareScanner.start(this)
-    }
-
-    override fun onPause() {
-        super.onPause()
-        if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
-            if (conf!!.useCamera) {
-                binding.scannerView.stopCamera()
-            }
-        }
-        hardwareScanner.stop(this)
-    }
-
-    override fun onRequestPermissionsResult(requestCode: Int,
-                                            permissions: Array<String>, grantResults: IntArray) {
-        when (requestCode) {
-            PERMISSIONS_REQUEST_CAMERA -> {
-                if ((grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
-                    if (conf!!.useCamera) {
-                        binding.scannerView.setResultHandler(this)
-                        binding.scannerView.startCamera()
-                    }
-                } else {
-                    Toast.makeText(this, getString(R.string.setup_grant_camera_permission), Toast.LENGTH_SHORT).show()
-                }
-                return
-            }
-            else -> {
-                super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-            }
-        }
-    }
-
-    override fun handleResult(rawResult: ScannerView.Result) {
-        if (lastScanValue == rawResult.text && lastScanTime > System.currentTimeMillis() - 3000) {
-            return
-        }
-        lastScanValue = rawResult.text
-        lastScanTime = System.currentTimeMillis()
-        handleScan(rawResult.text)
     }
 
     override fun dispatchKeyEvent(event: KeyEvent): Boolean {
-        if (event.keyCode == KeyEvent.KEYCODE_ENTER) {
-            if (event.action == KeyEvent.ACTION_UP) {
-                handleScan(keyboardEditable.toString())
-                keyboardEditable.clear()
-            }
-            return true
-        }
-        val processed = when (event.action) {
-            KeyEvent.ACTION_DOWN -> tkl.onKeyDown(null, keyboardEditable, event.keyCode, event)
-            KeyEvent.ACTION_UP -> tkl.onKeyUp(null, keyboardEditable, event.keyCode, event)
-            else -> tkl.onKeyOther(null, keyboardEditable, event)
-        }
-        if (processed) {
+        val frag = supportFragmentManager.findFragmentByTag(FRAGMENT_TAG)
+        if (frag != null && (frag as SetupFragment).dispatchKeyEvent(event)) {
             return true
         }
         return super.dispatchKeyEvent(event)
     }
 
-    fun handleScan(res: String) {
-        try {
-            val jd = JSONObject(res)
-            if (jd.has("version")) {
-                alert(R.string.setup_error_legacy_qr_code)
-                return
-            }
-            if (!jd.has("handshake_version")) {
-                alert(R.string.setup_error_invalid_qr_code)
-                return
-            }
-            if (jd.getInt("handshake_version") > 1) {
-                alert(R.string.setup_error_version_too_high)
-                return
-            }
-            if (!jd.has("url") || !jd.has("token")) {
-                alert(R.string.setup_error_invalid_qr_code)
-                return
-            }
-            initialize(jd.getString("url"), jd.getString("token"))
-        } catch (e: JSONException) {
-            alert(R.string.setup_error_invalid_qr_code)
-            return
-        }
-    }
-
-    private fun initialize(url: String, token: String) {
-        if (ongoing_setup) {
-            Log.w(LOG_TAG, "Ongoing setup. Discarding initialize with ${url} / ${token}.")
-            return
-        }
-        ongoing_setup = true
-
-        val pdialog = ProgressDialog(this).apply {
-            isIndeterminate = true
-            setMessage(getString(R.string.setup_progress))
-            setTitle(R.string.setup_progress)
-            setCanceledOnTouchOutside(false)
-            setCancelable(false)
-        }
-
-        fun resume() {
-            pdialog.dismiss()
-            ongoing_setup = false
-        }
-
-        pdialog.show()
-
-        val activity = this as SetupActivity
-        bgScope.launch {
-            val setupm = SetupManager(
-                    Build.BRAND, Build.MODEL,
-                    (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) Build.VERSION.BASE_OS else "").ifEmpty { "Android" },
-                    Build.VERSION.RELEASE,
-                    "pretixSCAN Android", BuildConfig.VERSION_NAME,
-                    AndroidHttpClientFactory(application as PretixScan)
-            )
-            try {
-                val init = setupm.initialize(url, token)
-                conf!!.setDeviceConfig(init.url, init.api_token, init.organizer, init.device_id, init.unique_serial, BuildConfig.VERSION_CODE)
-                conf!!.deviceKnownName = init.device_name
-                conf!!.deviceKnownGateName = init.gate_name ?: ""
-                conf!!.deviceKnownGateID = init.gate_id ?: 0
-                conf!!.proxyMode = token.startsWith("proxy=")
-                if (conf!!.proxyMode) {
-                    conf!!.autoSwitchRequested = false
-                    conf!!.syncOrders = false
-                }
-                if (init.security_profile == "pretixscan_online_kiosk") {
-                    conf!!.syncOrders = false
-                    conf!!.searchDisabled = true
-                } else if (init.security_profile == "pretixscan_online_noorders") {
-                    conf!!.syncOrders = false
-                }
-                runOnUiThread {
-                    if (isDestroyed) {
-                        return@runOnUiThread
-                    }
-                    pdialog.dismiss()
-
-                    val intent = Intent(this@SetupActivity, MainActivity::class.java)
-                    startActivity(intent)
-                    finish()
-                }
-            } catch (e: SetupBadRequestException) {
-                e.printStackTrace()
-                runOnUiThread {
-                    if (isDestroyed) {
-                        return@runOnUiThread
-                    }
-                    resume()
-                    alert(R.string.setup_error_request)
-                }
-                return@launch
-            } catch (e: SSLException) {
-                e.printStackTrace()
-                runOnUiThread {
-                    if (isDestroyed) {
-                        return@runOnUiThread
-                    }
-                    resume()
-                    alert(R.string.setup_error_ssl)
-                }
-                return@launch
-            } catch (e: IOException) {
-                e.printStackTrace()
-                runOnUiThread {
-                    if (isDestroyed) {
-                        return@runOnUiThread
-                    }
-                    resume()
-                    alert(R.string.setup_error_io)
-                }
-                return@launch
-            } catch (e: SetupServerErrorException) {
-                runOnUiThread {
-                    if (isDestroyed) {
-                        return@runOnUiThread
-                    }
-                    resume()
-                    alert(R.string.setup_error_server)
-                }
-            } catch (e: SetupBadResponseException) {
-                e.printStackTrace()
-                runOnUiThread {
-                    if (isDestroyed) {
-                        return@runOnUiThread
-                    }
-                    resume()
-                    alert(R.string.setup_error_response)
-                }
-            } catch (e: SetupException) {
-                e.printStackTrace()
-                runOnUiThread {
-                    if (isDestroyed) {
-                        return@runOnUiThread
-                    }
-                    resume()
-                    alert(e.message ?: "Unknown error")
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-                Sentry.captureException(e)
-                runOnUiThread {
-                    if (isDestroyed) {
-                        return@runOnUiThread
-                    }
-                    resume()
-                    alert(e.message ?: "Unknown error")
-                }
-            }
+    override fun setup(url: String, token: String) {
+        val conf = AppConfig(this)
+
+        val setupm = SetupManager(
+            Build.BRAND, Build.MODEL,
+            (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) Build.VERSION.BASE_OS else "").ifEmpty { "Android" },
+            Build.VERSION.RELEASE,
+            "pretixSCAN Android",
+            BuildConfig.VERSION_NAME,
+            AndroidHttpClientFactory(application as PretixScan)
+        )
+
+        val init = setupm.initialize(url, token)
+        conf.setDeviceConfig(
+            init.url,
+            init.api_token,
+            init.organizer,
+            init.device_id,
+            init.unique_serial,
+            BuildConfig.VERSION_CODE
+        )
+        conf.deviceKnownName = init.device_name
+        conf.deviceKnownGateName = init.gate_name ?: ""
+        conf.deviceKnownGateID = init.gate_id ?: 0
+        conf.proxyMode = token.startsWith("proxy=")
+        if (conf.proxyMode) {
+            conf.autoSwitchRequested = false
+            conf.syncOrders = false
+        }
+        if (init.security_profile == "pretixscan_online_kiosk") {
+            conf.syncOrders = false
+            conf.searchDisabled = true
+        } else if (init.security_profile == "pretixscan_online_noorders") {
+            conf.syncOrders = false
         }
     }
 
-    fun alert(id: Int) { alert(getString(id)) }
-    fun alert(message: CharSequence) {
-        if (currentOpenAlert != null) {
-            currentOpenAlert!!.dismiss()
-        }
-        currentOpenAlert = MaterialAlertDialogBuilder(this).setMessage(message).create()
-        currentOpenAlert!!.show()
-    }
-
-
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        val inflater = menuInflater
-        inflater.inflate(R.menu.menu_setup, menu)
-        return super.onCreateOptionsMenu(menu)
+    override fun onSucessfulSetup() {
+        val intent = Intent(this, MainActivity::class.java)
+        startActivity(intent)
+        finish()
     }
 
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.action_manual -> {
-                MaterialAlertDialogBuilder(this).apply {
-                    val view = layoutInflater.inflate(R.layout.dialog_setup_manual, null)
-                    val inputUri = view.findViewById<EditText>(R.id.input_uri)
-                    if (BuildConfig.APPLICATION_ID.contains("eu.pretix")) {
-                        inputUri.setText("https://pretix.eu")
-                    }
-                    val inputToken = view.findViewById<EditText>(R.id.input_token)
-                    setView(view)
-                    setPositiveButton(R.string.ok) { dialog, _ ->
-                        dialog.dismiss()
-                        initialize(inputUri.text.toString(), inputToken.text.toString())
-                    }
-                    setNegativeButton(android.R.string.cancel) { dialog, _ ->
-                        dialog.cancel()
-                    }
-                }.create().show()
-                return true
-            }
-        }
-        return super.onOptionsItemSelected(item)
+    override fun onGenericSetupException(e: Exception) {
+        Sentry.captureException(e)
     }
 }
diff --git a/pretixscan/app/src/main/res/layout/activity_setup.xml b/pretixscan/app/src/main/res/layout/activity_setup.xml
index 35141f0..90b9c35 100644
--- a/pretixscan/app/src/main/res/layout/activity_setup.xml
+++ b/pretixscan/app/src/main/res/layout/activity_setup.xml
@@ -1,85 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data></data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/activity_setup"
-        android:keepScreenOn="true"
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/content"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <FrameLayout
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginTop="16dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/cardView2">
-
-            <eu.pretix.libpretixui.android.scanning.ScannerView
-                android:id="@+id/scanner_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <LinearLayout
-                android:id="@+id/llHardwareScan"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/tvHardwareScan"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="32dp"
-                    android:gravity="center"
-                    android:text="@string/hardware_scanner" />
-
-                <Button
-                    android:id="@+id/btSwitchCamera"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/hardware_scanner_switch_to_camera" />
-            </LinearLayout>
-
-        </FrameLayout>
-
-        <com.google.android.material.card.MaterialCardView
-            style="?attr/materialCardViewElevatedStyle"
-            android:id="@+id/cardView2"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="16dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <TextView
-                    android:id="@+id/textView20"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginBottom="16dp"
-                    android:text="@string/tutorial_setup"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </com.google.android.material.card.MaterialCardView>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        android:layout_height="match_parent" />
 </layout>
\ No newline at end of file
diff --git a/pretixscan/app/src/main/res/layout/dialog_setup_manual.xml b/pretixscan/app/src/main/res/layout/dialog_setup_manual.xml
deleted file mode 100644
index 142069e..0000000
--- a/pretixscan/app/src/main/res/layout/dialog_setup_manual.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="16dp">
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/input_uri"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/hint_url"
-            android:inputType="textUri"
-            android:lines="1"
-            android:singleLine="true" />
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/input_token"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/hint_token"
-            android:lines="1"
-            android:singleLine="true" />
-
-    </com.google.android.material.textfield.TextInputLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/pretixscan/app/src/main/res/menu/menu_setup.xml b/pretixscan/app/src/main/res/menu/menu_setup.xml
deleted file mode 100644
index 4b6580b..0000000
--- a/pretixscan/app/src/main/res/menu/menu_setup.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".droid.ui.SetupActivity">
-    <item android:id="@+id/action_manual"
-        android:title="@string/action_manual"
-        app:showAsAction="never" />
-</menu>
diff --git a/pretixscan/app/src/main/res/values-de/strings.xml b/pretixscan/app/src/main/res/values-de/strings.xml
index 12a58c1..dc69433 100644
--- a/pretixscan/app/src/main/res/values-de/strings.xml
+++ b/pretixscan/app/src/main/res/values-de/strings.xml
@@ -50,23 +50,9 @@
     <string name="first_scanned">Zuerst gescannt: %s</string>
     <string name="datetime_format">%1$td.%1$tm.%1$tY %1$tH:%1$tM</string>
     <string name="ok">OK</string>
-    <string name="tutorial_setup">Um loszulegen, erstellen Sie ein neues Gerät im Abschnitt \"Geräte\" ihres Veranstalter-Kontos im pretix-Backend. Sie erhalten dann einen QR-Code zur Konfiguration, den Sie hier scannen können.</string>
-    <string name="setup_error_legacy_qr_code">Der gescannte QR-Code ist für einen Vorläufer dieser App gültig. Bitte gehen Sie stattdessen zum Abschnitt \"Geräte\" Ihres Veranstalterkontos und legen Sie dort ein neues Gerät an.</string>
-    <string name="setup_error_invalid_qr_code">Der QR-Code, den Sie gescannt haben, ist nicht gültig. Bitte stellen Sie sicher, dass er aus der \"Geräte\"-Sektion Ihres pretix-Veranstalterkontos stammt.</string>
-    <string name="setup_error_version_too_high">Der gescannte QR-Code ist von einer neueren pretix-Version als für diese App ausgelegt. Bitte prüfen Sie, ob es ein Update für diese App gibt!</string>
-    <string name="setup_progress">Initialisiere Gerät…</string>
-    <string name="setup_error_request">Anfrage vom Server abgelehnt, bitte prüfen Sie Ihre Eingabe.</string>
-    <string name="setup_error_io">Verbindungsfehler beim Versuch, den Server zu erreichen.</string>
-    <string name="setup_error_ssl">Sicherheitsfehler bei der Verbindung zum Server.</string>
-    <string name="setup_error_server">Serverfehler beim Registrieren des Geräts.</string>
-    <string name="setup_error_response">Der Server hat eine ungültige Antwort zurückgegeben.</string>
-    <string name="setup_error_failed">Der initiale Verbindungstest ist fehlgeschlagen.</string>
-    <string name="setup_error_permissions">pretixSCAN funktioniert ohne diese Berechtigungen nicht. Bitte starten Sie die App neu.</string>
     <string name="welcome_text">pretixSCAN ist eine App zur Einlasskontrolle, mit der Sie über pretix verkaufte Tickets kontrollieren können.</string>
     <string name="welcome_disclaimer1">Ich verstehe, dass personenbezogene Daten zu den Teilnehmern meiner Veranstaltungen auf diesem Gerät gespeichert werden und sichere das Gerät angemessen.</string>
     <string name="cont">WEITER</string>
-    <string name="hint_url">URL</string>
-    <string name="hint_token">Token</string>
     <string name="dismiss">Schließen</string>
     <string name="settings_label_about">Über diese App</string>
     <string name="settings_label_licenses">Autoren und Lizenzen</string>
@@ -177,7 +163,6 @@
     <string name="error_no_available_events">Es wurde kein gegenwärtiges oder zukünftiges Event gefunden. Bitte prüfen Sie das Datum und die Zugriffsrechte Ihrer Veranstaltungen.</string>
     <string name="event_select_calendar">Kalender anzeigen</string>
     <string name="action_label_ok">OK</string>
-    <string name="setup_grant_camera_permission">Bitte erteilen Sie die Kamera-Berechtigung für den QR-Code-Scanner</string>
     <string-array name="settings_valuelabels_auto_print_badges">
         <item>Nein, nur auf Knopfdruck</item>
         <item>Nur, wenn noch nicht gedruckt</item>
diff --git a/pretixscan/app/src/main/res/values/strings.xml b/pretixscan/app/src/main/res/values/strings.xml
index 3b40bba..cf3c5c5 100644
--- a/pretixscan/app/src/main/res/values/strings.xml
+++ b/pretixscan/app/src/main/res/values/strings.xml
@@ -69,18 +69,6 @@
     <string name="first_scanned">First scanned: %s</string>
     <string name="datetime_format">%1$tY-%1$tm-%1$td %1$tH:%1$tM</string>
     <string name="ok">OK</string>
-    <string name="tutorial_setup">To get started, create a new device in the "Devices" section of your organizer account in the pretix backend. You will be then presented with a configuration QR code to scan.</string>
-    <string name="setup_error_legacy_qr_code">The QR code you scanned is for an old predecessor of this app. Please go to the "Devices" section in your pretix organizer account and create a new device there.</string>
-    <string name="setup_error_invalid_qr_code">The QR code you scanned is not a valid configuration code. Please make sure you created the code in the "Devices" section of a pretix organizer account.</string>
-    <string name="setup_error_version_too_high">The QR code you scanned is from a newer version of pretix than this app has been built for. Please check if you can get an update for this app!</string>
-    <string name="setup_progress">Initializing device…</string>
-    <string name="setup_error_request">Request rejected by server. Please double-check your input.</string>
-    <string name="setup_error_io">Connection error while trying to reach the server.</string>
-    <string name="setup_error_ssl">Security error while trying to reach the server.</string>
-    <string name="setup_error_server">Server error while trying to register the device.</string>
-    <string name="setup_error_response">The server returned an invalid response.</string>
-    <string name="setup_error_failed">The initial connection test failed.</string>
-    <string name="setup_error_permissions">pretixSCAN does not work properly without granting those permissions. Please restart the app.</string>
     <string name="welcome_text">pretixSCAN is a event entry app that you can use to validate tickets that you sold through pretix.</string>
     <string name="welcome_disclaimer1">I understand that personal data of attendees of my connected events will be stored on this device and I will secure the device properly.</string>
     <string name="cont">CONTINUE</string>
@@ -176,7 +164,6 @@
     <string name="currently_inside">currently attending</string>
     <string name="error_no_available_events">No current or future event could be found. Please check the dates and access rights of your events.</string>
     <string name="event_select_calendar">Show calendar</string>
-    <string name="setup_grant_camera_permission">Please grant camera permission to use the QR Scanner</string>
     <string-array name="settings_valuelabels_auto_print_badges">
         <item>No, only when button is pressed</item>
         <item>Once, if not yet printed</item>
diff --git a/pretixscan/libpretixui-repo b/pretixscan/libpretixui-repo
index 205c93f..17e7a38 160000
--- a/pretixscan/libpretixui-repo
+++ b/pretixscan/libpretixui-repo
@@ -1 +1 @@
-Subproject commit 205c93f996175d0d7c8280dd8c87b29e8497fdf5
+Subproject commit 17e7a38ee194695efe072bcdf044c523e2e81fcd

From afce8d58ceb6ac697e5e1eae4debe807310e0a82 Mon Sep 17 00:00:00 2001
From: Maximilian Richt <richt@rami.io>
Date: Mon, 20 Jan 2025 18:37:56 +0100
Subject: [PATCH 3/5] Update libpretixui

---
 .../java/eu/pretix/pretixscan/droid/ui/SetupActivity.kt    | 7 ++++++-
 pretixscan/libpretixui-repo                                | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/SetupActivity.kt b/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/SetupActivity.kt
index cd633af..68addc4 100644
--- a/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/SetupActivity.kt
+++ b/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/SetupActivity.kt
@@ -57,6 +57,11 @@ class SetupActivity : AppCompatActivity(R.layout.activity_setup), SetupCallable
         return super.dispatchKeyEvent(event)
     }
 
+    override fun config(useCamera: Boolean) {
+        val conf = AppConfig(this)
+        conf.useCamera = useCamera
+    }
+
     override fun setup(url: String, token: String) {
         val conf = AppConfig(this)
 
@@ -94,7 +99,7 @@ class SetupActivity : AppCompatActivity(R.layout.activity_setup), SetupCallable
         }
     }
 
-    override fun onSucessfulSetup() {
+    override fun onSuccessfulSetup() {
         val intent = Intent(this, MainActivity::class.java)
         startActivity(intent)
         finish()
diff --git a/pretixscan/libpretixui-repo b/pretixscan/libpretixui-repo
index 17e7a38..88e54cc 160000
--- a/pretixscan/libpretixui-repo
+++ b/pretixscan/libpretixui-repo
@@ -1 +1 @@
-Subproject commit 17e7a38ee194695efe072bcdf044c523e2e81fcd
+Subproject commit 88e54cc68d96af79290cac88d9b2602278195084

From 02d8c8dd6bbb6c5d365d1a6023bee890fd215c8b Mon Sep 17 00:00:00 2001
From: Maximilian Richt <richt@rami.io>
Date: Tue, 21 Jan 2025 10:35:52 +0100
Subject: [PATCH 4/5] Update libpretixui, use setup translations from the lib

---
 pretixscan/app/src/main/res/values-de/strings.xml  |  1 -
 pretixscan/app/src/main/res/values-es/strings.xml  | 14 --------------
 pretixscan/app/src/main/res/values-fi/strings.xml  |  1 -
 pretixscan/app/src/main/res/values-fr/strings.xml  | 14 --------------
 pretixscan/app/src/main/res/values-it/strings.xml  | 14 --------------
 pretixscan/app/src/main/res/values-ja/strings.xml  |  1 -
 pretixscan/app/src/main/res/values-nl/strings.xml  | 14 --------------
 pretixscan/app/src/main/res/values-pl/strings.xml  | 14 --------------
 .../app/src/main/res/values-pt-rBR/strings.xml     | 13 -------------
 pretixscan/app/src/main/res/values-uk/strings.xml  |  4 ----
 pretixscan/app/src/main/res/values/strings.xml     |  1 -
 pretixscan/libpretixui-repo                        |  2 +-
 12 files changed, 1 insertion(+), 92 deletions(-)

diff --git a/pretixscan/app/src/main/res/values-de/strings.xml b/pretixscan/app/src/main/res/values-de/strings.xml
index dc69433..4721015 100644
--- a/pretixscan/app/src/main/res/values-de/strings.xml
+++ b/pretixscan/app/src/main/res/values-de/strings.xml
@@ -14,7 +14,6 @@
     <string name="action_label_settings">Einstellungen</string>
     <string name="action_label_statistics">Statistiken</string>
     <string name="action_search">Suchen</string>
-    <string name="action_manual">Manuelles Setup</string>
     <string name="action_multievent_enable">Experten-Modus (mehrere Events auswählbar)</string>
     <string name="action_multievent_disable">Experten-Modus deaktivieren</string>
     <string name="action_multievent_disable_error">Experten-Modus kann nicht deaktiviert werden, solange mehrere Events ausgewählt sind.</string>
diff --git a/pretixscan/app/src/main/res/values-es/strings.xml b/pretixscan/app/src/main/res/values-es/strings.xml
index b99f3f0..4517000 100644
--- a/pretixscan/app/src/main/res/values-es/strings.xml
+++ b/pretixscan/app/src/main/res/values-es/strings.xml
@@ -33,7 +33,6 @@
     <string name="debug_info_gate">Puerta: %1$s</string>
     <string name="debug_info_device">Dispositivo: %1$s</string>
     <string name="action_search">Buscar</string>
-    <string name="action_manual">Configuración manual</string>
     <string name="operation_select_event">Seleccionar evento</string>
     <string name="operation_select_events">Seleccionar eventos</string>
     <string name="events_selected">%s eventos seleccionados</string>
@@ -73,19 +72,7 @@
     <string name="first_scanned">Primer escaneo: %s</string>
     <string name="datetime_format">%1$tY-%1$tm-%1$td %1$tH:%1$tM</string>
     <string name="ok">OK</string>
-    <string name="tutorial_setup">Para empezar, debe crear un nuevo dispositivo en la sección dispositivos de la cuenta del organizador en el backend de pretix. Una vez registrado, aparecerá un código QR de configuración que deberá escanear.</string>
-    <string name="setup_error_legacy_qr_code">El código QR escaneado sólo es valido para predecesores antiguos. Debe registrar un nuevo dispositivo en la sección «Dispositivos» de la cuenta de organizador pretix.</string>
-    <string name="setup_error_invalid_qr_code">El código QR que escaneado no es un código de configuración válido. Asegúrese de haber creado el código en la sección Dispositivos de la cuenta del organizador pretix.</string>
-    <string name="setup_error_version_too_high">El código QR que escaneado proviene de una versión más reciente de pretix. ¡Por favor, verifique si puede obtener una actualización de la aplicación!</string>
-    <string name="setup_progress">Inicializando dispositivo…</string>
     <string name="settings_summary_auto_switch">Con esta opción, pretixSCAN consultará al servidor durante la sincronización. Si el servidor sugiere cambia a una lista de asistentes diferente, el cambio se realizará automáticamente.</string>
-    <string name="setup_error_request">Solicitud rechazada por el servidor. Por favor, vuelva a comprobar los datos introducidos.</string>
-    <string name="setup_error_io">Error de conexión al intentar acceder al servidor.</string>
-    <string name="setup_error_ssl">Error de seguridad al intentar acceder al servidor.</string>
-    <string name="setup_error_server">Error del servidor al intentar registrar el dispositivo.</string>
-    <string name="setup_error_permissions">pretixSCAN no funciona correctamente sin conceder los permisos necesarios. Por favor, reinicie la aplicación.</string>
-    <string name="setup_error_response">El servidor devolvió una respuesta no válida.</string>
-    <string name="setup_error_failed">Ha fallado la prueba de conexión inicial.</string>
     <string name="welcome_text">pretixSCAN es una aplicación que puede utilizar para validar las entradas reservadas a través de pretix.</string>
     <string name="welcome_disclaimer1">Entiendo que los datos personales de los asistentes a mis eventos vinculados se almacenarán en este dispositivo y cuidaré el dispositivo adecuadamente.</string>
     <string name="cont">CONTINUAR</string>
@@ -168,7 +155,6 @@
     <string name="event_select_calendar">Ver calendario</string>
     <string name="settings_label_kioskmode">Modo kiosco</string>
     <string name="settings_label_search_disable">Deshabilitar búsqueda</string>
-    <string name="setup_grant_camera_permission">Debe conceder permisos para utilizar la cámara y escáner QR</string>
     <string name="error_no_available_events">No se ha encontrado ningún evento presente o futuro. Compruebe las fechas y los derechos de acceso de los eventos.</string>
     <string name="settings_summary_kioskmode">El modo Kiosko oculta los menús que no deben utilizarse en una instalación de autoservicio. El modo Kiosko no impide que los usuarios salgan de la app a través de las funciones del sistema. Para acceder a los ajustes, es necesario escanear un código QR junto con el PIN.</string>
 </resources>
\ No newline at end of file
diff --git a/pretixscan/app/src/main/res/values-fi/strings.xml b/pretixscan/app/src/main/res/values-fi/strings.xml
index 6df264a..8bfc920 100644
--- a/pretixscan/app/src/main/res/values-fi/strings.xml
+++ b/pretixscan/app/src/main/res/values-fi/strings.xml
@@ -14,7 +14,6 @@
     <string name="sync_status_last_failed">Viimeisin epäonnistunut päivitys:</string>
     <string name="sync_status_last">Viimeisin onnistunut päivitys:</string>
     <string name="settings_label_auto_switch">Tapahtuman automaattinen valinta</string>
-    <string name="action_manual">Manuaalinen asetus</string>
     <string name="operation_select_event">Valitse tapahtuma</string>
     <string name="operation_select_checkinlist">Valitse sisäänpääsylista</string>
     <string name="settings_label_auto_sync">Automaattinen synkronointi</string>
diff --git a/pretixscan/app/src/main/res/values-fr/strings.xml b/pretixscan/app/src/main/res/values-fr/strings.xml
index 369b031..2232fc3 100644
--- a/pretixscan/app/src/main/res/values-fr/strings.xml
+++ b/pretixscan/app/src/main/res/values-fr/strings.xml
@@ -23,7 +23,6 @@
     <string name="debug_info_gate">Porte : %1$s</string>
     <string name="debug_info_device">Appareil : %1$s</string>
     <string name="scantype_exit_kiosk">Scanner votre billet pour enregistrer la sortie</string>
-    <string name="action_manual">Mise en place manuelle</string>
     <string name="operation_select_event">Sélectionner l\'évènement</string>
     <string name="events_selected">%s évènements sélectionnés</string>
     <string name="operation_select_checkinlist">Sélectionnez la liste d\'enregistrement</string>
@@ -56,16 +55,8 @@
     <string name="first_scanned">Premier scan : %s</string>
     <string name="datetime_format">%1$tY-%1$tm-%1$td %1$tH:%1$tM</string>
     <string name="ok">OK</string>
-    <string name="setup_error_version_too_high">Le QR code que vous avez scanné provient d\'une version de pretix plus récente que celle pour laquelle cette application a été conçue. Veuillez vérifier si vous pouvez obtenir une mise à jour pour cette application !</string>
-    <string name="setup_error_request">Demande rejetée par le serveur. Veuillez revérifier votre saisie.</string>
-    <string name="setup_error_ssl">Erreur de sécurité lors de la tentative d\'accès au serveur.</string>
-    <string name="setup_error_response">Le serveur a retourné une réponse non valide.</string>
-    <string name="setup_error_failed">Le test de connexion initial a échoué.</string>
     <string name="welcome_text">pretixSCAN est une application de gestion des entrées d\'évènement que vous pouvez utiliser pour valider les billets que vous avez vendus via pretix.</string>
     <string name="cont">CONTINUER</string>
-    <string name="setup_error_invalid_qr_code">Le QR code que vous avez scanné n\'est pas un code de configuration valide. Veuillez vous assurer que vous avez créé le code dans la section Appareils d\'un compte organisateur pretix.</string>
-    <string name="setup_progress">Initialisation de l\'appareil…</string>
-    <string name="setup_error_server">Une erreur s\'est produite sur le serveur lors de l\'enregistrement de l\'appareil.</string>
     <string name="hint_url">URL</string>
     <string name="hint_token">Jeton</string>
     <string name="dismiss">Rejeter</string>
@@ -144,10 +135,6 @@
         <item quantity="many">%d téléversements en attente</item>
         <item quantity="other">%d téléversements en attente</item>
     </plurals>
-    <string name="tutorial_setup">Pour commencer, créez un nouvel appareil dans la section Appareils de votre compte d\'organisateur dans le site de pretix. Un QR code vous sera alors présenté afin de configurer celui-ci.</string>
-    <string name="setup_error_legacy_qr_code">Le QR code que vous avez scanné correspond à une ancienne version de cette application. Veuillez vous rendre dans la section Appareils de votre compte organisateur et y créer un nouveal appareil.</string>
-    <string name="setup_error_io">Erreur de connexion lors de la tentative de connexion au serveur.</string>
-    <string name="setup_error_permissions">pretixSCAN ne fonctionne pas correctement sans l\'octroi de ces autorisations. Veuillez redémarrer l\'application.</string>
     <string name="welcome_disclaimer1">Je comprends que les données personnelles des participants à mes événements connectés seront stockées sur cet appareil et je m\'engage à sécuriser l\'appareil correctement.</string>
     <string name="settings_label_device_camera">Utiliser la caméra de l\'appareil</string>
     <string name="settings_label_auto_offline">Activation et désactivation automatiques du mode hors ligne</string>
@@ -166,7 +153,6 @@
     <string name="scantype_entry_kiosk_print">Scannez votre billet pour imprimer votre badge</string>
     <string name="action_multievent_disable">Désactiver le mode expert</string>
     <string name="action_multievent_disable_error">Le mode expert ne peut pas être désactivé si plusieurs événements sont sélectionnés.</string>
-    <string name="setup_grant_camera_permission">Veuillez autoriser la caméra à utiliser le scanner QR</string>
     <string name="settings_label_auto_offline_help">Si vous sélectionnez l\'une des durées ci-dessous, l\'application basculera automatiquement vers un scan hors ligne lorsque le temps de validation est supérieur au temps sélectionné. Par ailleurs, l\'application passera en mode hors ligne intégral si plusieurs scans ont échoué, ou si ils ont duré plus longtemps que prévu. Une fois que la connexion redevient stable, l\'application rebasculera en mode en ligne.</string>
     <string name="scan_result_unapproved">Commande non approuvée</string>
     <string name="pin_protection_enter">Saisir le code PIN</string>
diff --git a/pretixscan/app/src/main/res/values-it/strings.xml b/pretixscan/app/src/main/res/values-it/strings.xml
index e25e483..be28195 100644
--- a/pretixscan/app/src/main/res/values-it/strings.xml
+++ b/pretixscan/app/src/main/res/values-it/strings.xml
@@ -65,12 +65,6 @@
     <string name="first_scanned">Primo scannerizzato: %s</string>
     <string name="datetime_format">%1$tY-%1$tm-%1$td %1$tH:%1$tM</string>
     <string name="ok">OK</string>
-    <string name="setup_error_invalid_qr_code">Il codice QR scannerizzato non è un codice valido di configurazione. Per favore verifica che il codice sia stato creato nella sezione Dispositivi dell\'account organizzatore pretix.</string>
-    <string name="setup_error_version_too_high">Il codice QR scannerizzato proviene da una versione più recente di pretix rispetto a quella per cui è stata progettata quest\'app. Prova ad aggiornare l\'applicazione!</string>
-    <string name="setup_error_request">Richiesta rifiutata dal server. Ricontrolla le informazioni inserite.</string>
-    <string name="setup_error_ssl">Errore di sicurezza durante il tentativo di accesso al server.</string>
-    <string name="setup_error_server">Errore del server durante il tentativo di registrazione del dispositivo.</string>
-    <string name="setup_error_failed">Il test di prima connessione ha fallito.</string>
     <string name="welcome_disclaimer1">Sono a conoscenza che i dati personali dei partecipanti agli eventi a cui mi collegherò verranno salvati su questo dispositivo e mi assicuro di tenere il dispositivo al sicuro.</string>
     <string name="cont">CONTINUA</string>
     <string name="hint_url">URL</string>
@@ -136,7 +130,6 @@
     <string name="pin_protection_settings">Proteggere impostazioni app</string>
     <string name="pin_protection_statistics">Proteggere statistiche</string>
     <string name="pin_protection_switch_event">Proteggere cambio evento</string>
-    <string name="action_manual">Impostazione manuale</string>
     <string name="sync_status_never">non ancora sincronizzata</string>
     <string name="pin_protection_enter">Inserire PIN</string>
     <string name="currently_inside">correntemente dentro all\' evento</string>
@@ -144,16 +137,10 @@
     <string name="event_select_calendar">Mostrare calendario</string>
     <string name="app_name">pretixSCAN</string>
     <string name="sync_status">Stato della sincronizzazione</string>
-    <string name="tutorial_setup">Per iniziare, crea un nuovo dispositivo nella sezione Dispositivi del tuo account organizzatore nel backend di pretix. Ti verrà presentato un codice QR da scannerizzare per la configurazione.</string>
     <string name="headline_setup">Benvenuto su pretixSCAN!</string>
-    <string name="setup_progress">Inizializzando il dispositivo…</string>
-    <string name="setup_error_response">Il server ha inviato una risposta non valida.</string>
-    <string name="setup_error_permissions">pretixSCAN non può funzionare correttamente senza abilitare i permessi. Chiudere e riaprire l\'app.</string>
     <string name="welcome_text">pretixScan è un app per gestire gli ingressi agli eventi che permette di validare i biglietti venduti attraverso pretix.</string>
     <string name="scan_result_revoked">Codice biglietto annullato/modificato</string>
     <string name="error_access_revoked">La possibilità di accedere con questo dispositivo è revocata, è necessario registrare nuovamente il dispositivo con il server.</string>
-    <string name="setup_error_legacy_qr_code">Il codice QR scannerizzato è per un vecchio predecessore di quest\'app. Per favore entra nella sezione Dispositivi del tuo account organizzatore pretix e crea un nuovo dispositivo.</string>
-    <string name="setup_error_io">Errore di connessione mentre si cerca di accedere al server.</string>
     <string name="pin_protection_switch_mode">Proteggere cambio modalità</string>
     <string name="debug_info_device">Dispositivo: %1$s</string>
     <string name="settings_label_auto_sync">Sincronizzazione Automatica</string>
@@ -165,7 +152,6 @@
     <string name="hardware_scanner">Premere il bottone per scannerizzare del vostro dispositivo.</string>
     <string name="settings_summary_scan_offline">Quando si scannerizza offline, il suo dispositivo verificherà con un database interno al dispositivo al posto che con il server e sincronizzerà il proprio database con il server occasionalmente. Cosicchè esso sia più resiliente, ma comunque permette di scannerizzare più volte se lo stesso biglietto è mostrato a dispositivi differenti.</string>
     <string name="pin_protection_enable">Abilitare protezione con PIN</string>
-    <string name="setup_grant_camera_permission">Gentilmente permettere i permessi di utlizzo della fotocamera per usare lo Scanner QR</string>
     <string name="cancel">Annulla</string>
     <string name="dialog_unpaid_text">Questo biglietto appartiene ad un ordine che non è ancora stato pagato. Vuoi comunque permettere il check-in? Questa azione non salverà l\'ordine come pagato.</string>
     <string name="status_empty">La ricerca non ha portato a nessun risultato. ASsicurarsi di aver inserito almeno quattro caratteri.</string>
diff --git a/pretixscan/app/src/main/res/values-ja/strings.xml b/pretixscan/app/src/main/res/values-ja/strings.xml
index 6415e31..15e57fe 100644
--- a/pretixscan/app/src/main/res/values-ja/strings.xml
+++ b/pretixscan/app/src/main/res/values-ja/strings.xml
@@ -5,7 +5,6 @@
     <string name="headline_setup">pretixSCANにようこそ!</string>
     <string name="cancel">キャンセル</string>
     <string name="debug_info_device">デバイス: %1$s</string>
-    <string name="action_manual">手動で設定</string>
     <string name="scantype_entry_kiosk_print">チケットをスキャンしてバッジを印刷</string>
     <string name="sync_status_last">前回成功した同期:</string>
     <string name="sync_status_last_failed">前回失敗した同期:</string>
diff --git a/pretixscan/app/src/main/res/values-nl/strings.xml b/pretixscan/app/src/main/res/values-nl/strings.xml
index 8655267..3bfdd75 100644
--- a/pretixscan/app/src/main/res/values-nl/strings.xml
+++ b/pretixscan/app/src/main/res/values-nl/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="tutorial_setup">Om te starten, maak een nieuw apparaat aan in het Apparaten onderdeel van je organisator account in de Pretix controlepaneel. Daar vind je een qr code die je kan scannen om de juiste configuratie te downloaden.</string>
     <string name="ok">OK</string>
     <string name="datetime_format">%1$td.%1$tm.%1$tY %1$tH:%1$tM</string>
     <string name="first_scanned">Eerst gescanned: %s</string>
@@ -34,7 +33,6 @@
     <string name="settings_label_auto_sync">Automatische Synchronisatie</string>
     <string name="operation_select_checkinlist">Selecteer Check-in lijst</string>
     <string name="operation_select_event">Kies evenement</string>
-    <string name="action_manual">Handmatig instellen</string>
     <string name="action_search">Zoeken</string>
     <string name="debug_info_device">Apparaat: %1$s</string>
     <string name="debug_info_gate">Poort: %1$s</string>
@@ -76,17 +74,6 @@
     <string name="cont">DOORGAAN</string>
     <string name="welcome_disclaimer1">Ik begrijp dat persoonsgegevens van gasten van mijn evenementen zullen worden opgeslagen op dit apparaat en ik zal het apparaat goed beveiligen.</string>
     <string name="welcome_text">pretixSCAN is een app die u kunt gebruiken om tickets te controleren die u via pretix hebt verkocht.</string>
-    <string name="setup_error_permissions">pretixSCAN werkt niet juist zonder deze toestemmingen te geven. Start de app opnieuw op.</string>
-    <string name="setup_error_failed">De eerste verbindingstest is mislukt.</string>
-    <string name="setup_error_response">De server heeft een ongeldig antwoord teruggegeven.</string>
-    <string name="setup_error_server">Er is een serverfout opgetreden tijdens het registreren van het apparaat.</string>
-    <string name="setup_error_ssl">Er is een beveiligingsfout opgetreden tijdens het verbinden met de server.</string>
-    <string name="setup_error_io">Er is een verbindingsfout opgetreden tijdens het verbinden met de server.</string>
-    <string name="setup_error_request">Verzoek geweigerd door server. Controleer uw invoer.</string>
-    <string name="setup_progress">Apparaat instellen…</string>
-    <string name="setup_error_version_too_high">De gescande QR-code is voor een nieuwere versie van pretix dan waar deze app is voor gebouwd. Controleer of er een update is voor deze app!</string>
-    <string name="setup_error_invalid_qr_code">De QR-code die u scande is geen geldige configuratiecode. Controleer of u de code heeft aangemaakt onder Apparaten in de organisatoraccountsinstellingen van een pretix-organisatoraccount.</string>
-    <string name="setup_error_legacy_qr_code">De QR-code die u scande is alleen voor een oudere versie van deze app geldig. Ga naar de apparatenlijst in uw pretixaccount en maak hier een nieuw apparaat aan.</string>
     <string name="settings_summary_auto_switch">Met deze optie zal pretixSCAN tijdens het synchroniseren aan de server vragen of de server aanraadt om de app naar een ander evenement en inchecklijst te wisselen. Als dit het geval is zal pretixSCAN automatisch naar dit evenement wisselen.</string>
     <string name="currently_inside">momenteel aanwezig</string>
     <string name="pin_protection_switch_mode">Modusveranderingen beveiligen</string>
@@ -162,7 +149,6 @@
     <string name="scantype_entry_kiosk_print">Scan uw ticket om uw badge te printen</string>
     <string name="action_multievent_disable">Expertmodus uitschakelen</string>
     <string name="action_multievent_disable_error">Expertmodus kan niet uitgeschakeld worden wanneer meerdere evenementen zijn geselecteerd.</string>
-    <string name="setup_grant_camera_permission">Verleen de camera-machtiging om de QR Scanner te kunnen gebruiken</string>
     <string name="settings_label_auto_offline_help">Als u een van de onderstaande tijden selecteert, zal de app automatisch de offline-scanmodus gebruiken wanneer een online scan langer dan de geselecteerde tijd duurt. Daarnaast zal de app naar volledige offline-modus schakelen wanneer meerdere scans mislukt zijn of langer duurden dan de geselecteerde tijd. Zodra de verbinding weer enige tijd stabiel is, zal de app terugschakelen naar online-modus.</string>
     <string name="scan_result_unapproved">Bestelling niet goedgekeurd</string>
     <string name="pref_ignore_questions">Stel geen vragen tijdens check-in</string>
diff --git a/pretixscan/app/src/main/res/values-pl/strings.xml b/pretixscan/app/src/main/res/values-pl/strings.xml
index b51b8c8..06009cb 100644
--- a/pretixscan/app/src/main/res/values-pl/strings.xml
+++ b/pretixscan/app/src/main/res/values-pl/strings.xml
@@ -35,7 +35,6 @@
     <string name="debug_info_gate">Bramka: %1$s</string>
     <string name="debug_info_device">Urządzenie: %1$s</string>
     <string name="action_search">Szukaj</string>
-    <string name="action_manual">Konfiguracja ręczna</string>
     <string name="operation_select_event">Wybierz wydarzenie</string>
     <string name="operation_select_events">Wybierz wydarzenia</string>
     <string name="events_selected">Wybrano %s wydarzeń</string>
@@ -65,14 +64,6 @@
     <string name="first_scanned">Pierwsze skanowanie: %s</string>
     <string name="datetime_format">%1$tY-%1$tm-%1$td %1$tH:%1$tM</string>
     <string name="ok">OK</string>
-    <string name="setup_error_legacy_qr_code">Zeskanowany kod QR dotyczy poprzedniej wersji tej aplikacji. Przejdź do sekcji Urządzenia na swoim koncie organizatora pretix i utwórz tam nowe urządzenie.</string>
-    <string name="setup_error_version_too_high">Zeskanowany kod QR pochodzi z nowszej wersji aplikacji pretix niż ta, dla której została stworzona. Sprawdź, czy możesz uzyskać aktualizację dla tej aplikacji!</string>
-    <string name="setup_progress">Inicjalizacja urządzenia…</string>
-    <string name="setup_error_request">Żądanie odrzucone przez serwer. Sprawdź dwukrotnie wprowadzone dane.</string>
-    <string name="setup_error_ssl">Błąd zabezpieczeń podczas próby połączenia z serwerem.</string>
-    <string name="setup_error_server">Błąd serwera podczas próby zarejestrowania urządzenia.</string>
-    <string name="setup_error_response">Serwer zwrócił nieprawidłową odpowiedź.</string>
-    <string name="setup_error_failed">Początkowy test połączenia nie powiódł się.</string>
     <string name="cont">DALEJ</string>
     <string name="hint_url">Adres URL</string>
     <string name="hint_token">Token</string>
@@ -139,8 +130,6 @@
     <string name="action_multievent_disable_error">Trybu eksperta nie można wyłączyć, jeśli wybrano wiele zdarzeń.</string>
     <string name="action_label_statistics">Statystyki</string>
     <string name="action_multievent_disable">Wyłącz tryb eksperta</string>
-    <string name="tutorial_setup">Aby rozpocząć, utwórz nowe urządzenie w sekcji Urządzenia na swoim koncie organizatora w wewnętrznym systemie pretix. Następnie zostanie Ci wyświetlony konfiguracyjny kod QR do zeskanowania.</string>
-    <string name="setup_error_permissions">pretixSCAN nie działa poprawnie bez przyznania tych uprawnień. Uruchom ponownie aplikację.</string>
     <string name="settings_label_verification">Weryfikacja biletów</string>
     <string name="settings_label_licenses">Autor i licencje</string>
     <string name="cancel">Anuluj</string>
@@ -156,8 +145,6 @@
     </plurals>
     <string name="scan_result_ambiguous">Kod biletu na liście jest niejednoznaczny</string>
     <string name="scan_result_unapproved">Zamówienie nie zostało zatwierdzone</string>
-    <string name="setup_error_invalid_qr_code">Zeskanowany kod QR nie jest prawidłowym kodem konfiguracyjnym. Upewnij się, że kod został utworzony w sekcji Urządzenia na koncie organizatora pretix.</string>
-    <string name="setup_error_io">Błąd połączenia podczas próby nawiązania połączenia z serwerem.</string>
     <string name="welcome_text">pretixSCAN to aplikacja umożliwiająca wejście na wydarzenie, której można użyć do walidacji biletów sprzedanych za pośrednictwem pretix.</string>
     <string name="settings_label_scan_offline">Skanowanie offline</string>
     <string name="pref_unpaid_ask_summary">Gdy lista odpraw jest ustawiona tak, aby zawierała oczekujące zamówienia, to ustawienie kontroluje, czy użytkownik zostanie zapytany, zanim zostanie zameldowany.</string>
@@ -174,5 +161,4 @@
     <string name="preference_autobadgeprint_enable">Automatyczne drukowanie identyfikatorów po pomyślnym zeskanowaniu</string>
     <string name="label_shop_inactive">Sklep dezaktywowany</string>
     <string name="label_shop_active">Aktywny</string>
-    <string name="setup_grant_camera_permission">Zezwól na używanie kamery aby korzystać ze skanera QR</string>
 </resources>
\ No newline at end of file
diff --git a/pretixscan/app/src/main/res/values-pt-rBR/strings.xml b/pretixscan/app/src/main/res/values-pt-rBR/strings.xml
index c004a7f..eadd719 100644
--- a/pretixscan/app/src/main/res/values-pt-rBR/strings.xml
+++ b/pretixscan/app/src/main/res/values-pt-rBR/strings.xml
@@ -2,13 +2,10 @@
 <resources>
     <string name="hint_url">URL</string>
     <string name="error_sync_in_background">Uma sincronização já está sendo executada em segundo plano.</string>
-    <string name="setup_error_server">Erro no servidor ao tentar registrar o dispositivo.</string>
-    <string name="setup_error_permissions">pretixSCAN não funciona corretamente sem conceder essas permissões. Reinicie o aplicativo.</string>
     <string name="scan_result_invalid_time">O bilhete não é válido no momento</string>
     <string name="app_name">pretixSCAN</string>
     <string name="short_datetime_format">dd/MM HH:mm</string>
     <string name="title_activity_main">pretixSCAN</string>
-    <string name="action_manual">Configuração Manual</string>
     <string name="scan_result_exit">Saida registrada</string>
     <string name="headline_setup">Bem-Vindo ao pretixSCAN!</string>
     <string name="action_sync">Sincronizar agora</string>
@@ -50,11 +47,6 @@
     <string name="sync_status_date_format">%1$tH:%1$tM %1$td/%1$tm/%1$tY</string>
     <string name="first_scanned">Primeiro scaneado: %s</string>
     <string name="ok">OK</string>
-    <string name="setup_progress">Inicializando dispositivo…</string>
-    <string name="setup_error_request">Requisição rejeitada pelo servidor. Por favor, verifique as informações.</string>
-    <string name="setup_error_io">Erro de conexão ao tentar acessar o servidor.</string>
-    <string name="setup_error_response">O servidor retornou uma resposta inválida.</string>
-    <string name="setup_error_failed">O teste de conexão inicial falhou.</string>
     <string name="welcome_text">O pretixSCAN é um aplicativo de entrada para eventos que você pode usar para validar ingressos vendidos pelo pretix.</string>
     <string name="welcome_disclaimer1">Entendo que os dados pessoais dos participantes dos meus eventos conectados serão armazenados neste dispositivo e eu o protegerei adequadamente.</string>
     <string name="cont">Continuar</string>
@@ -104,13 +96,8 @@
     <string name="scantype_entry_kiosk_print">Scanei sei ticket para imprimir seu crachá</string>
     <string name="datetime_format">%1$tH:%1$tM%1$td%1$tm%1$tY</string>
     <string name="pref_unpaid_ask">Pergunte antes de fazer o check-in de bilhetes não pagos</string>
-    <string name="setup_error_ssl">Erro de segurança ao tentar acessar o servidor.</string>
     <string name="pref_unpaid_ask_summary">Quando a lista de check-in é definida para incluir pedidos pendentes, esta configuração controla se você será questionado antes que eles sejam verificados.</string>
-    <string name="setup_error_legacy_qr_code">O código QR que você escaneou é de uma versão antiga deste aplicativo. Vá para a seção Dispositivos na sua conta do organizador e crie um novo dispositivo.</string>
-    <string name="setup_error_invalid_qr_code">O código QR que você escaneou não é um código de configuração válido. Certifique-se de que você criou o código na seção Dispositivos de uma conta do organizador.</string>
-    <string name="setup_error_version_too_high">O código QR que você escaneou é de uma versão mais recente do que a que este aplicativo. Verifique se você pode obter uma atualização para este aplicativo!</string>
     <string name="sync_status_never">ainda não sincronizado</string>
-    <string name="tutorial_setup">Para começar, crie um novo dispositivo na seção Dispositivos da sua conta de organizador. Você verá um código QR de configuração para escanear.</string>
     <string name="settings_label_verification">Verificação de ticket</string>
     <string name="already_scanned">já escaneado</string>
     <string name="preference_badgeprint_install_pretixprint">A impressão de crachás requer o aplicativo pretixPRINT separado. Você quer instalá-lo?</string>
diff --git a/pretixscan/app/src/main/res/values-uk/strings.xml b/pretixscan/app/src/main/res/values-uk/strings.xml
index 92313fe..aacc3c0 100644
--- a/pretixscan/app/src/main/res/values-uk/strings.xml
+++ b/pretixscan/app/src/main/res/values-uk/strings.xml
@@ -5,10 +5,6 @@
     <string name="scan_result_revoked">Код квитка відкликаний/змінений</string>
     <string name="scan_result_blocked">Квиток заблокований</string>
     <string name="action_label_settings">Налаштування</string>
-    <string name="setup_error_io">Помилка зв\'язку під час спроби під\'єднання до сервера.</string>
-    <string name="setup_error_ssl">Помилка безпеки під час спроби під\'єднання до сервера.</string>
-    <string name="setup_error_server">Серверна помилка під час спроби реєстрації пристрою.</string>
-    <string name="setup_error_response">Сервер надіслав недійсну відповідь.</string>
     <string name="cancel">Скасувати</string>
     <string name="settings_label_version">Версія</string>
 </resources>
\ No newline at end of file
diff --git a/pretixscan/app/src/main/res/values/strings.xml b/pretixscan/app/src/main/res/values/strings.xml
index cf3c5c5..1038908 100644
--- a/pretixscan/app/src/main/res/values/strings.xml
+++ b/pretixscan/app/src/main/res/values/strings.xml
@@ -32,7 +32,6 @@
     <string name="debug_info_gate">Gate: %1$s</string>
     <string name="debug_info_device">Device: %1$s</string>
     <string name="action_search">Search</string>
-    <string name="action_manual">Manual setup</string>
     <string name="operation_select_event">Select Event</string>
     <string name="operation_select_events">Select Events</string>
     <string name="events_selected">%s events selected</string>
diff --git a/pretixscan/libpretixui-repo b/pretixscan/libpretixui-repo
index 88e54cc..4f1cfec 160000
--- a/pretixscan/libpretixui-repo
+++ b/pretixscan/libpretixui-repo
@@ -1 +1 @@
-Subproject commit 88e54cc68d96af79290cac88d9b2602278195084
+Subproject commit 4f1cfec490b6134d5238a9a265eff0371a1afc66

From 3ceff9dbc3c63e8f9b5b70826b28861bd68c9f23 Mon Sep 17 00:00:00 2001
From: Maximilian Richt <richt@rami.io>
Date: Tue, 21 Jan 2025 10:36:50 +0100
Subject: [PATCH 5/5] showQuestionsDialog answers are based on the questions
 identifier now

---
 .../java/eu/pretix/pretixscan/droid/ui/MainActivity.kt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/MainActivity.kt b/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/MainActivity.kt
index ae651bf..f4d3ad7 100644
--- a/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/MainActivity.kt
+++ b/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/MainActivity.kt
@@ -992,17 +992,17 @@ class MainActivity : AppCompatActivity(), ReloadableActivity, ScannerView.Result
     }
 
     fun showQuestionsDialog(res: TicketCheckProvider.CheckResult, secret: String, ignore_unpaid: Boolean,
-                            values: Map<QuestionLike, String>?, isResumed: Boolean,
+                            values: Map<String, String>?, isResumed: Boolean,
                             retryHandler: ((String, MutableList<Answer>, Boolean) -> Unit)): QuestionsDialogInterface {
         val questions = res.requiredAnswers!!.map { it.question }
         for (q in questions) {
             q.resolveDependency(questions)
         }
         val values_ = if (values == null) {
-            val v = mutableMapOf<QuestionLike, String>()
+            val v = mutableMapOf<String, String>()
             res.requiredAnswers!!.forEach {
                 if (!it.currentValue.isNullOrBlank()) {
-                    v[it.question] = it.currentValue!!
+                    v[it.question.identifier] = it.currentValue!!
                 }
             }
             v
@@ -1480,11 +1480,11 @@ class MainActivity : AppCompatActivity(), ReloadableActivity, ScannerView.Result
             lastScanResult = om.readValue(savedInstanceState.getString("result"), TicketCheckProvider.CheckResult::class.java)
 
             val answers = savedInstanceState.getBundle("answers")!!
-            val values = mutableMapOf<QuestionLike, String>()
+            val values = mutableMapOf<String, String>()
             lastScanResult!!.requiredAnswers!!.forEach {
                 val v = answers.getString(it.question.identifier, "")
                 if (v.isNotBlank()) {
-                    values[it.question] = v
+                    values[it.question.identifier] = v
                 }
             }