From 5d954a3f114811397ed05c6abb1999efeed74f3b Mon Sep 17 00:00:00 2001
From: tc-wleite <wladimir.leite@gmail.com>
Date: Thu, 21 Sep 2023 22:59:37 -0300
Subject: [PATCH] '#1889: Minor code enhancements.

---
 .../src/main/java/iped/parsers/whatsapp/ExtractorIOS.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/ExtractorIOS.java b/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/ExtractorIOS.java
index 80fb8cfd34..b4a65bf049 100644
--- a/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/ExtractorIOS.java
+++ b/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/ExtractorIOS.java
@@ -157,7 +157,6 @@ protected List<Chat> extractChatList() throws WAExtractorException {
                     }
                 }
 
-                Map<Long, Chat> idToChat = new HashMap<Long, Chat>();                
                 String chatListQuery = hasProfilePictureItemTable ? SELECT_CHAT_LIST : SELECT_CHAT_LIST_NO_PPIC;
 
                 try (ResultSet rs = stmt.executeQuery(chatListQuery)) {
@@ -175,7 +174,6 @@ protected List<Chat> extractChatList() throws WAExtractorException {
                                 activeChats.add(c.getId());
                             }
                             list.add(c);
-                            idToChat.put(c.getId(), c);
                         }
                     }
                 } catch (SQLException ex) {
@@ -198,6 +196,10 @@ protected List<Chat> extractChatList() throws WAExtractorException {
                 }
 
                 // Extract messages of all non-group and group chats at once, not per chat
+                Map<Long, Chat> idToChat = new HashMap<Long, Chat>();
+                for (Chat c : list) {
+                    idToChat.put(c.getId(), c);
+                }
                 extractMessages(conn, idToChat, firstTry, false);
                 extractMessages(conn, idToChat, firstTry, true);