'#1647: Handle "chat with business account" WA system message (Android).

sepinf-inc · Apr 18, 2023 · 27dd52c · 27dd52c
1 parent 02088a0
commit 27dd52c
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 1 deletion.
diff --git a/iped-app/resources/localization/iped-parsers-messages.properties b/iped-app/resources/localization/iped-parsers-messages.properties
@@ -214,6 +214,7 @@ WhatsAppReport.WAName=WA Name:\
 WhatsAppReport.UnknwonMessage=Unknown Message.
 WhatsAppReport.UnknownMediaMessage=Unknown Media Message
 WhatsAppReport.SecurityChanged=Security code changed. Tap for more info.
+WhatsAppReport.ChatBusiness=This chat is with a business account. Tap for more info.
 WhatsAppReport.ChatEncrypted=Messages and calls are end-to-end encrypted. No one outside of this chat, not even WhatsApp, can read or listen to them. Tap to learn more.
 WhatsAppReport.ChatNowEncrypted=Messages to this chat and calls are now secured with end-to-end encryption. Tap for more info.
 WhatsAppReport.GroupNowEncrypted=Messages to this group are now secured with end-to-end encryption. Tap for more info.

diff --git a/iped-app/resources/localization/iped-parsers-messages_de_DE.properties b/iped-app/resources/localization/iped-parsers-messages_de_DE.properties
@@ -214,6 +214,7 @@ WhatsAppReport.WAName=WA Name:\
 WhatsAppReport.UnknwonMessage=Unbekannte Nachricht.
 WhatsAppReport.UnknownMediaMessage=Unbekanntes\ Nachrichtenmedium
 WhatsAppReport.SecurityChanged=Sicherheitscode hat sich geändert. Tippen für weitere Informationen.
+WhatsAppReport.ChatBusiness=This chat is with a business account. Tap for more info.[TBT]
 WhatsAppReport.ChatEncrypted=Messages and calls are end-to-end encrypted. No one outside of this chat, not even WhatsApp, can read or listen to them. Tap to learn more.[TBT]
 WhatsAppReport.ChatNowEncrypted=Nachrichten an diesen Chat und Anrufe sind jetzt mit Ende-zu-Ende-Verschlüsselung gesichert. Tippen für weitere Informationen.
 WhatsAppReport.GroupNowEncrypted=Nachrichten an diese Gruppe sind jetzt mit Ende-zu-Ende-Verschlüsselung gesichert. Tippen Sie für weitere Informationen.

diff --git a/iped-app/resources/localization/iped-parsers-messages_es_AR.properties b/iped-app/resources/localization/iped-parsers-messages_es_AR.properties
@@ -214,6 +214,7 @@ WhatsAppReport.WAName=Nombre de WA:\
 WhatsAppReport.UnknwonMessage=Mensaje Desconocido.
 WhatsAppReport.UnknownMediaMessage=Mensaje Desconocido de los medios de comunicación
 WhatsAppReport.SecurityChanged=El código de seguridad ha cambiado. Pulse para obtener más información.
+WhatsAppReport.ChatBusiness=This chat is with a business account. Tap for more info.[TBT]
 WhatsAppReport.ChatEncrypted=Messages and calls are end-to-end encrypted. No one outside of this chat, not even WhatsApp, can read or listen to them. Tap to learn more.[TBT]
 WhatsAppReport.ChatNowEncrypted=Los mensajes a este chat y las llamadas están ahora protegidos con encriptación de extremo a extremo. Pulse para obtener más información.
 WhatsAppReport.GroupNowEncrypted=Los mensajes a este grupo están ahora protegidos con encriptación de extremo a extremo. Pulse para obtener más información.

diff --git a/iped-app/resources/localization/iped-parsers-messages_it_IT.properties b/iped-app/resources/localization/iped-parsers-messages_it_IT.properties
@@ -214,6 +214,7 @@ WhatsAppReport.WAName=Nome WA:\
 WhatsAppReport.UnknwonMessage=Messaggio sconosciuto
 WhatsAppReport.UnknownMediaMessage=Messaggio multimediale sconosciuto
 WhatsAppReport.SecurityChanged=Codice di sicurezza cambiato. Tocca per maggiori informazioni.
+WhatsAppReport.ChatBusiness=This chat is with a business account. Tap for more info.[TBT]
 WhatsAppReport.ChatEncrypted=Messages and calls are end-to-end encrypted. No one outside of this chat, not even WhatsApp, can read or listen to them. Tap to learn more.[TBT]
 WhatsAppReport.ChatNowEncrypted=I messaggi in questa chat e le chiamate sono ora protette con la crittografia end-to-end. Tocca per maggiori informazioni.
 WhatsAppReport.GroupNowEncrypted=I messaggi a questo gruppo sono ora protetti con la crittografia end-to-end. Tocca per maggiori informazioni.

diff --git a/iped-app/resources/localization/iped-parsers-messages_pt_BR.properties b/iped-app/resources/localization/iped-parsers-messages_pt_BR.properties
@@ -214,6 +214,7 @@ WhatsAppReport.WAName=WA Name:\
 WhatsAppReport.UnknwonMessage=Mensagem desconhecida.
 WhatsAppReport.UnknownMediaMessage=Mensagem de m�dia desconhecida
 WhatsAppReport.SecurityChanged=O código de segurança do usuário mudou. Toque para mais informações.
+WhatsAppReport.ChatBusiness=Você está conversando com uma conta comercial. Toque para saber mais.
 WhatsAppReport.ChatEncrypted=As mensagens e as chamadas são protegidas com a criptografia de ponta a ponta e ficam somente entre você e os participantes desta conversa. Nem mesmo o WhatsApp pode ler ou ouvi-las. Toque para saber mais.
 WhatsAppReport.ChatNowEncrypted=As mensagens e chamadas desta conversa estão protegidas com a criptografia de ponta a ponta. Toque para mais informações.
 WhatsAppReport.GroupNowEncrypted=As mensagens deste grupo estão protegidas com a criptografia de ponta a ponta. Toque para mais informações.

diff --git a/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/Message.java b/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/Message.java
@@ -436,7 +436,7 @@ public void setCallId(String callId) {
     }
 
     public static enum MessageType {
-        TEXT_MESSAGE, IMAGE_MESSAGE, AUDIO_MESSAGE, VIDEO_MESSAGE, UNKNOWN_MEDIA_MESSAGE, CONTACT_MESSAGE, LOCATION_MESSAGE, SHARE_LOCATION_MESSAGE, VOICE_CALL, VIDEO_CALL, APP_MESSAGE, GIF_MESSAGE, MESSAGES_ENCRYPTED, MESSAGES_NOW_ENCRYPTED, ENCRIPTION_KEY_CHANGED, MISSED_VOICE_CALL, MISSED_VIDEO_CALL, DELETED_MESSAGE, DELETED_FROM_SENDER, GROUP_CREATED, USER_JOINED_GROUP, USER_JOINED_GROUP_FROM_LINK, USERS_JOINED_GROUP, USER_LEFT_GROUP, USER_REMOVED_FROM_GROUP, URL_MESSAGE, GROUP_ICON_CHANGED, GROUP_ICON_DELETED, GROUP_DESCRIPTION_CHANGED, SUBJECT_CHANGED, YOU_ADMIN, WAITING_MESSAGE, STICKER_MESSAGE, REFUSED_VIDEO_CALL, REFUSED_VOICE_CALL, UNKNOWN_VOICE_CALL, UNKNOWN_VIDEO_CALL, UNKNOWN_MESSAGE
+        TEXT_MESSAGE, IMAGE_MESSAGE, AUDIO_MESSAGE, VIDEO_MESSAGE, UNKNOWN_MEDIA_MESSAGE, CONTACT_MESSAGE, LOCATION_MESSAGE, SHARE_LOCATION_MESSAGE, VOICE_CALL, VIDEO_CALL, APP_MESSAGE, GIF_MESSAGE, BUSINESS_CHAT, MESSAGES_ENCRYPTED, MESSAGES_NOW_ENCRYPTED, ENCRIPTION_KEY_CHANGED, MISSED_VOICE_CALL, MISSED_VIDEO_CALL, DELETED_MESSAGE, DELETED_FROM_SENDER, GROUP_CREATED, USER_JOINED_GROUP, USER_JOINED_GROUP_FROM_LINK, USERS_JOINED_GROUP, USER_LEFT_GROUP, USER_REMOVED_FROM_GROUP, URL_MESSAGE, GROUP_ICON_CHANGED, GROUP_ICON_DELETED, GROUP_DESCRIPTION_CHANGED, SUBJECT_CHANGED, YOU_ADMIN, WAITING_MESSAGE, STICKER_MESSAGE, REFUSED_VIDEO_CALL, REFUSED_VOICE_CALL, UNKNOWN_VOICE_CALL, UNKNOWN_VIDEO_CALL, UNKNOWN_MESSAGE
     }
 
     public static enum MessageStatus {

diff --git a/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/ReportGenerator.java b/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/whatsapp/ReportGenerator.java
@@ -176,6 +176,10 @@ private synchronized void printMessage(PrintWriter out, Message message, boolean
                 out.println(format(message.getRemoteResource()) + " " //$NON-NLS-1$
                         + Messages.getString("WhatsAppReport.SecurityChanged")); //$NON-NLS-1$
                 break;
+            case BUSINESS_CHAT:
+                out.println("<div class=\"systemmessage\">"); //$NON-NLS-1$
+                out.println(Messages.getString("WhatsAppReport.ChatBusiness")); //$NON-NLS-1$
+                break;
             case MESSAGES_ENCRYPTED:
                 out.println("<div class=\"systemmessage\">"); //$NON-NLS-1$
                 out.println(Messages.getString("WhatsAppReport.ChatEncrypted")); //$NON-NLS-1$