Merge branch 'sepinf-inc:master' into #2286_chat_improvements

aberenguel · Oct 4, 2024 · a10f091 · a10f091
2 parents 2179615 + d5d1eb1
commit a10f091
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -57,7 +57,7 @@ jobs:
       run:
         cd target && mv release iped-snapshot-$GITHUB_SHA && tar -zcvf ../iped-snapshot.tar.gz iped-snapshot-$GITHUB_SHA
     - name: Upload snapshot
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: iped-snapshot-${{ github.sha }}
         path: iped-snapshot.tar.gz

diff --git a/iped-app/src/main/java/iped/app/bootstrap/Bootstrap.java b/iped-app/src/main/java/iped/app/bootstrap/Bootstrap.java
@@ -250,7 +250,7 @@ private static List<String> getCurrentJVMArgs() {
                 throw new IllegalArgumentException(
                         "Please use -Xms/-Xmx arguments after iped.jar not after java command, since processing will occur in a forked process using those params.");
             }
-            if (arg.startsWith("-Xrunjdwp")) {
+            if ((arg.startsWith("-Xrunjdwp") || arg.startsWith("-agentlib:jdwp")) && arg.contains("server=y")) {
                 // workaround as discussed in PR #1119
                 Matcher matcher = Pattern.compile("address=(\\d+)").matcher(arg);
                 if (matcher.find()) {

diff --git a/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/ExtractorAndroidNew.java b/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/ExtractorAndroidNew.java
@@ -123,7 +123,7 @@ protected List<Chat> extractChatList() throws WAExtractorException {
         Map<Long, Chat> idToChat = new HashMap<Long, Chat>();
 
         try (Connection conn = getConnection(); Statement stmt = conn.createStatement()) {
-            try (ResultSet rs = stmt.executeQuery(SELECT_CHAT_VIEW)) {
+            try (ResultSet rs = stmt.executeQuery(SELECT_CHATS)) {
 
                 while (rs.next()) {
                     String contactId = rs.getString("contact"); //$NON-NLS-1$
@@ -946,8 +946,8 @@ protected Message.MessageType decodeMessageType(int messageType, int status, Int
         return result;
     }
 
-    private static final String SELECT_CHAT_VIEW = "SELECT _id as id, raw_string_jid AS contact," //$NON-NLS-1$
-            + " subject, created_timestamp as creation, sort_timestamp FROM chat_view ORDER BY sort_timestamp DESC"; //$NON-NLS-1$
+    private static final String SELECT_CHATS = "SELECT c._id as id, j.raw_string AS contact, c.subject, c.created_timestamp as creation,"
+            + " sort_timestamp FROM chat c, jid j WHERE c.jid_row_id = j._id ORDER BY c.sort_timestamp DESC";
 
     private static final String SELECT_ADD_ONS = "SELECT message_add_on_type as type,timestamp, status,jid.raw_string as remoteResource,from_me as fromMe FROM message_add_on m left join jid on jid._id=m.sender_jid_row_id where parent_message_row_id=?";