Merge remote-tracking branch 'origin/master' into #1866_ColoredBookmarks

sepinf-inc · Sep 16, 2023 · 143a3ac · 143a3ac
2 parents 16b4527 + ba118c1
commit 143a3ac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 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
@@ -435,19 +435,9 @@ public void startDocument() throws SAXException {
             out.setTimeZone(TimeZone.getTimeZone("GMT")); //$NON-NLS-1$
         }
 
-        private DateFormat lastDateFormat = null;
-
         private Date parseDate(String value) throws ParseException {
-            if (lastDateFormat != null) {
-                try {
-                    return lastDateFormat.parse(value);
-                } catch (ParseException e) {
-                    // ignore
-                }
-            }
             for (DateFormat df : dfs) {
                 try {
-                    lastDateFormat = df;
                     return df.parse(value);
                 } catch (ParseException e) {
                     // ignore

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
@@ -25,13 +25,12 @@ public class WAContact {
     private boolean deleted = false;
 
     public WAContact(String id) {
-        if (id != null && id.contains("@")) { //$NON-NLS-1$
-            String[] id_split = id.split("@"); //$NON-NLS-1$
-            this.id = id_split[0];
-            this.suffix = id_split[1];
+        if (id != null) {
+            String[] idSplit = id.split("@", 2);
+            this.id = idSplit[0].trim();
+            this.suffix = idSplit.length > 1 ? idSplit[1].trim() : "";
         } else {
-            this.id = id;
-            this.suffix = ""; //$NON-NLS-1$
+            this.id = this.suffix = "";
         }
     }