From 5cf5775b64aee4da669f06011aa35e454a948d4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Berenguel?= <andre.berenguel@gmail.com>
Date: Wed, 9 Oct 2024 22:47:51 -0300
Subject: [PATCH] #2294: handle full id when merging account info

---
 .../java/iped/parsers/whatsapp/WAAccount.java    |  4 ----
 .../java/iped/parsers/whatsapp/WAContact.java    | 16 ++++++++++------
 .../iped/parsers/whatsapp/WhatsAppParser.java    |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/WAAccount.java b/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/WAAccount.java
index 28ef16c437..4c5da30df5 100644
--- a/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/WAAccount.java
+++ b/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/WAAccount.java
@@ -30,10 +30,6 @@ public WAAccount(String id) {
         super(id);
     }
 
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public String getTitle() {
         return "WhatsApp Account: " + getName();
     }
diff --git a/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/WAContact.java b/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/WAContact.java
index 24148ec45a..7a055d9bbf 100644
--- a/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/WAContact.java
+++ b/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/WAContact.java
@@ -4,9 +4,9 @@ public class WAContact {
 
     protected static final String waSuffix = "@s.whatsapp.net";
 
-    protected String id;
+    private String id;
 
-    private final String suffix;
+    private String suffix;
 
     private String status;
 
@@ -27,6 +27,14 @@ public class WAContact {
     private boolean deleted = false;
 
     public WAContact(String id) {
+        updateId(id);
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void updateId(String id) {
         if (id != null) {
             String[] idSplit = id.split("@", 2);
             this.id = idSplit[0].trim();
@@ -36,10 +44,6 @@ public WAContact(String id) {
         }
     }
 
-    public String getId() {
-        return id;
-    }
-
     public String getStatus() {
         return status;
     }
diff --git a/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/WhatsAppParser.java b/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/WhatsAppParser.java
index d4399d27d7..b1e8c40e0e 100644
--- a/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/WhatsAppParser.java
+++ b/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/WhatsAppParser.java
@@ -879,7 +879,7 @@ private WAAccount getUserAccount(IItemSearcher searcher, String dbPath, boolean
                     WAAccount a = isAndroid ? WAAccount.getFromAndroidXml(is) : WAAccount.getFromIOSPlist(is);
                     if (a != null) {
                         if (account.isUnknown() && !a.getId().isEmpty()) {
-                            account.setId(a.getId());
+                            account.updateId(a.getFullId());
                             account.setUnknown(false);
                         }
                         if (account.getWaName() == null && a.getWaName() != null) {