Merge pull request #2746 from sepinf-inc/#2745_WA_Android_Enhance

WhatsApp Android Enhancements (#2745)

Author: lfcnassif

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

@@ -235,6 +235,7 @@ WhatsAppReport.UnknownVideoCall=Unknown type of video call
 WhatsAppReport.GroupCreated=Group created by
 WhatsAppReport.UserAddedToCommunity=added user to community
 WhatsAppReport.UserAddedToGroup=added user to group
+WhatsAppReport.WasAdded=was added
 WhatsAppReport.UserRequestToAddToGroup=requested to add
 WhatsAppReport.UserCommunityAdmin=set user as community admin
 WhatsAppReport.CommunityAdmin=is now community admin
@@ -328,6 +329,7 @@ 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.AdvancedPrivacyOn=Advanced chat privacy was turned on.
 WhatsAppReport.ChatAddedPrivacy=This chat has added privacy for your profile and phone number.
 WhatsAppReport.ChannelAddedPrivacy=This channel has added privacy for your profile and phone number.
 WhatsAppReport.ChannelCreated=Channel was created.

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

@@ -235,6 +235,7 @@ WhatsAppReport.UnknownVideoCall=Videoanruf unbekannten Typs
 WhatsAppReport.GroupCreated=Gruppe erstellt von
 WhatsAppReport.UserAddedToCommunity=Benutzer zur Community hinzugefügt
 WhatsAppReport.UserAddedToGroup=Benutzer zur Community hinzugefügt
+WhatsAppReport.WasAdded=was added[TBT]
 WhatsAppReport.UserRequestToAddToGroup=hinzufügen angefragt 
 WhatsAppReport.UserCommunityAdmin=ist nun Community-Administrator
 WhatsAppReport.CommunityAdmin=ist nun Community-Administrator
@@ -328,6 +329,7 @@ WhatsAppReport.CommunityManagementAction=Community Verwaltungsaktion
 WhatsAppReport.CommunityRenamed=hat den Community-Namen geändert.
 WhatsAppReport.CommunityWelcome=Willkommen in der Community.
 WhatsAppReport.NewParticipantsNeedAdminApproval=Neue Teilnehmer benötigen die Genehmigung des Administrators, um dieser Gruppe beizutreten.
+WhatsAppReport.AdvancedPrivacyOn=Advanced chat privacy was turned on.[TBT]
 WhatsAppReport.ChatAddedPrivacy=Dieser Chat bietet zusätzliche Privatsphäre für Ihr Profil und Ihre Telefonnummer.
 WhatsAppReport.ChannelAddedPrivacy=Dieser Kanal bietet zusätzliche Privatsphäre für Ihr Profil und Ihre Telefonnummer.
 WhatsAppReport.ChannelCreated=Kanal wurde erstellt

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

@@ -235,6 +235,7 @@ WhatsAppReport.UnknownVideoCall=Videollamada de tipo desconocida
 WhatsAppReport.GroupCreated=Grupo creado por
 WhatsAppReport.UserAddedToCommunity=usuario agregado a la comunidad
 WhatsAppReport.UserAddedToGroup=usuario agregado al grupo
+WhatsAppReport.WasAdded=was added[TBT]
 WhatsAppReport.UserRequestToAddToGroup=solicitó ser añadido al grupo
 WhatsAppReport.UserCommunityAdmin=ahora eres el administrador de la comunidad
 WhatsAppReport.CommunityAdmin=ahora eres el administrador de la comunidad
@@ -328,6 +329,7 @@ WhatsAppReport.CommunityManagementAction=Acción de gestión de la comunidad.
 WhatsAppReport.CommunityRenamed=cambió el nombre de la comunidad
 WhatsAppReport.CommunityWelcome=Bienvenido a la comunidad.
 WhatsAppReport.NewParticipantsNeedAdminApproval=Los nuevos participantes necesitan aprobación de un administrador para unirse a este grupo.
+WhatsAppReport.AdvancedPrivacyOn=Advanced chat privacy was turned on.[TBT]
 WhatsAppReport.ChatAddedPrivacy=Este chat ha añadido privacidad para tu perfil y número de teléfono.
 WhatsAppReport.ChannelAddedPrivacy=Este canal ha añadido privacidad para tu perfil y número de teléfono.
 WhatsAppReport.ChannelCreated=Se creó el canal.

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

@@ -235,6 +235,7 @@ WhatsAppReport.UnknownVideoCall=Type d'appel vidéo inconnu
 WhatsAppReport.GroupCreated=Groupe créé par
 WhatsAppReport.UserAddedToCommunity=Utilisateur ajouté à la communauté
 WhatsAppReport.UserAddedToGroup=Utilisateur ajouté au groupe
+WhatsAppReport.WasAdded=was added[TBT]
 WhatsAppReport.UserRequestToAddToGroup=demande d'ajout au groupe
 WhatsAppReport.UserCommunityAdmin=Définir l'utilisateur en tant qu'administrateur
 WhatsAppReport.CommunityAdmin=est à présent administrateur
@@ -328,6 +329,7 @@ WhatsAppReport.CommunityManagementAction=Gestion de la communauté.
 WhatsAppReport.CommunityRenamed=Changer le nom de la communauté
 WhatsAppReport.CommunityWelcome=Bienvenue dans la communauté.
 WhatsAppReport.NewParticipantsNeedAdminApproval=Les nouveaux participants ont besoin de l'approbation de l'administrateur pour rejoindre ce groupe.
+WhatsAppReport.AdvancedPrivacyOn=Advanced chat privacy was turned on.[TBT]
 WhatsAppReport.ChatAddedPrivacy=Ce chat assure la confidentialité de votre profil et de votre numéro de téléphone.
 WhatsAppReport.ChannelAddedPrivacy=Cette chaîne assure la confidentialité de votre profil et de votre numéro de téléphone.
 WhatsAppReport.ChannelCreated=La chaîne a été créée.
@@ -577,4 +579,4 @@ OFXParser.Investment=Investissement
 OFXParser.BankTransactions=Opérations bancaires
 OFXParser.SubAccountFund=Fonds de sous-compte
 OFXParser.Investments=Investissements
-EmuleCollectionParser.CollectionTotalSize=Taille totale des fichiers dans la collection :
+EmuleCollectionParser.CollectionTotalSize=Taille totale des fichiers dans la collection:

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

@@ -235,6 +235,7 @@ WhatsAppReport.UnknownVideoCall=Tipo di chiamata video sconosciuto
 WhatsAppReport.GroupCreated=Gruppo creato da
 WhatsAppReport.UserAddedToCommunity=utente aggiunto alla comunità
 WhatsAppReport.UserAddedToGroup=utente aggiunto al gruppo
+WhatsAppReport.WasAdded=was added[TBT]
 WhatsAppReport.UserRequestToAddToGroup=Richiesta di aggiunta
 WhatsAppReport.UserCommunityAdmin=utente impostato come amministratore della comunità
 WhatsAppReport.CommunityAdmin=è ora amministratore della comunità
@@ -328,6 +329,7 @@ WhatsAppReport.CommunityManagementAction=Azioni di gestione della comunità.
 WhatsAppReport.CommunityRenamed=nome della comunità cambiato
 WhatsAppReport.CommunityWelcome=Benvenuto nella comunità.
 WhatsAppReport.NewParticipantsNeedAdminApproval=Nuovi partecipanti necessitano dell'approvazione dell'amministratore per unirsi a questo gruppo.
+WhatsAppReport.AdvancedPrivacyOn=Advanced chat privacy was turned on.[TBT]
 WhatsAppReport.ChatAddedPrivacy=Questa chat garantisce la privacy per il tuo profilo e numero di telefono.
 WhatsAppReport.ChannelAddedPrivacy=Questo canale garantisce la privacy per il tuo profilo e numero di telefono.
 WhatsAppReport.ChannelCreated=Canale creato.

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

@@ -235,6 +235,7 @@ WhatsAppReport.UnknownVideoCall=Chamada de vídeo de tipo desconhecido
 WhatsAppReport.GroupCreated=Grupo criado por
 WhatsAppReport.UserAddedToCommunity=adicionou usuário à comunidade
 WhatsAppReport.UserAddedToGroup=adicionou usuário ao grupo
+WhatsAppReport.WasAdded=foi adicionado
 WhatsAppReport.UserRequestToAddToGroup=deseja adicionar
 WhatsAppReport.UserCommunityAdmin=tornou usuário admin da comunidade
 WhatsAppReport.CommunityAdmin=agora é admin da comunidade
@@ -328,6 +329,7 @@ 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.AdvancedPrivacyOn=A privacidade avançada da conversa foi ativada.
 WhatsAppReport.ChatAddedPrivacy=Esta conversa oferece maior privacidade para seu perfil e número de telefone.
 WhatsAppReport.ChannelAddedPrivacy=Este canal oferece maior privacidade para seu perfil e número de telefone.
 WhatsAppReport.ChannelCreated=Canal foi criado.
@@ -577,4 +579,4 @@ OFXParser.Investment=Investimento
 OFXParser.BankTransactions=Transacões Bancárias
 OFXParser.SubAccountFund=Fundo da Conta Sub
 OFXParser.Investments=Investimentos
-EmuleCollectionParser.CollectionTotalSize=Tamanho total dos arquivos na coleção:
+EmuleCollectionParser.CollectionTotalSize=Tamanho total dos arquivos na coleção:

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

@@ -20,7 +20,7 @@ public ChatMerge(List<Chat> main, String dbname) {
         }
     }
 
-    public boolean isBackup(List<Chat> backup) {
+    public boolean isBackup(List<Chat> backup, WAContactsDirectory contacts) {
         if (backup == null) {
             return false;
         }
@@ -29,7 +29,8 @@ public boolean isBackup(List<Chat> backup) {
         for (Chat c : backup) {
             indexmain = findChat(main, c);
             if (indexmain >= 0) {// verify if the chats are compatible
-                if (!c.getRemote().getId().equals(main.get(indexmain).getRemote().getId())) {
+                if (!contacts.getContact(c.getRemote().getId())
+                        .matches(contacts.getContact(main.get(indexmain).getRemote().getId()))) {
                     // if there is a chat incompatible the msgstore is not a backup
                     return false;
                 } else if (hasCompatibleMessage(c.getMessages(), main.get(indexmain).getMessages())) {

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

@@ -1,5 +1,6 @@
 package iped.parsers.whatsapp;
 
+import static iped.parsers.whatsapp.Message.MessageType.ADVANCED_PRIVACY_ON;
 import static iped.parsers.whatsapp.Message.MessageType.AI_THIRD_PARTY;
 import static iped.parsers.whatsapp.Message.MessageType.ANY_COMMUNITY_MEMBER_CAN_JOIN_GROUP;
 import static iped.parsers.whatsapp.Message.MessageType.AUDIO_MESSAGE;
@@ -44,6 +45,7 @@
 import static iped.parsers.whatsapp.Message.MessageType.GROUP_INVITE;
 import static iped.parsers.whatsapp.Message.MessageType.GROUP_ONLY_ADMINS_CAN_SEND;
 import static iped.parsers.whatsapp.Message.MessageType.GROUP_REMOVED_FROM_COMMUNITY;
+import static iped.parsers.whatsapp.Message.MessageType.IGNORE_MESSAGE;
 import static iped.parsers.whatsapp.Message.MessageType.IMAGE_MESSAGE;
 import static iped.parsers.whatsapp.Message.MessageType.LOCATION_MESSAGE;
 import static iped.parsers.whatsapp.Message.MessageType.MESSAGE_ASSOCIATION;
@@ -128,6 +130,12 @@ public ExtractorAndroidNew(String itemPath, File databaseFile, WAContactsDirecto
 
     @Override
     protected List<Chat> extractChatList() throws WAExtractorException {
+        try {
+            updateContactsDirectoryMapping();
+        } catch (SQLException ex) {
+            throw new WAExtractorException(ex);
+        }
+
         List<Chat> list = new ArrayList<>();
         Map<Long, Chat> idToChat = new HashMap<Long, Chat>();
 
@@ -169,6 +177,25 @@ protected List<Chat> extractChatList() throws WAExtractorException {
         return list;
     }
 
+    private void updateContactsDirectoryMapping() throws SQLException {
+        // Read LID -> JID mapping
+        try (Connection conn = getConnection()) {
+            if (SQLite3DBParser.containsTable("jid_map", conn)) {
+                try (Statement stmt = conn.createStatement(); ResultSet rs = stmt.executeQuery(SELECT_JID_MAP)) {
+                    while (rs.next()) {
+                        String lid = rs.getString("lid");
+                        if (lid != null && !lid.isBlank()) {
+                            String jid = rs.getString("jid");
+                            if (jid != null && !jid.isBlank()) {
+                                contacts.addContactMapping(lid, jid);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     private boolean isUnblocked(Connection conn, long id) throws SQLException {
         boolean isUnblocked = false;
         String query = getSelectBlockedQuery(conn);
@@ -440,8 +467,8 @@ private void extractMessages(Connection conn, Map<Long, Chat> idToChat) throws S
                 m.setMessageType(decodeMessageType(type, status, edit_version, caption, actionType,
                         rs.getInt("bizStateId"), rs.getInt("privacyType"),  m.getMediaMime()));
 
-                if (m.getMessageType() == EPHEMERAL_SETTINGS_NOT_APPLIED) {
-                    // Ignore this type of message, as it does nothing and it is not visible in the application itself.
+                if (m.getMessageType() == EPHEMERAL_SETTINGS_NOT_APPLIED || m.getMessageType() == IGNORE_MESSAGE) {
+                    // Ignore these type of message, as they do nothing and are not visible in the application itself.
                     continue;
                 }
 
@@ -1065,6 +1092,13 @@ protected Message.MessageType decodeMessageType(int messageType, int status, Int
             case 99:
                 result = MESSAGE_ASSOCIATION;
                 break;
+            case 112:
+                result = ADVANCED_PRIVACY_ON;
+                break;
+            case 116:
+                // Nothing is shown in the app itself
+                result = IGNORE_MESSAGE;
+                break;
             default:
                 break;
         }
@@ -1241,4 +1275,5 @@ private static String getSelectBlockedQuery(Connection conn) throws SQLException
     private static final String SELECT_GROUP_MEMBERS = "select g._id as group_id, g.raw_string as group_name, u._id as user_id, u.raw_string as member "
             + "FROM group_participant_user gp inner join jid g on g._id=gp.group_jid_row_id inner join jid u on u._id=gp.user_jid_row_id where u.server='s.whatsapp.net' and u.type=0 and group_name=?"; //$NON-NLS-1$
 
+    private static final String SELECT_JID_MAP = "SELECT a.raw_string AS lid, b.raw_string AS jid FROM jid_map map, jid a, jid b WHERE map.lid_row_id = a._id AND map.jid_row_id = b._id";
 }