Remove legacy code for item-badge relationship

pretix · May 9, 2024 · c0616df · c0616df
1 parent ff47111
commit c0616df
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/PrintUtils.kt b/pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/PrintUtils.kt
@@ -49,21 +49,10 @@ fun getBadgeLayout(application: PretixScan, position: JSONObject, eventSlug: Str
         }
     }
 
-    /* Legacy mechanism: Keep around until pretix 2.5 is end of life */
-    val item = application.data.select(Item::class.java)
-            .where(Item.SERVER_ID.eq(itemid_server))
-            .get().firstOrNull() ?: return getDefaultBadgeLayout()
-    if (item.getBadge_layout_id() != null) {
-        return application.data.select(BadgeLayout::class.java)
-                .where(BadgeLayout.SERVER_ID.eq(item.getBadge_layout_id()))
-                .and(BadgeLayout.EVENT_SLUG.eq(eventSlug))
-                .get().firstOrNull() ?: getDefaultBadgeLayout()
-    } else { // Also used for current pretix versions for obtaining the event's default badge layout
-        return application.data.select(BadgeLayout::class.java)
-                .where(BadgeLayout.IS_DEFAULT.eq(true))
-                .and(BadgeLayout.EVENT_SLUG.eq(eventSlug))
-                .get().firstOrNull() ?: getDefaultBadgeLayout()
-    }
+    return application.data.select(BadgeLayout::class.java)
+            .where(BadgeLayout.IS_DEFAULT.eq(true))
+            .and(BadgeLayout.EVENT_SLUG.eq(eventSlug))
+            .get().firstOrNull() ?: getDefaultBadgeLayout()
 }
 
 fun isPackageInstalled(packagename: String, packageManager: PackageManager): Boolean {

diff --git a/pretixscan/libpretixsync-repo b/pretixscan/libpretixsync-repo
+0 −23		libpretixsync/src/main/java/eu/pretix/libpretixsync/api/PermissionDeniedApiException.java
+1 −1		libpretixsync/src/main/java/eu/pretix/libpretixsync/api/PretixApi.kt
+6 −19		libpretixsync/src/main/java/eu/pretix/libpretixsync/check/AsyncCheckProvider.kt
+1 −2		libpretixsync/src/main/java/eu/pretix/libpretixsync/check/OnlineCheckProvider.kt
+0 −3		libpretixsync/src/main/java/eu/pretix/libpretixsync/db/AbstractItem.java
+6 −1		libpretixsync/src/main/java/eu/pretix/libpretixsync/db/Migrations.java
+3 −0		libpretixsync/src/main/java/eu/pretix/libpretixsync/setup/EventManager.kt
+0 −31		libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/BadgeLayoutSyncAdapter.java
+0 −4		libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/SyncException.java
+14 −28		libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/SyncManager.java
+0 −12		libpretixsync/src/main/java/eu/pretix/libpretixsync/utils/InputUtils.kt
+0 −24		libpretixsync/src/test/java/eu/pretix/libpretixsync/check/AsyncCheckProviderTest.kt