diff --git a/app/src/main/java/protect/card_locker/CatimaBarcodeWithValue.java b/app/src/main/java/protect/card_locker/CatimaBarcodeWithValue.java
deleted file mode 100644
index cd02ea3ee7..0000000000
--- a/app/src/main/java/protect/card_locker/CatimaBarcodeWithValue.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package protect.card_locker;
-
-public class CatimaBarcodeWithValue {
-    private final CatimaBarcode mCatimaBarcode;
-    private final String mValue;
-
-    public CatimaBarcodeWithValue(CatimaBarcode catimaBarcode, String value) {
-        mCatimaBarcode = catimaBarcode;
-        mValue = value;
-    }
-
-    public CatimaBarcode catimaBarcode() {
-        return mCatimaBarcode;
-    }
-
-    public String value() {
-        return mValue;
-    }
-}
diff --git a/app/src/main/java/protect/card_locker/CatimaBarcodeWithValue.kt b/app/src/main/java/protect/card_locker/CatimaBarcodeWithValue.kt
new file mode 100644
index 0000000000..5fe48c93e8
--- /dev/null
+++ b/app/src/main/java/protect/card_locker/CatimaBarcodeWithValue.kt
@@ -0,0 +1,14 @@
+package protect.card_locker
+
+class CatimaBarcodeWithValue(
+    private val mCatimaBarcode: CatimaBarcode,
+    private val mValue: String?
+) {
+    fun catimaBarcode(): CatimaBarcode {
+        return mCatimaBarcode
+    }
+
+    fun value(): String? {
+        return mValue
+    }
+}