Merge branch 'master' into #1823_whisper_transcription

iped-app/resources/config/conf/ParsingTaskConfig.txt

@@ -32,6 +32,10 @@ minRawStringSize = 4
 # Possible values: internal, external, all
 phoneParsersToUse = internal
 
+# List of UFED sources names for which IPED has a specific internal parser.
+# This avoids duplicated decoding results when 'phoneParsersToUse = internal'
+sourcesWithInternalParsers = WhatsApp, WhatsApp (Dual App), WhatsApp Business, Telegram
+
 # If true, takes into account the characters' position on the page when reconstructing the extracted text.
 # Needed to properly index rotated PDFs but doubles the processing time of PDFs.
 sortPDFChars = false

iped-app/resources/localization/iped-categories.properties

@@ -28,8 +28,8 @@ Windows\ Artifacts=Windows\ Artifacts
 Event\ Files=Event\ Files
 Event\ Records=Event\ Records
 Prefetch\ and\ Superfetch=Prefetch\ and\ Superfetch
-User\ Activities=Windows\ 10\ User\ Timeline
-User\ Activities\ Entries=Windows\ 10\ User\ Timeline\ Records
+User\ Activities=User\ Timeline
+User\ Activities\ Entries=User\ Timeline\ Records
 Windows\ Registry=Windows\ Registry
 Main\ Registry\ Files=Main\ Registry\ Files
 Other\ Registry\ Files=Other\ Registry\ Files

iped-app/resources/localization/iped-categories_de_DE.properties

@@ -28,8 +28,8 @@ Windows\ Artifacts=Windows\ Artefakte
 Event\ Files=Ereignis\ Dateien
 Event\ Records=Ereignis\ Aufzeichnungen
 Prefetch\ and\ Superfetch=Prefetch\ und\ Superfetch
-User\ Activities=Windows\ 10\ Benutzer\ Zeitlinie
-User\ Activities\ Entries=Windows\ 10\ Benutzer\ Zeitlinienaufzeichnungen
+User\ Activities=Benutzer\ Zeitlinie
+User\ Activities\ Entries=Benutzer\ Zeitlinienaufzeichnungen
 Windows\ Registry=Windows\ Registrierung
 Main\ Registry\ Files=wesentliche\ Registry-Dateien
 Other\ Registry\ Files=andere\ Registry-Dateien

iped-app/resources/localization/iped-categories_es_AR.properties

@@ -28,8 +28,8 @@ Windows\ Artifacts=Windows\ Artefactos
 Event\ Files=Eventos\ Archivos
 Event\ Records=Eventos\ Grabados
 Prefetch\ and\ Superfetch=Prefetch\ y\ Superfetch
-User\ Activities=Windows\ 10\ Usuario\ Línea de tiempo
-User\ Activities\ Entries=Windows\ 10\ Usuario\ Línea de tiempo\ Registros
+User\ Activities=Usuario\ Línea de tiempo
+User\ Activities\ Entries=Usuario\ Línea de tiempo\ Registros
 Windows\ Registry=Registros\ Windows
 Main\ Registry\ Files=Registro\ Principal\ Archivos
 Other\ Registry\ Files=Otros\ Registros\ de\ Archivos

iped-app/resources/localization/iped-categories_it_IT.properties

@@ -28,8 +28,8 @@ Windows\ Artifacts=Windows\ Artifacts
 Event\ Files=File\ Evento
 Event\ Records=Registro\ Eventi
 Prefetch\ and\ Superfetch=Prefetch\ e\ Superfetch
-User\ Activities=Timeline\ Utente\ Windows\ 10
-User\ Activities\ Entries=Timeline\ Eventi\ Utente\ Windows\ 10
+User\ Activities=Timeline\ Utente
+User\ Activities\ Entries=Timeline\ Eventi\ Utente
 Windows\ Registry=Registro\ di\ Windows
 Main\ Registry\ Files=File\ Registro\ Principale
 Other\ Registry\ Files=Altri\ File\ di\ Registro

iped-app/resources/localization/iped-categories_pt_BR.properties

@@ -28,8 +28,8 @@ Windows\ Artifacts=Artefatos\ do\ Windows
 Event\ Files=Arquivos\ de\ Eventos
 Event\ Records=Registros\ de\ Eventos
 Prefetch\ and\ Superfetch=Prefetch\ e\ Superfetch
-User\ Activities=Linha\ do\ Tempo\ do\ Usuário\ do\ Windows\ 10
-User\ Activities\ Entries=Registros\ da\ Linha\ do\ Tempo\ do\ Usuário\ do\ Windows\ 10
+User\ Activities=Linha\ do\ Tempo\ do\ Usuário
+User\ Activities\ Entries=Registros\ da\ Linha\ do\ Tempo\ do\ Usuário
 Windows\ Registry=Registro\ do\ Windows
 Main\ Registry\ Files=Arquivos\ de\ Registro\ Principais
 Other\ Registry\ Files=Outros\ Arquivos\ de\ Registro

iped-app/resources/localization/iped-desktop-messages.properties

@@ -16,7 +16,7 @@ App.NoFilter=[No filter]
 App.Options=Options
 App.RecursiveListing=Recursive Listing
 App.Search=Search
-App.SearchBoxTip=[Type or choose the search expression]
+App.SearchBoxTip=[Type or choose the search expression. Use [TAB] to autocomplete properties.]
 App.SearchLabel=Search:
 App.Table=Table
 App.ToggleTimelineView=Toggle Table Timeline View

iped-app/resources/localization/iped-desktop-messages_de_DE.properties

@@ -16,7 +16,7 @@ App.NoFilter=[kein Filter]
 App.Options=Optionen
 App.RecursiveListing=Rekursive Auflistung
 App.Search=Suche
-App.SearchBoxTip=[Suchbegriff eingeben oder auswählen]
+App.SearchBoxTip=[Suchbegriff eingeben oder auswählen. Use [TAB] to autocomplete properties.][TBT]
 App.SearchLabel=Suche:
 App.Table=Tabelle
 App.ToggleTimelineView=Tabelle in Zeitleistenansicht umschalten

iped-app/resources/localization/iped-desktop-messages_es_AR.properties

@@ -16,7 +16,7 @@ App.NoFilter=[Sin filtrar]
 App.Options=Opciones
 App.RecursiveListing=Lista recursiva
 App.Search=Buscar
-App.SearchBoxTip=[Escriba o elija la expresión de búsqueda]
+App.SearchBoxTip=[Escriba o elija la expresión de búsqueda. Use [TAB] to autocomplete properties.][TBT]
 App.SearchLabel=Buscar:
 App.Table=Tabla
 App.ToggleTimelineView=Alternar vista de línea de tiempo de tabla

iped-app/resources/localization/iped-desktop-messages_it_IT.properties

@@ -16,7 +16,7 @@ App.NoFilter=[Nessun filtro]
 App.Options=Opzioni
 App.RecursiveListing=Elenco ricorsivo
 App.Search=Ricerca
-App.SearchBoxTip=[Digita o scegli l''espressione di ricerca]
+App.SearchBoxTip=[Digita o scegli l''espressione di ricerca. Use [TAB] to autocomplete properties.][TBT]
 App.SearchLabel=Ricerca:
 App.Table=Tabella
 App.ToggleTimelineView=Visualizzazione Timeline della Tabella

iped-app/resources/localization/iped-desktop-messages_pt_BR.properties

@@ -16,7 +16,7 @@ App.NoFilter=[Sem Filtro]
 App.Options=Opções
 App.RecursiveListing=Listagem recursiva de diretórios
 App.Search=Pesquisar
-App.SearchBoxTip=[Digite ou escolha a expressão a ser pesquisada]
+App.SearchBoxTip=[Digite ou escolha a expressão a ser pesquisada. Use [TAB] para autocompletar propriedades.]
 App.SearchLabel=Pesquisar:
 App.Table=Tabela
 App.ToggleTimelineView=Alternar Visualização de Timeline na Tabela

iped-app/resources/localization/iped-parsers-messages.properties

@@ -258,6 +258,7 @@ WhatsAppReport.VideoCall=Video Call
 WhatsAppReport.UserJoinedGroupCommunity=joined group from community
 WhatsAppReport.UserJoinedGroupInvitation=joined group from invitation
 WhatsAppReport.UserJoinedGroupLink=joined group from shared link
+WhatsAppReport.ResetGroupLink=reset this group's invite link
 WhatsAppReport.GroupDescriptionChanged=Group description changed
 WhatsAppReport.GroupDescriptionDeleted=deleted group description
 WhatsAppReport.GroupNameChanged=changed the group name to 
@@ -308,7 +309,9 @@ WhatsAppReport.BusinessChangedName=This business account changed its name.
 WhatsAppReport.ChatBusinessOfficial=This chat is with an official business account.
 WhatsAppReport.GroupAddedToCommunity=Group was added to the community
 WhatsAppReport.GroupRemovedFromCommunity=Group was removed from the community
+WhatsAppReport.AnyCommunityMemberCanJoinThisGroup=Anyone in the community can join this group.
 WhatsAppReport.CommunityManagementAction=Community management action.
+WhatsAppReport.CommunityRenamed=changed the community's name
 WhatsAppReport.CommunityWelcome=Welcome to the community.
 WhatsAppReport.NewParticipantsNeedAdminApproval=New participants need admin approval to join this group.
 WhatsAppReport.ChatAddedPrivacy=This chat has added privacy for your profile and phone number.

iped-app/resources/localization/iped-parsers-messages_de_DE.properties

@@ -258,6 +258,7 @@ WhatsAppReport.VideoCall=Videoanruf
 WhatsAppReport.UserJoinedGroupCommunity=joined group from community[TBT]
 WhatsAppReport.UserJoinedGroupInvitation=joined group from invitation[TBT]
 WhatsAppReport.UserJoinedGroupLink=hat sich über geteilten Link der Gruppe angeschlossen
+WhatsAppReport.ResetGroupLink=reset this group's invite link[TBT]
 WhatsAppReport.GroupDescriptionChanged=Gruppenbeschreibung geändert
 WhatsAppReport.GroupDescriptionDeleted=deleted group description[TBT]
 WhatsAppReport.GroupNameChanged=changed the group name to [TBT]
@@ -308,7 +309,9 @@ WhatsAppReport.BusinessChangedName=This business account changed its name.[TBT]
 WhatsAppReport.ChatBusinessOfficial=This chat is with an official business account.[TBT]
 WhatsAppReport.GroupAddedToCommunity=Group was added to the community[TBT]
 WhatsAppReport.GroupRemovedFromCommunity=Group was removed from the community[TBT]
+WhatsAppReport.AnyCommunityMemberCanJoinThisGroup=Any community member can join this group.[TBT]
 WhatsAppReport.CommunityManagementAction=Community management action.[TBT]
+WhatsAppReport.CommunityRenamed=changed the community's name[TBT]
 WhatsAppReport.CommunityWelcome=Welcome to the community.[TBT]
 WhatsAppReport.NewParticipantsNeedAdminApproval=New participants need admin approval to join this group.[TBT]
 WhatsAppReport.ChatAddedPrivacy=This chat has added privacy for your profile and phone number.[TBT]

iped-app/resources/localization/iped-parsers-messages_es_AR.properties

@@ -258,6 +258,7 @@ WhatsAppReport.VideoCall=Video Llamada
 WhatsAppReport.UserJoinedGroupCommunity=joined group from community[TBT]
 WhatsAppReport.UserJoinedGroupInvitation=joined group from invitation[TBT]
 WhatsAppReport.UserJoinedGroupLink=se unió al grupo desde un enlace compartido
+WhatsAppReport.ResetGroupLink=reset this group's invite link[TBT]
 WhatsAppReport.GroupDescriptionChanged=Se ha modificado la descripción del grupo
 WhatsAppReport.GroupDescriptionDeleted=deleted group description[TBT]
 WhatsAppReport.GroupNameChanged=changed the group name to [TBT]
@@ -308,7 +309,9 @@ WhatsAppReport.BusinessChangedName=This business account changed its name.[TBT]
 WhatsAppReport.ChatBusinessOfficial=This chat is with an official business account.[TBT]
 WhatsAppReport.GroupAddedToCommunity=Group was added to the community[TBT]
 WhatsAppReport.GroupRemovedFromCommunity=Group was removed from the community[TBT]
+WhatsAppReport.AnyCommunityMemberCanJoinThisGroup=Cualquier miembro de la comunidad puede unirse a este grupo.
 WhatsAppReport.CommunityManagementAction=Community management action.[TBT]
+WhatsAppReport.CommunityRenamed=cambió el nombre de la comunidad
 WhatsAppReport.CommunityWelcome=Welcome to the community.[TBT]
 WhatsAppReport.NewParticipantsNeedAdminApproval=New participants need admin approval to join this group.[TBT]
 WhatsAppReport.ChatAddedPrivacy=This chat has added privacy for your profile and phone number.[TBT]

iped-app/resources/localization/iped-parsers-messages_it_IT.properties

@@ -258,6 +258,7 @@ WhatsAppReport.VideoCall=Videochiamata
 WhatsAppReport.UserJoinedGroupCommunity=joined group from community[TBT]
 WhatsAppReport.UserJoinedGroupInvitation=joined group from invitation[TBT]
 WhatsAppReport.UserJoinedGroupLink=si è unito al gruppo tramite link condiviso
+WhatsAppReport.ResetGroupLink=reset this group's invite link[TBT]
 WhatsAppReport.GroupDescriptionChanged=Descrizione gruppo modificata
 WhatsAppReport.GroupDescriptionDeleted=deleted group description[TBT]
 WhatsAppReport.GroupNameChanged=changed the group name to [TBT]
@@ -308,7 +309,9 @@ WhatsAppReport.BusinessChangedName=This business account changed its name.[TBT]
 WhatsAppReport.ChatBusinessOfficial=This chat is with an official business account.[TBT]
 WhatsAppReport.GroupAddedToCommunity=Group was added to the community[TBT]
 WhatsAppReport.GroupRemovedFromCommunity=Group was removed from the community[TBT]
+WhatsAppReport.AnyCommunityMemberCanJoinThisGroup=Any community member can join this group.[TBT]
 WhatsAppReport.CommunityManagementAction=Community management action.[TBT]
+WhatsAppReport.CommunityRenamed=changed the community's name[TBT]
 WhatsAppReport.CommunityWelcome=Welcome to the community.[TBT]
 WhatsAppReport.NewParticipantsNeedAdminApproval=New participants need admin approval to join this group.[TBT]
 WhatsAppReport.ChatAddedPrivacy=This chat has added privacy for your profile and phone number.[TBT]

iped-app/resources/localization/iped-parsers-messages_pt_BR.properties

@@ -258,6 +258,7 @@ WhatsAppReport.VideoCall=Chamada de vídeo
 WhatsAppReport.UserJoinedGroupCommunity=entrou no grupo através da comunidade
 WhatsAppReport.UserJoinedGroupInvitation=entrou no grupo usando convite
 WhatsAppReport.UserJoinedGroupLink=entrou no grupo através de link de convite deste grupo
+WhatsAppReport.ResetGroupLink=redefiniu o link de convite deste grupo
 WhatsAppReport.GroupDescriptionChanged=Descrição do grupo alterada
 WhatsAppReport.GroupDescriptionDeleted=apagou a descrição do grupo
 WhatsAppReport.GroupNameChanged=mudou o nome do grupo para
@@ -308,7 +309,9 @@ WhatsAppReport.BusinessChangedName=Esta conta comercial mudou seu nome.
 WhatsAppReport.ChatBusinessOfficial=Você está conversando com uma conta comercial oficial.
 WhatsAppReport.GroupAddedToCommunity=Grupo foi adicionado a comunidade
 WhatsAppReport.GroupRemovedFromCommunity=Grupo foi removido da comunidade
+WhatsAppReport.AnyCommunityMemberCanJoinThisGroup=Todos os membros da comunidade podem entrar neste grupo.
 WhatsAppReport.CommunityManagementAction=Ação de gerenciamento de comunidade.
+WhatsAppReport.CommunityRenamed=mudou o nome da comunidade
 WhatsAppReport.CommunityWelcome=Bem-vindo à comunidade.
 WhatsAppReport.NewParticipantsNeedAdminApproval=Novos participantes precisam da autorização de um admin para entrar no grupo.
 WhatsAppReport.ChatAddedPrivacy=Esta conversa oferece maior privacidade para seu perfil e número de telefone.

iped-app/src/main/java/iped/app/ui/AppListener.java

@@ -38,7 +38,7 @@ public class AppListener implements ActionListener, MouseListener {
 
     private String searchText = ""; //$NON-NLS-1$
     boolean clearAllFilters = false;
-    private boolean clearSearchBox = false;
+    private boolean updateSearchBox = false;
 
     public void updateFileListing() {
         updateFileListing(null);
@@ -118,16 +118,18 @@ public void actionPerformed(ActionEvent evt) {
             updateFileList = true;
         }
 
-        if (evt.getSource() == App.get().queryComboBox && !clearSearchBox && evt.getActionCommand().equals("comboBoxChanged") && !BookmarksController.get().isUpdatingHistory()) {
+        if (evt.getSource() == App.get().queryComboBox && !updateSearchBox && evt.getActionCommand().equals("comboBoxChanged") && !BookmarksController.get().isUpdatingHistory()) {
             if (App.get().queryComboBox.getSelectedItem() != null) {
                 searchText = App.get().queryComboBox.getSelectedItem().toString();
+                updateSearchBox = true;
                 if (searchText.equals(BookmarksController.HISTORY_DIV) || searchText.equals(App.SEARCH_TOOL_TIP)) {
                     searchText = ""; //$NON-NLS-1$
-                    clearSearchBox = true;
                     App.get().queryComboBox.setSelectedItem(""); //$NON-NLS-1$
+                } else {
+                    searchText = searchText.trim();
+                    BookmarksController.get().addToRecentSearches(searchText);
+                    App.get().queryComboBox.setSelectedItem(searchText);
                 }
-                searchText = searchText.trim();
-                BookmarksController.get().addToRecentSearches(searchText);
             }
 
             if (!searchText.isEmpty())
@@ -187,7 +189,7 @@ public void actionPerformed(ActionEvent evt) {
             App.get().getContextMenu().menuListener.exportFileTree(true, true);
         }
 
-        clearSearchBox = false;
+        updateSearchBox = false;
 
     }
 
@@ -212,7 +214,7 @@ public void mousePressed(MouseEvent evt) {
 
         Object termo = App.get().queryComboBox.getSelectedItem();
         if (termo != null && termo.equals(App.SEARCH_TOOL_TIP) && App.get().queryComboBox.isAncestorOf((Component) evt.getSource())) {
-            clearSearchBox = true;
+            updateSearchBox = true;
             App.get().queryComboBox.setSelectedItem(""); //$NON-NLS-1$
         }
 

iped-app/src/main/java/iped/app/ui/BookmarksController.java

@@ -3,10 +3,12 @@
 import java.io.File;
 import java.io.IOException;
 
+import javax.swing.JComboBox;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 
+import iped.data.IMultiBookmarks;
 import iped.engine.data.Bookmarks;
 import iped.utils.LocalizedFormat;
 import iped.viewers.bookmarks.IBookmarksController;
@@ -54,15 +56,27 @@ public boolean isMultiSetting() {
         return this.multiSetting;
     }
 
-    public void addToRecentSearches(String texto) {
+    public void addToRecentSearches(String text) {
 
-        if (!texto.equals(HISTORY_DIV) && !texto.trim().isEmpty() && !App.get().appCase.getMultiBookmarks().getTypedWords().contains(texto) && !App.get().appCase.getKeywords().contains(texto)) {
-
-            if (App.get().appCase.getMultiBookmarks().getTypedWords().size() == 0)
-                App.get().queryComboBox.addItem(HISTORY_DIV);
-
-            App.get().queryComboBox.addItem(texto);
-            App.get().appCase.getMultiBookmarks().addToTypedWords(texto);
+        if (!text.equals(HISTORY_DIV) && !text.trim().isEmpty() && !App.get().appCase.getKeywords().contains(text)) {
+            JComboBox<String> queryComboBox = App.get().queryComboBox;
+            IMultiBookmarks multiBookmarks = App.get().appCase.getMultiBookmarks();
+
+            if (multiBookmarks.getTypedWords().isEmpty()) {
+                queryComboBox.addItem(HISTORY_DIV);
+            }
+            multiBookmarks.addToTypedWords(text);
+
+            // Remove if already present
+            queryComboBox.removeItem(text);
+
+            // Insert at the top, right after HISTORY_DIV
+            for (int i = 0; i < queryComboBox.getItemCount(); i++) {
+                if (queryComboBox.getItemAt(i).equals(HISTORY_DIV)) {
+                    queryComboBox.insertItemAt(text, i + 1);
+                    break;
+                }
+            }
         }
     }
 
@@ -122,8 +136,9 @@ public void updateUIHistory() {
         if (App.get().appCase.getMultiBookmarks().getTypedWords().size() != 0)
             App.get().queryComboBox.addItem(HISTORY_DIV);
 
+        int insPos = App.get().queryComboBox.getItemCount(); 
         for (String text : App.get().appCase.getMultiBookmarks().getTypedWords()) {
-            App.get().queryComboBox.addItem(text);
+            App.get().queryComboBox.insertItemAt(text, insPos);
         }
         App.get().queryComboBox.setSelectedItem(prevText);
         updatingHistory = false;

iped-app/src/main/java/iped/app/ui/IconManager.java

@@ -333,6 +333,10 @@ private static Map<String, QualityIcon> initMimeToIconMap(int size) {
             mimeIconMap.put("application/x-ufed-visitedpage", icon);
             mimeIconMap.put("application/x-safari-history-registry", icon);
             mimeIconMap.put("application/x-safari-history", icon);
+        }
+
+        icon = availableIconsMap.get("safari-sqlite");
+        if (icon != null) {
             mimeIconMap.put("application/x-safari-sqlite", icon);
         }
 
@@ -343,6 +347,10 @@ private static Map<String, QualityIcon> initMimeToIconMap(int size) {
             mimeIconMap.put("application/x-chrome-downloads", icon);
             mimeIconMap.put("application/x-chrome-history", icon);
             mimeIconMap.put("application/x-chrome-searches", icon);
+        }
+
+        icon = availableIconsMap.get("chrome-sqlite");
+        if (icon != null) {
             mimeIconMap.put("application/x-chrome-sqlite", icon);
         }
 
@@ -607,6 +615,21 @@ private static Map<String, QualityIcon> initMimeToIconMap(int size) {
             mimeIconMap.put("application/x-vlc-ini", icon);
         }
 
+        icon = availableIconsMap.get("markdown");
+        if (icon != null) {
+            mimeIconMap.put("text/x-web-markdown", icon);
+        }
+
+        icon = availableIconsMap.get("notification");
+        if (icon != null) {
+            mimeIconMap.put("application/x-ufed-notification", icon);
+        }
+
+        icon = availableIconsMap.get("mobilecard");
+        if (icon != null) {
+            mimeIconMap.put("application/x-ufed-mobilecard", icon);
+        }
+
         return mimeIconMap;
     }