diff --git a/src/libclient/api/interaction.h b/src/libclient/api/interaction.h index 12dedbb9441966bd4a899581260185f0913fbd6d..b4061ce8929a9ced1c86d0738f7291923bd65a4a 100644 --- a/src/libclient/api/interaction.h +++ b/src/libclient/api/interaction.h @@ -302,8 +302,18 @@ getFormattedCallDuration(const std::time_t duration) * @return the formatted and translated call message string */ static inline QString -getCallInteractionStringNonSwarm(bool isSelf, const std::time_t& duration) +getCallInteractionStringNonSwarm(bool isSelf, + const std::time_t& duration, + const QString& reason = "") { + if (reason == "busy") { + return QObject::tr("Missed call, peer is busy"); + } else if (reason == "declined") { + return QObject::tr("Missed call, peer declined"); + } else if (reason == "no_device") { + return QObject::tr("Missed call, peer offline"); + } + if (duration < 0) { if (isSelf) { return QObject::tr("Outgoing call"); @@ -467,16 +477,18 @@ struct Info reactions.insert(i.key(), i.value()); // Compute the status of the message. // Basically, we got the status per member. - // We consider the message as sent if at least one member has received it or displayed if someone displayed it. + // We consider the message as sent if at least one member has received it or displayed if + // someone displayed it. auto maxStatus = 0; status = Status::SENDING; - for (const auto& member: msg.status.keys()) { + for (const auto& member : msg.status.keys()) { if (member == accountUri) continue; auto stValue = msg.status.value(member); if (stValue > maxStatus) { maxStatus = stValue; - status = maxStatus <= 1 ? Status::SENDING : (stValue == 2 ? Status::SUCCESS : Status::DISPLAYED); + status = maxStatus <= 1 ? Status::SENDING + : (stValue == 2 ? Status::SUCCESS : Status::DISPLAYED); } if (maxStatus == 3) break; @@ -498,7 +510,7 @@ getCallInteractionString(bool isSelf, const Info& info) return QObject::tr("Join call"); } } - return getCallInteractionStringNonSwarm(isSelf, info.duration); + return getCallInteractionStringNonSwarm(isSelf, info.duration, info.commit["reason"]); } static inline QString diff --git a/src/libclient/authority/storagehelper.cpp b/src/libclient/authority/storagehelper.cpp index 05d557974e3bb7b6e2b5e28f3df859c151f59c0d..b7a4181e508a074269dc0ce218ba33fb5cd8b051 100644 --- a/src/libclient/authority/storagehelper.cpp +++ b/src/libclient/authority/storagehelper.cpp @@ -99,13 +99,6 @@ JSONFromString(const QString& str) return json; } -static QString -JSONStringFromInitList(const std::initializer_list<QPair<QString, QJsonValue>> args) -{ - QJsonObject jsonObject(args); - return stringFromJSON(jsonObject); -} - static QString readJSONValue(const QJsonObject& json, const QString& key) {