From f0c33c5e1e6be41e551ae8be1d00cd7a409ee16e Mon Sep 17 00:00:00 2001
From: Martin Gross <gross@rami.io>
Date: Tue, 28 Apr 2026 15:05:54 +0200
Subject: [PATCH 1/2] Add ACS NFC functionality

---
 pretixscan/app/src/main/AndroidManifest.xml              | 4 ++++
 .../main/java/eu/pretix/pretixscan/droid/ui/Settings.kt  | 9 +++++++++
 pretixscan/app/src/main/res/xml/preferences.xml          | 9 +++++++++
 pretixscan/libpretixnfc-repo                             | 2 +-
 pretixscan/libpretixui-repo                              | 2 +-
 5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/pretixscan/app/src/main/AndroidManifest.xml b/pretixscan/app/src/main/AndroidManifest.xml
index 30e95ffb..ed63bebb 100644
--- a/pretixscan/app/src/main/AndroidManifest.xml
+++ b/pretixscan/app/src/main/AndroidManifest.xml
@@ -8,6 +8,10 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"
+        tools:node="remove" />
 
     <queries>
         <package android:name="eu.pretix.pretixprint" />
diff --git a/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/Settings.kt b/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/Settings.kt
index 04cf6943..d542ade1 100644
--- a/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/Settings.kt
+++ b/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/Settings.kt
@@ -27,6 +27,7 @@ import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import eu.pretix.libpretixui.android.fragments.ForegroundNoticeDialogFragment
 import eu.pretix.pretixscan.droid.AppConfig
 import eu.pretix.pretixscan.droid.BuildConfig
 import eu.pretix.pretixscan.droid.PretixScan
@@ -175,6 +176,14 @@ class SettingsFragment : PreferenceFragmentCompat() {
                 true
             }
         }
+
+        findPreference<ListPreference>("pref_nfc_type")?.setOnPreferenceChangeListener { preference, newValue ->
+            if (newValue == "acs") {
+                ForegroundNoticeDialogFragment.showConditionally(activity, "nfc_Acs")
+            }
+            return@setOnPreferenceChangeListener true
+        }
+
     }
 
     private fun asset_dialog(@RawRes htmlRes: Int, @StringRes title: Int) {
diff --git a/pretixscan/app/src/main/res/xml/preferences.xml b/pretixscan/app/src/main/res/xml/preferences.xml
index ed30152b..2b4256fa 100644
--- a/pretixscan/app/src/main/res/xml/preferences.xml
+++ b/pretixscan/app/src/main/res/xml/preferences.xml
@@ -85,6 +85,15 @@
             android:key="pref_ignore_questions"
             android:title="@string/pref_ignore_questions" />
     </PreferenceCategory>
+    <PreferenceCategory android:title="@string/preference_nfc_head">
+        <ListPreference
+            android:defaultValue="native"
+            android:entries="@array/preference_nfc_type"
+            android:entryValues="@array/preference_nfc_type_values"
+            android:key="pref_nfc_type"
+            android:summary="%s"
+            android:title="@string/preference_nfc_type_label" />
+    </PreferenceCategory>
     <PreferenceCategory android:title="@string/settings_label_about">
         <Preference
             android:key="version"
diff --git a/pretixscan/libpretixnfc-repo b/pretixscan/libpretixnfc-repo
index d2a04c79..6d9c7e89 160000
--- a/pretixscan/libpretixnfc-repo
+++ b/pretixscan/libpretixnfc-repo
@@ -1 +1 @@
-Subproject commit d2a04c79ecb6d8b7abf4b8f1a59a609b879b0c39
+Subproject commit 6d9c7e89fcca94896404706176c05928cd640a40
diff --git a/pretixscan/libpretixui-repo b/pretixscan/libpretixui-repo
index 03099294..be90a2ce 160000
--- a/pretixscan/libpretixui-repo
+++ b/pretixscan/libpretixui-repo
@@ -1 +1 @@
-Subproject commit 030992943812a0e499990471fc3588cc5a2ead66
+Subproject commit be90a2ceb71e228e5cdf05895a6438cef82399b3

From ad0c2c3113bbabe9d4d36eb9486e1170b08bd768 Mon Sep 17 00:00:00 2001
From: Martin Gross <gross@rami.io>
Date: Tue, 28 Apr 2026 16:03:56 +0200
Subject: [PATCH 2/2] Bump libpretixui-repo

---
 pretixscan/libpretixui-repo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pretixscan/libpretixui-repo b/pretixscan/libpretixui-repo
index be90a2ce..20053f7f 160000
--- a/pretixscan/libpretixui-repo
+++ b/pretixscan/libpretixui-repo
@@ -1 +1 @@
-Subproject commit be90a2ceb71e228e5cdf05895a6438cef82399b3
+Subproject commit 20053f7f34d8f9e40d4cf57039d9a9efa09dac59