Skip to content

Commit

Permalink
Merge branch '#2286_chat_improvements' into master-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@aberenguel
aberenguel committed Nov 5, 2024
2 parents b7562b8 + 28ef03d commit e83e2f2
Show file tree
Hide file tree
Showing 10 changed files with 194 additions and 146 deletions.
35 changes: 18 additions & 17 deletions iped-app/resources/localization/iped-parsers-messages.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,6 @@ WhatsAppReport.PinnedMessage=pinned a message
WhatsAppReport.AIThirdParty=This AI is from a third-party developer. Meta receives your AI chats to improve AI quality.
WhatsAppReport.Over256MembersOnlyAdminsCanEdit=This group has over 256 members so now only admins can edit the groups settings.
WhatsAppReport.SecurityNotificationsNoLongerAvailable=Security code notifications are no longer available for this chat.
UFEDChatParser.Broadcast=Broadcast
UFEDChatParser.Group=Group
UFEDChatParser.Status=Status
UFEDChatParser.Unknown=Unknown
VCardParser.FormattedName=Formatted Name
VCardParser.Name=Name
VCardParser.Nickname=Nickname
Expand Down Expand Up @@ -528,16 +524,21 @@ OFXParser.Investment=Investment
OFXParser.BankTransactions=Bank Transactions
OFXParser.SubAccountFund=Sub Account Fund
OFXParser.Investments=Investments
UfedChatReport.Edited=Edited
UfedChatReport.Forwarded=Forwarded
UfedChatReport.Forwarded.By=by
UfedChatReport.SharedContact.Title=Contact
UfedChatReport.SharedContact.Name=Name
UfedChatReport.SharedContact.PhoneNumber=Phone Number
UfedChatReport.SharedContact.UserID=User ID
UfedChatReport.SharedContact.Username=Username
UfedChatReport.Location.Title=Location
UfedChatReport.Location.Latitude=Latitude
UfedChatReport.Location.Longitude=Longitude
UfedChatReport.MessageDeletedRecovered=Recovered deleted message
UfedChatReport.MessageRecovered=Recovered message
UFEDChatParser.Broadcast=Broadcast
UFEDChatParser.Channel=Channel
UFEDChatParser.Group=Group
UFEDChatParser.Status=Status
UFEDChatParser.Unknown=Unknown
UFEDChatParser.Edited=Edited
UFEDChatParser.Forwarded=Forwarded
UFEDChatParser.Forwarded.By=by
UFEDChatParser.SharedContact.Title=Contact
UFEDChatParser.SharedContact.Name=Name
UFEDChatParser.SharedContact.PhoneNumber=Phone Number
UFEDChatParser.SharedContact.UserID=User ID
UFEDChatParser.SharedContact.Username=Username
UFEDChatParser.Location.Title=Location
UFEDChatParser.Location.Latitude=Latitude
UFEDChatParser.Location.Longitude=Longitude
UFEDChatParser.MessageDeletedRecovered=Recovered deleted message
UFEDChatParser.MessageRecovered=Recovered message
35 changes: 18 additions & 17 deletions iped-app/resources/localization/iped-parsers-messages_de_DE.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,6 @@ WhatsAppReport.PinnedMessage=pinned a message[TBT]
WhatsAppReport.AIThirdParty=This AI is from a third-party developer. Meta receives your AI chats to improve AI quality.[TBT]
WhatsAppReport.Over256MembersOnlyAdminsCanEdit=Diese Gruppe hat mehr als 256 Mitglieder. Daher können jetzt nur noch Admins die Gruppeneinstellungen bearbeiten.
WhatsAppReport.SecurityNotificationsNoLongerAvailable=Benachrichtigungen zur Sicherheitsnummer sind für diesen Chat nicht länger verfügbar.
UFEDChatParser.Broadcast=Broadcast[TBT]
UFEDChatParser.Group=Group[TBT]
UFEDChatParser.Status=Status[TBT]
UFEDChatParser.Unknown=Unknown[TBT]
VCardParser.FormattedName=Name formatiert
VCardParser.Name=Name
VCardParser.Nickname=Nickname
Expand Down Expand Up @@ -528,16 +524,21 @@ OFXParser.Investment=Investment(TBT)
OFXParser.BankTransactions=Bank Transactions(TBT)
OFXParser.SubAccountFund=Sub Account Fund(TBT)
OFXParser.Investments=Investments(TBT)
UfedChatReport.Edited=Edited(TBT)
UfedChatReport.Forwarded=Forwarded(TBT)
UfedChatReport.Forwarded.By=by(TBT)
UfedChatReport.SharedContact.Title=Contact(TBT)
UfedChatReport.SharedContact.Name=Name(TBT)
UfedChatReport.SharedContact.PhoneNumber=Phone Number(TBT)
UfedChatReport.SharedContact.UserID=User ID(TBT)
UfedChatReport.SharedContact.Username=Username(TBT)
UfedChatReport.Location.Title=Location(TBT)
UfedChatReport.Location.Latitude=Latitude(TBT)
UfedChatReport.Location.Longitude=Longitude(TBT)
UfedChatReport.MessageDeletedRecovered=Recovered deleted message(TBT)
UfedChatReport.MessageRecovered=Recovered message(TBT)
UFEDChatParser.Broadcast=Broadcast[TBT]
UFEDChatParser.Channel=Channel[TBT]
UFEDChatParser.Group=Group[TBT]
UFEDChatParser.Status=Status[TBT]
UFEDChatParser.Unknown=Unknown[TBT]
UFEDChatParser.Edited=Edited(TBT)
UFEDChatParser.Forwarded=Forwarded(TBT)
UFEDChatParser.Forwarded.By=by(TBT)
UFEDChatParser.SharedContact.Title=Contact(TBT)
UFEDChatParser.SharedContact.Name=Name(TBT)
UFEDChatParser.SharedContact.PhoneNumber=Phone Number(TBT)
UFEDChatParser.SharedContact.UserID=User ID(TBT)
UFEDChatParser.SharedContact.Username=Username(TBT)
UFEDChatParser.Location.Title=Location(TBT)
UFEDChatParser.Location.Latitude=Latitude(TBT)
UFEDChatParser.Location.Longitude=Longitude(TBT)
UFEDChatParser.MessageDeletedRecovered=Recovered deleted message(TBT)
UFEDChatParser.MessageRecovered=Recovered message(TBT)
35 changes: 18 additions & 17 deletions iped-app/resources/localization/iped-parsers-messages_es_AR.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,6 @@ WhatsAppReport.PinnedMessage=pinned a message[TBT]
WhatsAppReport.AIThirdParty=This AI is from a third-party developer. Meta receives your AI chats to improve AI quality.[TBT]
WhatsAppReport.Over256MembersOnlyAdminsCanEdit=This group has over 256 members so now only admins can edit the groups settings.[TBT]
WhatsAppReport.SecurityNotificationsNoLongerAvailable=Security code notifications are no longer available for this chat.[TBT]
UFEDChatParser.Broadcast=Broadcast[TBT]
UFEDChatParser.Group=Group[TBT]
UFEDChatParser.Status=Status[TBT]
UFEDChatParser.Unknown=Unknown[TBT]
VCardParser.FormattedName=Nombre con formato
VCardParser.Name=Nombre
VCardParser.Nickname=Sobrenombre
Expand Down Expand Up @@ -528,16 +524,21 @@ OFXParser.Investment=Investment(TBT)
OFXParser.BankTransactions=Bank Transactions(TBT)
OFXParser.SubAccountFund=Sub Account Fund(TBT)
OFXParser.Investments=Investments(TBT)
UfedChatReport.Edited=Edited(TBT)
UfedChatReport.Forwarded=Forwarded(TBT)
UfedChatReport.Forwarded.By=by(TBT)
UfedChatReport.SharedContact.Title=Contact(TBT)
UfedChatReport.SharedContact.Name=Name(TBT)
UfedChatReport.SharedContact.PhoneNumber=Phone Number(TBT)
UfedChatReport.SharedContact.UserID=User ID(TBT)
UfedChatReport.SharedContact.Username=Username(TBT)
UfedChatReport.Location.Title=Location(TBT)
UfedChatReport.Location.Latitude=Latitude(TBT)
UfedChatReport.Location.Longitude=Longitude(TBT)
UfedChatReport.MessageDeletedRecovered=Recovered deleted message(TBT)
UfedChatReport.MessageRecovered=Recovered message(TBT)
UFEDChatParser.Broadcast=Broadcast[TBT]
UFEDChatParser.Channel=Channel[TBT]
UFEDChatParser.Group=Group[TBT]
UFEDChatParser.Status=Status[TBT]
UFEDChatParser.Unknown=Unknown[TBT]
UFEDChatParser.Edited=Edited(TBT)
UFEDChatParser.Forwarded=Forwarded(TBT)
UFEDChatParser.Forwarded.By=by(TBT)
UFEDChatParser.SharedContact.Title=Contact(TBT)
UFEDChatParser.SharedContact.Name=Name(TBT)
UFEDChatParser.SharedContact.PhoneNumber=Phone Number(TBT)
UFEDChatParser.SharedContact.UserID=User ID(TBT)
UFEDChatParser.SharedContact.Username=Username(TBT)
UFEDChatParser.Location.Title=Location(TBT)
UFEDChatParser.Location.Latitude=Latitude(TBT)
UFEDChatParser.Location.Longitude=Longitude(TBT)
UFEDChatParser.MessageDeletedRecovered=Recovered deleted message(TBT)
UFEDChatParser.MessageRecovered=Recovered message(TBT)
35 changes: 18 additions & 17 deletions iped-app/resources/localization/iped-parsers-messages_fr_FR.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,6 @@ WhatsAppReport.PinnedMessage=a epinglé un message
WhatsAppReport.AIThirdParty=Cette IA provient d'un développeur tiers. Meta reçoit vos discussions IA pour améliorer la qualité de l'IA.
WhatsAppReport.Over256MembersOnlyAdminsCanEdit=Comme ce groupe inclut plus de 256 membres, désormais, seulement les admins peuvent modifier les paramètres du groupe.
WhatsAppReport.SecurityNotificationsNoLongerAvailable=Les notifications relatives aux codes de sécurité ne sont plus disponibles pour cette discoussion.
UFEDChatParser.Broadcast=Broadcast[TBT]
UFEDChatParser.Group=Group[TBT]
UFEDChatParser.Status=Status[TBT]
UFEDChatParser.Unknown=Unknown[TBT]
VCardParser.FormattedName=Nom formaté
VCardParser.Name=Nom
VCardParser.Nickname=Surnom
Expand Down Expand Up @@ -528,16 +524,21 @@ OFXParser.Investment=Investissement
OFXParser.BankTransactions=Opérations bancaires
OFXParser.SubAccountFund=Fonds de sous-compte
OFXParser.Investments=Investissements
UfedChatReport.Edited=Modifié
UfedChatReport.Forwarded=Transféré
UfedChatReport.Forwarded.By=by(TBT)
UfedChatReport.SharedContact.Title=Contact
UfedChatReport.SharedContact.Name=Name(TBT)
UfedChatReport.SharedContact.PhoneNumber=Phone Number(TBT)
UfedChatReport.SharedContact.UserID=User ID(TBT)
UfedChatReport.SharedContact.Username=Username(TBT)
UfedChatReport.Location.Title=Location(TBT)
UfedChatReport.Location.Latitude=Latitude(TBT)
UfedChatReport.Location.Longitude=Longitude(TBT)
UfedChatReport.MessageDeletedRecovered=Recovered deleted message(TBT)
UfedChatReport.MessageRecovered=Recovered message(TBT)
UFEDChatParser.Broadcast=Broadcast[TBT]
UFEDChatParser.Channel=Channel[TBT]
UFEDChatParser.Group=Group[TBT]
UFEDChatParser.Status=Status[TBT]
UFEDChatParser.Unknown=Unknown[TBT]
UFEDChatParser.Edited=Modifié
UFEDChatParser.Forwarded=Transféré
UFEDChatParser.Forwarded.By=by(TBT)
UFEDChatParser.SharedContact.Title=Contact
UFEDChatParser.SharedContact.Name=Name(TBT)
UFEDChatParser.SharedContact.PhoneNumber=Phone Number(TBT)
UFEDChatParser.SharedContact.UserID=User ID(TBT)
UFEDChatParser.SharedContact.Username=Username(TBT)
UFEDChatParser.Location.Title=Location(TBT)
UFEDChatParser.Location.Latitude=Latitude(TBT)
UFEDChatParser.Location.Longitude=Longitude(TBT)
UFEDChatParser.MessageDeletedRecovered=Recovered deleted message(TBT)
UFEDChatParser.MessageRecovered=Recovered message(TBT)
35 changes: 18 additions & 17 deletions iped-app/resources/localization/iped-parsers-messages_it_IT.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,6 @@ WhatsAppReport.PinnedMessage=pinned a message[TBT]
WhatsAppReport.AIThirdParty=This AI is from a third-party developer. Meta receives your AI chats to improve AI quality.[TBT]
WhatsAppReport.Over256MembersOnlyAdminsCanEdit=Dato che questo gruppo ha più di 256 membri, solo gli amministratori potranno modificarne le impostazioni.
WhatsAppReport.SecurityNotificationsNoLongerAvailable=Le notifiche sul codice di sicurezza non sono più disponibili per questa chat.
UFEDChatParser.Broadcast=Broadcast[TBT]
UFEDChatParser.Group=Group[TBT]
UFEDChatParser.Status=Status[TBT]
UFEDChatParser.Unknown=Unknown[TBT]
VCardParser.FormattedName=Nome formattato
VCardParser.Name=Nome
VCardParser.Nickname=Nickname
Expand Down Expand Up @@ -528,16 +524,21 @@ OFXParser.Investment=Investment(TBT)
OFXParser.BankTransactions=Bank Transactions(TBT)
OFXParser.SubAccountFund=Sub Account Fund(TBT)
OFXParser.Investments=Investments(TBT)
UfedChatReport.Edited=Edited(TBT)
UfedChatReport.Forwarded=Forwarded(TBT)
UfedChatReport.Forwarded.By=by(TBT)
UfedChatReport.SharedContact.Title=Contact(TBT)
UfedChatReport.SharedContact.Name=Name(TBT)
UfedChatReport.SharedContact.PhoneNumber=Phone Number(TBT)
UfedChatReport.SharedContact.UserID=User ID(TBT)
UfedChatReport.SharedContact.Username=Username(TBT)
UfedChatReport.Location.Title=Location(TBT)
UfedChatReport.Location.Latitude=Latitude(TBT)
UfedChatReport.Location.Longitude=Longitude(TBT)
UfedChatReport.MessageDeletedRecovered=Recovered deleted message(TBT)
UfedChatReport.MessageRecovered=Recovered message(TBT)
UFEDChatParser.Broadcast=Broadcast[TBT]
UFEDChatParser.Channel=Channel[TBT]
UFEDChatParser.Group=Group[TBT]
UFEDChatParser.Status=Status[TBT]
UFEDChatParser.Unknown=Unknown[TBT]
UFEDChatParser.Edited=Edited(TBT)
UFEDChatParser.Forwarded=Forwarded(TBT)
UFEDChatParser.Forwarded.By=by(TBT)
UFEDChatParser.SharedContact.Title=Contact(TBT)
UFEDChatParser.SharedContact.Name=Name(TBT)
UFEDChatParser.SharedContact.PhoneNumber=Phone Number(TBT)
UFEDChatParser.SharedContact.UserID=User ID(TBT)
UFEDChatParser.SharedContact.Username=Username(TBT)
UFEDChatParser.Location.Title=Location(TBT)
UFEDChatParser.Location.Latitude=Latitude(TBT)
UFEDChatParser.Location.Longitude=Longitude(TBT)
UFEDChatParser.MessageDeletedRecovered=Recovered deleted message(TBT)
UFEDChatParser.MessageRecovered=Recovered message(TBT)
35 changes: 18 additions & 17 deletions iped-app/resources/localization/iped-parsers-messages_pt_BR.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,6 @@ WhatsAppReport.PinnedMessage=fixou uma mensagem
WhatsAppReport.AIThirdParty=Esta IA pertence a um desenvolvedor terceirizado. A Meta recebe suas conversas com IA para melhorar a qualidade desse recurso.
WhatsAppReport.Over256MembersOnlyAdminsCanEdit=Agora somente admins podem editar as configurações porque o grupo tem mais de 256 membros.
WhatsAppReport.SecurityNotificationsNoLongerAvailable=As notificações sobre o código de segurança não estão mais disponíveis para esta conversa.
UFEDChatParser.Broadcast=Broadcast
UFEDChatParser.Group=Grupo
UFEDChatParser.Status=Status
UFEDChatParser.Unknown=Desconhecido
VCardParser.FormattedName=Nome Formatado
VCardParser.Name=Nome
VCardParser.Nickname=Apelido
Expand Down Expand Up @@ -528,16 +524,21 @@ OFXParser.Investment=Investimento
OFXParser.BankTransactions=Transacões Bancárias
OFXParser.SubAccountFund=Fundo da Conta Sub
OFXParser.Investments=Investimentos
UfedChatReport.Edited=Editada
UfedChatReport.Forwarded=Encaminhada
UfedChatReport.Forwarded.By=por
UfedChatReport.SharedContact.Title=Contato
UfedChatReport.SharedContact.Name=Nome
UfedChatReport.SharedContact.PhoneNumber=Telefone
UfedChatReport.SharedContact.UserID=User ID
UfedChatReport.SharedContact.Username=Username
UfedChatReport.Location.Title=Localização
UfedChatReport.Location.Latitude=Latitude
UfedChatReport.Location.Longitude=Longitude
UfedChatReport.MessageDeletedRecovered=Mensagem apagada recuperada
UfedChatReport.MessageRecovered=Mensagem recuperada
UFEDChatParser.Broadcast=Broadcast
UFEDChatParser.Channel=Canal
UFEDChatParser.Group=Grupo
UFEDChatParser.Status=Status
UFEDChatParser.Unknown=Desconhecido
UFEDChatParser.Edited=Editada
UFEDChatParser.Forwarded=Encaminhada
UFEDChatParser.Forwarded.By=por
UFEDChatParser.SharedContact.Title=Contato
UFEDChatParser.SharedContact.Name=Nome
UFEDChatParser.SharedContact.PhoneNumber=Telefone
UFEDChatParser.SharedContact.UserID=User ID
UFEDChatParser.SharedContact.Username=Username
UFEDChatParser.Location.Title=Localização
UFEDChatParser.Location.Latitude=Latitude
UFEDChatParser.Location.Longitude=Longitude
UFEDChatParser.MessageDeletedRecovered=Mensagem apagada recuperada
UFEDChatParser.MessageRecovered=Mensagem recuperada
8 changes: 8 additions & 0 deletions iped-engine/src/main/java/iped/engine/datasource/UfedXmlReader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,12 @@ public void startElement(String uri, String localName, String qName, Attributes
boolean deleted = "deleted".equalsIgnoreCase(atts.getValue("deleted")); //$NON-NLS-1$ //$NON-NLS-2$
item.setDeleted(deleted);

boolean trash = "trash".equalsIgnoreCase(atts.getValue("deleted"));
if (trash) {
item.getMetadata().set(ExtraProperties.UFED_META_PREFIX + "deleted_trash", Boolean.toString(true));
item.setDeleted(true);
}

fillCommonMeta(item, atts);
itemSeq.add(item);

Expand Down Expand Up @@ -601,6 +607,7 @@ public void startElement(String uri, String localName, String qName, Attributes
boolean trash = "trash".equalsIgnoreCase(atts.getValue("deleted_state"));
if (trash) {
item.getMetadata().set(ExtraProperties.UFED_META_PREFIX + "deleted_trash", Boolean.toString(true));
item.setDeleted(true);
}

fillCommonMeta(item, atts);
Expand Down Expand Up @@ -645,6 +652,7 @@ public void startElement(String uri, String localName, String qName, Attributes
boolean trash = "trash".equalsIgnoreCase(atts.getValue("deleted_state"));
if (trash) {
item.getMetadata().set(ExtraProperties.UFED_META_PREFIX + "deleted_trash", Boolean.toString(true));
item.setDeleted(true);
}

fillCommonMeta(item, atts);
Expand Down
3 changes: 3 additions & 0 deletions iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/ufed/ReferencedLocation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,7 @@ public String getCountry() {
return readUfedMetadata(item, "Country");
}

public String getPositionAddress() {
return readUfedMetadata(item, "PositionAddress");
}
}
Loading

0 comments on commit e83e2f2

Please sign in to comment.