Add basic support for question type barcode

pretix · Sep 17, 2024 · fd8c929 · fd8c929
1 parent 840e5c5
commit fd8c929
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 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
@@ -948,8 +948,11 @@ class MainActivity : AppCompatActivity(), ReloadableActivity, ScannerView.Result
 
         if (dialog?.isShowing() == true) {
             /*
-             * Skip scan if a dialog is still in front. This forces users to answer the questions asked.
+             * Skip scan if a dialog is still in front.
+             * This forces users to answer the questions asked.
+             * The scan data is passed to the dialog, maybe it wants to fill a field with it.
              */
+            dialog!!.handleScan(raw_result)
             return
         }
 

diff --git a/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/UnpaidOrderDialogHelper.kt b/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/UnpaidOrderDialogHelper.kt
@@ -29,6 +29,9 @@ class UnpaidDialog(ctx: Activity, val secret: String, val answers: MutableList<A
     override fun handleActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean {
         return false
     }
+    override fun handleScan(rawResult: String) {
+        // ignore scan
+    }
 }
 
 fun showUnpaidDialog(ctx: Activity, res: TicketCheckProvider.CheckResult,

diff --git a/pretixscan/libpretixsync-repo b/pretixscan/libpretixsync-repo
diff --git a/pretixscan/libpretixui-repo b/pretixscan/libpretixui-repo
+ −		android-libusbcameracommon/usbCameraCommon.aar
+ −		android-libuvccamera/libuvccamera.aar
+2 −3		libpretixui-android/src/main/java/eu/pretix/libpretixui/android/questions/FileUtils.kt
+97 −2		libpretixui-android/src/main/java/eu/pretix/libpretixui/android/questions/QuestionsDialog.kt
+2 −1		libpretixui-android/src/main/java/eu/pretix/libpretixui/android/scanning/HardwareScanner.kt
+4 −2		libpretixui-android/src/main/java/eu/pretix/libpretixui/android/scanning/ScannerView.kt