Merge pull request #2246 from gfd2020/fix-jump-quote-edit-messages

Fix jump quoted edited messages on whatsapp, add new message types, fix quoted status, quoted private and quoted catalog messages

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

@@ -276,6 +276,12 @@ WhatsAppReport.FoundInPedoHashDB=Found in Child Porn Alert Hash Database
 WhatsAppReport.Owner=Owner
 WhatsAppReport.Recovered=Recovered
 WhatsAppReport.QuoteNotFound=Quoted message not found
+WhatsAppReport.QuoteStaus=Quoted Status
+WhatsAppReport.QuotePrivacy=Message quoted privately through the group
+WhatsAppReport.QuotePrivacyMessage=This quoted message was created in the group
+WhatsAppReport.QuotePrivacyNotFound=Message quoted privately through the group not found
+WhatsAppReport.QuoteCatalog=Quoted Catalog
+WhatsAppReport.ContactedFindBusinesses=You contacted {0} from find businesses
 WhatsAppReport.Document=Document
 WhatsAppReport.Photo=Photo
 WhatsAppReport.Audio=Audio
@@ -325,6 +331,8 @@ WhatsAppReport.EditedOn=Edited on
 WhatsAppReport.UserJoinedWhatsApp=joined WhatsApp
 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.
 VCardParser.FormattedName=Formatted Name
 VCardParser.Name=Name
 VCardParser.Nickname=Nickname

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

@@ -276,6 +276,12 @@ WhatsAppReport.FoundInPedoHashDB=gefunden in KiPo Hash Database
 WhatsAppReport.Owner=Besitzer
 WhatsAppReport.Recovered=Recovered[TBT]
 WhatsAppReport.QuoteNotFound=Quoted message not found[TBT]
+WhatsAppReport.QuoteStaus=Quoted Status[TBT]
+WhatsAppReport.QuotePrivacy=Message quoted privately through the group[TBT]
+WhatsAppReport.QuotePrivacyMessage=This quoted message was created in the group[TBT]
+WhatsAppReport.QuotePrivacyNotFound=Message quoted privately through the group not found[TBT]
+WhatsAppReport.QuoteCatalog=Quoted Catalog[TBT]
+WhatsAppReport.ContactedFindBusinesses=You contacted {0} from find businesses[TBT]
 WhatsAppReport.Document=Document[TBT]
 WhatsAppReport.Photo=Photo[TBT]
 WhatsAppReport.Audio=Audio[TBT]
@@ -325,6 +331,8 @@ WhatsAppReport.EditedOn=Edited on[TBT]
 WhatsAppReport.UserJoinedWhatsApp=joined WhatsApp[TBT]
 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.
 VCardParser.FormattedName=Name formatiert
 VCardParser.Name=Name
 VCardParser.Nickname=Nickname

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

@@ -276,6 +276,12 @@ WhatsAppReport.FoundInPedoHashDB=Encontrado en la base de datos Hash de Alerta d
 WhatsAppReport.Owner=Propietario
 WhatsAppReport.Recovered=Recovered[TBT]
 WhatsAppReport.QuoteNotFound=Quoted message not found[TBT]
+WhatsAppReport.QuoteStaus=Quoted Status[TBT]
+WhatsAppReport.QuotePrivacy=Message quoted privately through the group[TBT]
+WhatsAppReport.QuotePrivacyMessage=This quoted message was created in the group[TBT]
+WhatsAppReport.QuotePrivacyNotFound=Message quoted privately through the group not found[TBT]
+WhatsAppReport.QuoteCatalog=Quoted Catalog[TBT]
+WhatsAppReport.ContactedFindBusinesses=You contacted {0} from find businesses[TBT]
 WhatsAppReport.Document=Document[TBT]
 WhatsAppReport.Photo=Photo[TBT]
 WhatsAppReport.Audio=Audio[TBT]
@@ -325,6 +331,8 @@ WhatsAppReport.EditedOn=Edited on[TBT]
 WhatsAppReport.UserJoinedWhatsApp=joined WhatsApp[TBT]
 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]
 VCardParser.FormattedName=Nombre con formato
 VCardParser.Name=Nombre
 VCardParser.Nickname=Sobrenombre

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

@@ -276,6 +276,12 @@ WhatsAppReport.FoundInPedoHashDB=Contenu pédopornographique détecté via la ba
 WhatsAppReport.Owner=Propriétaire
 WhatsAppReport.Recovered=Récupéré
 WhatsAppReport.QuoteNotFound=Message cité est introuvable
+WhatsAppReport.QuoteStaus=Quoted Status[TBT]
+WhatsAppReport.QuotePrivacy=Message quoted privately through the group[TBT]
+WhatsAppReport.QuotePrivacyMessage=This quoted message was created in the group[TBT]
+WhatsAppReport.QuotePrivacyNotFound=Message quoted privately through the group not found[TBT]
+WhatsAppReport.QuoteCatalog=Quoted Catalog[TBT]
+WhatsAppReport.ContactedFindBusinesses=You contacted {0} from find businesses[TBT]
 WhatsAppReport.Document=Document
 WhatsAppReport.Photo=Photo
 WhatsAppReport.Audio=Audio
@@ -325,6 +331,8 @@ WhatsAppReport.EditedOn=Modifié en
 WhatsAppReport.UserJoinedWhatsApp=a rejoint WhatsApp
 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.
 VCardParser.FormattedName=Nom formaté
 VCardParser.Name=Nom
 VCardParser.Nickname=Surnom

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

@@ -276,6 +276,12 @@ WhatsAppReport.FoundInPedoHashDB=Trovato nel Database di materiale pedopornograf
 WhatsAppReport.Owner=Proprietario
 WhatsAppReport.Recovered=Recovered[TBT]
 WhatsAppReport.QuoteNotFound=Quoted message not found[TBT]
+WhatsAppReport.QuoteStaus=Quoted Status[TBT]
+WhatsAppReport.QuotePrivacy=Message quoted privately through the group[TBT]
+WhatsAppReport.QuotePrivacyMessage=This quoted message was created in the group[TBT]
+WhatsAppReport.QuotePrivacyNotFound=Message quoted privately through the group not found[TBT]
+WhatsAppReport.QuoteCatalog=Quoted Catalog[TBT]
+WhatsAppReport.ContactedFindBusinesses=You contacted {0} from find businesses[TBT]
 WhatsAppReport.Document=Document[TBT]
 WhatsAppReport.Photo=Photo[TBT]
 WhatsAppReport.Audio=Audio[TBT]
@@ -325,6 +331,8 @@ WhatsAppReport.EditedOn=Edited on[TBT]
 WhatsAppReport.UserJoinedWhatsApp=joined WhatsApp[TBT]
 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.
 VCardParser.FormattedName=Nome formattato
 VCardParser.Name=Nome
 VCardParser.Nickname=Nickname

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

@@ -276,6 +276,12 @@ WhatsAppReport.FoundInPedoHashDB=Encontrado em base de hashes de pornografia inf
 WhatsAppReport.Owner=Proprietário
 WhatsAppReport.Recovered=Recuperado
 WhatsAppReport.QuoteNotFound=Mensagem citada não localizada
+WhatsAppReport.QuoteStaus=Status citado
+WhatsAppReport.QuotePrivacy=Mensagem citada em particular através de grupo
+WhatsAppReport.QuotePrivacyMessage=Esta mensagem citada foi criada no grupo
+WhatsAppReport.QuotePrivacyNotFound=Mensagem citada em particular através de grupo não encontrada
+WhatsAppReport.QuoteCatalog=Catálogo citado
+WhatsAppReport.ContactedFindBusinesses=Você entrou em contato com a empresa {0} usando o recurso de encontrar empresas
 WhatsAppReport.Document=Documento
 WhatsAppReport.Photo=Foto
 WhatsAppReport.Audio=Áudio
@@ -325,6 +331,8 @@ WhatsAppReport.EditedOn=Editada em
 WhatsAppReport.UserJoinedWhatsApp=entrou no WhatsApp
 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.
 VCardParser.FormattedName=Nome Formatado
 VCardParser.Name=Nome
 VCardParser.Nickname=Apelido

iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/util/Messages.java

@@ -3,6 +3,7 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
+import java.text.MessageFormat;
 
 public class Messages {
 
@@ -13,7 +14,7 @@ public class Messages {
     private Messages() {
     }
 
-    public static String getString(String key) {
+    public static String get(String key) {
         if (RESOURCE_BUNDLE == null) {
             String str = System.getProperty(iped.localization.Messages.LOCALE_SYS_PROP); // $NON-NLS-1$
             Locale locale = str != null ? Locale.forLanguageTag(str) : Locale.getDefault();
@@ -27,4 +28,11 @@ public static String getString(String key) {
             throw e;
         }
     }
+
+    public static String getString(String key, Object... args) {
+        String value = get(key);
+        if (args != null)
+            value = MessageFormat.format(value, args);
+        return value;
+    }    
 }

iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/ExtractorAndroid.java

@@ -61,6 +61,7 @@
 import iped.parsers.sqlite.SQLiteUndeleteTable;
 import iped.parsers.sqlite.SQLiteUndeleteTableResultSetAdapter;
 import iped.parsers.whatsapp.Message.MessageStatus;
+import iped.parsers.whatsapp.Message.MessageQuotedType;
 
 /**
  *
@@ -436,9 +437,10 @@ private List<Message> extractMessages(Connection conn, WAContact remote, boolean
             if (m != null){// Has quote
                 Message original = messagesMapUuid.get(mq.getUuid());//Try to find orginal message in messages
                 if (original != null){// has found original message reference, more complete
+                    original.setMessageQuotedType(MessageQuotedType.QUOTE_FOUND);
                     m.setMessageQuote(original);
                 }else{// not found original message reference, get info from message_quotes table, less complete
-                    mq.setDeleted(true);
+                    mq.setMessageQuotedType(MessageQuotedType.QUOTE_NOT_FOUND);
                     mq.setId(fakeIds--);
                     m.setMessageQuote(mq);
                 }