From 4f868983327825eb9ef1bd6363be2a377df5885a Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Fri, 22 May 2020 10:25:53 -0400
Subject: [PATCH] interaction: remove hard coded phone character
Change-Id: Icafdd008e848e5e15d2f35d5e1178d9a5e8f59ff
---
src/authority/storagehelper.cpp | 14 ++++++--------
src/web-chatview/chatview.js | 7 +++++--
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/authority/storagehelper.cpp b/src/authority/storagehelper.cpp
index 17b75488..bd1a2822 100644
--- a/src/authority/storagehelper.cpp
+++ b/src/authority/storagehelper.cpp
@@ -103,23 +103,21 @@ getCallInteractionString(const QString& authorUri,
{
if (duration < 0) {
if (authorUri.isEmpty()) {
- return "📞 " + QObject::tr("Outgoing call");
+ return QObject::tr("Outgoing call");
} else {
- return "📞 " + QObject::tr("Incoming call");
+ return QObject::tr("Incoming call");
}
} else if (authorUri.isEmpty()) {
if (duration) {
- return "📞 " + QObject::tr("Outgoing call")
- + " - " + getFormattedCallDuration(duration);
+ return QObject::tr("Outgoing call") + " - " + getFormattedCallDuration(duration);
} else {
- return "🕽 " + QObject::tr("Missed outgoing call");
+ return QObject::tr("Missed outgoing call");
}
} else {
if (duration) {
- return "📞 " + QObject::tr("Incoming call")
- + " - " + getFormattedCallDuration(duration);
+ return QObject::tr("Incoming call") + " - " + getFormattedCallDuration(duration);
} else {
- return "🕽 " + QObject::tr("Missed incoming call");
+ return QObject::tr("Missed incoming call");
}
}
}
diff --git a/src/web-chatview/chatview.js b/src/web-chatview/chatview.js
index b17a90a9..cd518120 100644
--- a/src/web-chatview/chatview.js
+++ b/src/web-chatview/chatview.js
@@ -1417,9 +1417,12 @@ function updateCallInteraction(message_div, message_object) {
const message_text = message_object["text"]
const message_direction = message_object["direction"]
- const missed = message_text.indexOf("🕽") !== -1
+ const message_duration = message_object["duration"]
+ const message_sender = message_object["sender"]
- message_div.querySelector(".text").innerText = message_text.substring(2)
+ const missed = message_duration === 0 ? true : false
+
+ message_div.querySelector(".text").innerText = message_text
var left_buttons = message_div.querySelector(".left_buttons")
left_buttons.innerHTML = ""
--
GitLab