From 02c514272e4090dd750926f94c28403c6bc065c8 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Tue, 7 Oct 2025 11:56:14 +0200
Subject: [PATCH] feat: OTP tag #2122

---
 CHANGELOG                                                     | 2 +-
 .../src/main/java/com/kunzisoft/keepass/otp/OtpEntryFields.kt | 4 +++-
 fastlane/metadata/android/en-US/changelogs/144.txt            | 2 +-
 fastlane/metadata/android/fr-FR/changelogs/144.txt            | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9a84c8068..1e847df7d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,7 +6,7 @@ KeePassDX(4.2.0)
  * Change Passkey Backup Eligibility & Backup State #2135 #2150
  * Search settings #2112 #2181 #2187
  * Autofill refactoring #765
- * Small fixes #2157 #2164 #2171
+ * Small fixes #2157 #2164 #2171 #2122
 
 KeePassDX(4.1.9)
  * Fix landscape UI #2198 #2200 (@chenxiaolong)
diff --git a/database/src/main/java/com/kunzisoft/keepass/otp/OtpEntryFields.kt b/database/src/main/java/com/kunzisoft/keepass/otp/OtpEntryFields.kt
index 5d211e513..bdcfabd74 100644
--- a/database/src/main/java/com/kunzisoft/keepass/otp/OtpEntryFields.kt
+++ b/database/src/main/java/com/kunzisoft/keepass/otp/OtpEntryFields.kt
@@ -40,6 +40,7 @@ object OtpEntryFields {
 
     // Field from KeePassXC
     private const val OTP_FIELD = "otp"
+    private const val OTP_TAG = "OTP"
 
     // URL parameters (https://github.com/google/google-authenticator/wiki/Key-Uri-Format)
     private const val OTP_SCHEME = "otpauth"
@@ -438,13 +439,14 @@ object OtpEntryFields {
     fun EntryInfo.setOtp(otpString: String): Boolean {
         // Replace the OTP field
         parseOTPUri(otpString)?.let { otpElement ->
+            tags.put(OTP_TAG)
             if (title.isEmpty())
                 title = otpElement.issuer
             if (username.isEmpty())
                 username = otpElement.name
             // Add OTP field
             val mutableCustomFields = customFields as ArrayList<Field>
-            val otpField = OtpEntryFields.buildOtpField(otpElement, null, null)
+            val otpField = buildOtpField(otpElement, null, null)
             if (mutableCustomFields.contains(otpField)) {
                 mutableCustomFields.remove(otpField)
             }
diff --git a/fastlane/metadata/android/en-US/changelogs/144.txt b/fastlane/metadata/android/en-US/changelogs/144.txt
index 0d8de3c08..b0b9550c3 100644
--- a/fastlane/metadata/android/en-US/changelogs/144.txt
+++ b/fastlane/metadata/android/en-US/changelogs/144.txt
@@ -2,4 +2,4 @@
  * Search settings #2112 #2181
  * Setting to close database after a Passkey selection #2187
  * Autofill refactoring #765
- * Small fixes #2171 #2150 #2159
\ No newline at end of file
+ * Small fixes #2171 #2150 #2159 #2122
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/144.txt b/fastlane/metadata/android/fr-FR/changelogs/144.txt
index 13ff2135a..b5bacf79d 100644
--- a/fastlane/metadata/android/fr-FR/changelogs/144.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/144.txt
@@ -2,4 +2,4 @@
  * Paramètres de recherche #2112 #2181
  * Paramètre de fermeture de la base après une sélection de Passkey #2187
  * Refonte du remplissage automatique #765
- * Petites corrections #2171 #2150 #2159
\ No newline at end of file
+ * Petites corrections #2171 #2150 #2159 #2122
\ No newline at end of file