From 574b0393d8516142f0e3dcda58a4a50ae4fe5843 Mon Sep 17 00:00:00 2001
From: KnugiHK <24708955+KnugiHK@users.noreply.github.com>
Date: Sat, 8 Jun 2024 17:50:48 +0800
Subject: [PATCH] Align vCard UX with iOS
---
Whatsapp_Chat_Exporter/android_handler.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Whatsapp_Chat_Exporter/android_handler.py b/Whatsapp_Chat_Exporter/android_handler.py
index 437fb8e..1e6269e 100644
--- a/Whatsapp_Chat_Exporter/android_handler.py
+++ b/Whatsapp_Chat_Exporter/android_handler.py
@@ -7,6 +7,7 @@ import hmac
import shutil
from pathlib import Path
from mimetypes import MimeTypes
+from markupsafe import escape as htmle
from hashlib import sha256
from base64 import b64decode, b64encode
from Whatsapp_Chat_Exporter.data_model import ChatStore, Message
@@ -658,11 +659,11 @@ def vcard(db, data, media_folder, filter_date, filter_chat):
with open(file_path, "w", encoding="utf-8") as f:
f.write(row["vcard"])
message = data[row["key_remote_jid"]].messages[row["message_row_id"]]
- message.data = media_name + \
- "The vCard file cannot be displayed here, " \
- f"however it should be located at {file_path}"
+ message.data = "This media include the following vCard file(s):
" \
+ f'{htmle(media_name)}'
message.mime = "text/x-vcard"
message.meta = True
+ message.safe = True
print(f"Processing vCards...({index + 1}/{total_row_number})", end="\r")