Merge branch 'master' into #2294_user_account_register_xml

aberenguel · Oct 15, 2024 · b0470a2 · b0470a2
2 parents ca1d4f5 + 474f4b9
commit b0470a2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/iped-engine/src/main/java/iped/engine/datasource/UfedXmlReader.java b/iped-engine/src/main/java/iped/engine/datasource/UfedXmlReader.java
@@ -1436,6 +1436,11 @@ private String handleAttachment(Item item) {
                     // Replace extracted path by attached file's local path
                     extracted_path = ufedFileIdToLocalPath.get(item.getMetadata().get(FILE_ID_ATTR));
                 }
+
+                // if extracted_path does not reference a ufedId, use the ufedId of attached file
+                if (ufedId == null && ufedFileIdToLocalPath.containsKey(item.getMetadata().get(FILE_ID_ATTR))) {
+                    ufedId = item.getMetadata().get(FILE_ID_ATTR);
+                }
 
             }
             setContent(item, extracted_path);

diff --git a/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/Message.java b/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/Message.java
@@ -637,7 +637,7 @@ public void setMessageTemplate(MessageTemplate messageTemplate) {
     }
 
     public long getSortId() {
-        return sortId;
+        return sortId != 0 ? sortId : timeStamp != null ? timeStamp.getTime() : id;
     }
 
     public void setSortId(long sortId) {
@@ -690,18 +690,6 @@ public static enum MessageQuotedType {
 
     @Override
     public int compareTo(Message o) {
-        if (getSortId() != 0 && o.getSortId() != 0) {
-            int comp = Long.compare(getSortId(), o.getSortId());
-            if (comp != 0) {
-                return comp;
-            }
-        }
-        if (getTimeStamp() != null && o.getTimeStamp() != null) {
-            int comp = getTimeStamp().compareTo(o.getTimeStamp());
-            if (comp != 0) {
-                return comp;
-            }
-        }
-        return Long.compare(getId(), o.getId());
+        return Long.compare(getSortId(), o.getSortId());
     }
 }