'#1923: Handle system "business to standard" (action 50).

sepinf-inc · Jan 3, 2024 · c71f442 · c71f442
1 parent f34d804
commit c71f442
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 1 deletion.
diff --git a/iped-app/resources/localization/iped-parsers-messages.properties b/iped-app/resources/localization/iped-parsers-messages.properties
@@ -222,6 +222,7 @@ WhatsAppReport.BusinessToStandard=This business account has now registered as a
 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.ChatStandard=This business account has now registered as a standard account. Tap for more info.
 WhatsAppReport.GroupNowEncrypted=Messages to this group are now secured with end-to-end encryption. Tap for more info.
 WhatsAppReport.MissedVideoCall=Missed video call 
 WhatsAppReport.MissedVoiceCall=Missed voice call

diff --git a/iped-app/resources/localization/iped-parsers-messages_de_DE.properties b/iped-app/resources/localization/iped-parsers-messages_de_DE.properties
@@ -222,6 +222,7 @@ WhatsAppReport.BusinessToStandard=Dieses Geschäftskonto ist jetzt als Standard-
 WhatsAppReport.ChatBusiness=Dieses Gespräch wird mit einem Geschäftskonto geführt. Tippen für mehr Informationen.
 WhatsAppReport.ChatEncrypted=Nachrichten und Anrufe sind nun Ende-zu-Ende verschlüsselt. Niemand außerhalb dieses Gesprächs, auch WhatsApp nicht, kann sie lesen oder anhören. Tippen um mehr zu erfahren.
 WhatsAppReport.ChatNowEncrypted=Nachrichten an diesen Chat und Anrufe sind jetzt mit Ende-zu-Ende-Verschlüsselung gesichert. Tippen für weitere Informationen.
+WhatsAppReport.ChatStandard=This business account has now registered as a standard account. Tap for more info.[TBT]
 WhatsAppReport.GroupNowEncrypted=Nachrichten an diese Gruppe sind jetzt mit Ende-zu-Ende-Verschlüsselung gesichert. Tippen Sie für weitere Informationen.
 WhatsAppReport.MissedVideoCall=verpasste Videoanrufe
 WhatsAppReport.MissedVoiceCall=verpasste Sprachanrufe

diff --git a/iped-app/resources/localization/iped-parsers-messages_es_AR.properties b/iped-app/resources/localization/iped-parsers-messages_es_AR.properties
@@ -222,6 +222,7 @@ WhatsAppReport.BusinessToStandard=Esta cuenta de empresa se ha registrado como c
 WhatsAppReport.ChatBusiness=Este chat es con una cuenta de empresa. Pulse para más información.
 WhatsAppReport.ChatEncrypted=Los mensajes y las llamadas están cifrados de extremo a extremo. Nadie ajeno a este chat, ni siquiera WhatsApp, puede leerlos o escucharlos. Toque para obtener más información.
 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.ChatStandard=This business account has now registered as a standard account. Tap for more info.[TBT]
 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.
 WhatsAppReport.MissedVideoCall=Videollamada perdida 
 WhatsAppReport.MissedVoiceCall=Llamada de voz perdida

diff --git a/iped-app/resources/localization/iped-parsers-messages_it_IT.properties b/iped-app/resources/localization/iped-parsers-messages_it_IT.properties
@@ -222,6 +222,7 @@ WhatsAppReport.BusinessToStandard=Questo account business ora è registrato come
 WhatsAppReport.ChatBusiness=Questa è una chat con un account business. Tocca per saperne di più.
 WhatsAppReport.ChatEncrypted=I messaggi e le chiamate sono crittografati end-to-end. Nessuno al di fuori di questa chat, nemmeno WhatsApp, può leggerne o ascoltarne il contenuto. Tocca per saperne di più.
 WhatsAppReport.ChatNowEncrypted=I messaggi in questa chat e le chiamate sono ora protette con la crittografia end-to-end. Tocca per maggiori informazioni.
+WhatsAppReport.ChatStandard=This business account has now registered as a standard account. Tap for more info.[TBT]
 WhatsAppReport.GroupNowEncrypted=I messaggi a questo gruppo sono ora protetti con la crittografia end-to-end. Tocca per maggiori informazioni.
 WhatsAppReport.MissedVideoCall=Videochiamata persa 
 WhatsAppReport.MissedVoiceCall=Chiamata vocale persa

diff --git a/iped-app/resources/localization/iped-parsers-messages_pt_BR.properties b/iped-app/resources/localization/iped-parsers-messages_pt_BR.properties
@@ -222,6 +222,7 @@ WhatsAppReport.BusinessToStandard=Esta conta comercial agora está registrada co
 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.ChatStandard=Está conta comercial agora está registrada como uma conta pessoal. 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.
 WhatsAppReport.MissedVideoCall=Chamada de vídeo perdida
 WhatsAppReport.MissedVoiceCall=Chamada de voz perdida

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
@@ -33,6 +33,7 @@
 import static iped.parsers.whatsapp.Message.MessageType.REFUSED_VIDEO_CALL;
 import static iped.parsers.whatsapp.Message.MessageType.REFUSED_VOICE_CALL;
 import static iped.parsers.whatsapp.Message.MessageType.SHARE_LOCATION_MESSAGE;
+import static iped.parsers.whatsapp.Message.MessageType.STANDARD_CHAT;
 import static iped.parsers.whatsapp.Message.MessageType.STICKER_MESSAGE;
 import static iped.parsers.whatsapp.Message.MessageType.SUBJECT_CHANGED;
 import static iped.parsers.whatsapp.Message.MessageType.TEMPLATE_MESSAGE;
@@ -562,6 +563,9 @@ protected Message.MessageType decodeMessageType(int messageType, int status, Int
                     case 46:
                         result = BUSINESS_CHAT;
                         break;
+                    case 50:
+                        result = STANDARD_CHAT;
+                        break;
                     case 58:
                         result = BLOCKED_CONTACT;
                         break;

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
@@ -561,7 +561,7 @@ public void setSortId(long sortId) {
     }
 
     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, BLOCKED_CONTACT, UNBLOCKED_CONTACT, BUSINESS_CHAT, BUSINESS_TO_STANDARD, MESSAGES_ENCRYPTED, MESSAGES_NOW_ENCRYPTED, ENCRYPTION_KEY_CHANGED, MISSED_VOICE_CALL, MISSED_VIDEO_CALL, DELETED_MESSAGE, DELETED_BY_ADMIN, DELETED_BY_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, UNAVAILABLE_VIDEO_CALL, UNAVAILABLE_VOICE_CALL, UNKNOWN_VOICE_CALL, UNKNOWN_VIDEO_CALL, VIEW_ONCE_IMAGE_MESSAGE, VIEW_ONCE_VIDEO_MESSAGE, CALL_MESSAGE, BUSINESS_META_SECURE_SERVICE, GROUP_INVITE, TEMPLATE_MESSAGE, TEMPLATE_QUOTE, POLL_MESSAGE, EPHEMERAL_DURATION_CHANGED, EPHEMERAL_ENABLED, EPHEMERAL_SAVE, GROUP_CHANGED_ONLY_ADMINS_CAN_SEND, GROUP_CHANGED_ALL_MEMBERS_CAN_SEND, GROUP_ONLY_ADMINS_CAN_SEND, CHANGED_NUMBER, 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, BLOCKED_CONTACT, UNBLOCKED_CONTACT, BUSINESS_CHAT, BUSINESS_TO_STANDARD, MESSAGES_ENCRYPTED, MESSAGES_NOW_ENCRYPTED, ENCRYPTION_KEY_CHANGED, MISSED_VOICE_CALL, MISSED_VIDEO_CALL, DELETED_MESSAGE, DELETED_BY_ADMIN, DELETED_BY_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, UNAVAILABLE_VIDEO_CALL, UNAVAILABLE_VOICE_CALL, UNKNOWN_VOICE_CALL, UNKNOWN_VIDEO_CALL, VIEW_ONCE_IMAGE_MESSAGE, VIEW_ONCE_VIDEO_MESSAGE, CALL_MESSAGE, BUSINESS_META_SECURE_SERVICE, GROUP_INVITE, TEMPLATE_MESSAGE, TEMPLATE_QUOTE, POLL_MESSAGE, EPHEMERAL_DURATION_CHANGED, EPHEMERAL_ENABLED, EPHEMERAL_SAVE, GROUP_CHANGED_ONLY_ADMINS_CAN_SEND, GROUP_CHANGED_ALL_MEMBERS_CAN_SEND, GROUP_ONLY_ADMINS_CAN_SEND, CHANGED_NUMBER, STANDARD_CHAT, 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
@@ -307,6 +307,10 @@ private synchronized void printMessage(PrintWriter out, Message message, boolean
                 out.println("<div class=\"systemmessage\">"); //$NON-NLS-1$
                 out.println(Messages.getString("WhatsAppReport.ChatBusiness")); //$NON-NLS-1$
                 break;
+            case STANDARD_CHAT:
+                out.println("<div class=\"systemmessage\">");
+                out.println(Messages.getString("WhatsAppReport.ChatStandard"));
+                break;
             case BUSINESS_META_SECURE_SERVICE:
                 out.println("<div class=\"systemmessage\">"); //$NON-NLS-1$
                 out.println(Messages.getString("WhatsAppReport.BusinessSecureService")); //$NON-NLS-1$