remove barcode field when is does not encode anything

PhenoApps · Sep 25, 2023 · 5420265 · 5420265
1 parent 90c9f81
commit 5420265
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/app/src/main/java/com/fieldbook/tracker/traits/LabelPrintTraitLayout.java b/app/src/main/java/com/fieldbook/tracker/traits/LabelPrintTraitLayout.java
@@ -403,7 +403,11 @@ public void onDeviceChosen(String newDeviceName) {
                     labelData = labelData.replace("size2", size2);
                     labelData = labelData.replace("size3", size3);
                     labelData = labelData.replace("size4", size4);
-                    labelData = labelData.replace("barcode", barcode);
+                    if (barcode.isEmpty()) { // remove barcode if it will not encode anything
+                        labelData = labelData.replace("^BQ,,sizeb^FDMA,barcode^FS", "");
+                    } else {
+                        labelData = labelData.replace("barcode", barcode);
+                    }
                     labelData = labelData.replace("sizeb", Integer.toString(barcode_size));
 
                 }