#1774 possible fix

sepinf-inc · Jul 17, 2023 · 8b0ea7a · 8b0ea7a
1 parent 12a615d
commit 8b0ea7a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/ExtractorAndroid.java b/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/ExtractorAndroid.java
@@ -79,6 +79,7 @@ public class ExtractorAndroid extends Extractor {
     private boolean hasSubjectCol = false;
     private boolean hasMediaDurationCol = false;
     private boolean hasGroupParticiantsTable = true;
+    private boolean hasFoward = false;
     private SQLException parsingException = null;
 
     public ExtractorAndroid(String itemPath, File databaseFile, WAContactsDirectory contacts, WAAccount account, boolean recoverDeletedRecords) {
@@ -150,6 +151,7 @@ protected List<Chat> extractChatList() throws WAExtractorException {
                     hasEditVersionCol = SQLite3DBParser.checkIfColumnExists(conn, "messages", "edit_version"); //$NON-NLS-1$ //$NON-NLS-2$
                     hasMediaCaptionCol = SQLite3DBParser.checkIfColumnExists(conn, "messages", "media_caption"); //$NON-NLS-1$ //$NON-NLS-2$
                     hasMediaDurationCol = SQLite3DBParser.checkIfColumnExists(conn, "messages", "media_duration"); //$NON-NLS-1$ //$NON-NLS-2$
+                    hasFoward = SQLite3DBParser.checkIfColumnExists(conn, "messages", "forwarded"); //$NON-NLS-1$ //$NON-NLS-2$
                     if (!hasChatView) {
                         hasSubjectCol = SQLite3DBParser.checkIfColumnExists(conn, "chat_list", "subject"); //$NON-NLS-1$ //$NON-NLS-2$
                     }
@@ -501,7 +503,7 @@ private Message createMessageFromDBRow(ResultSet rs, WAContact remote, boolean i
             }
         }
         m.setDeleted(deleted);
-        m.setForwarded(rs.getInt("forwarded") > 0);
+        m.setForwarded(hasFoward && (rs.getInt("forwarded") > 0));
 
         return m;
     }