mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-07 05:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix IMDN sending in the case where it cannot be aggregated.

Browse source
This commit is contained in:
Ghislain MARY 2018-05-09 14:48:49 +02:00
parent 1f5c297c22
commit bad6d9e9e1
3 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/chat/chat-message/imdn-message-p.h
View file

@ -29,7 +29,7 @@ LINPHONE_BEGIN_NAMESPACE
class ImdnMessagePrivate : public NotificationMessagePrivate {
public:
ImdnMessage::Context getContext () {return context;}
const ImdnMessage::Context &getContext () { return context; }
private:
ImdnMessagePrivate (const ImdnMessage::Context &context)

37
src/chat/notification/imdn.cpp
View file

@ -86,7 +86,7 @@ void Imdn::notifyDisplay (const shared_ptr<ChatMessage> &message) {
void Imdn::onImdnMessageDelivered (const std::shared_ptr<ImdnMessage> &message) {
// If an IMDN has been successfully delivered, remove it from the list so that
// it does not get sent again
ImdnMessage::Context context = message->getPrivate()->getContext();
auto context = message->getPrivate()->getContext();
for (const auto &deliveredMsg : context.deliveredMessages)
deliveredMessages.remove(deliveredMsg);
@ -113,15 +113,9 @@ void Imdn::onGlobalStateChanged (LinphoneGlobalState state) {
void Imdn::onNetworkReachable (bool sipNetworkReachable, bool mediaNetworkReachable) {
if (sipNetworkReachable) {
// When the SIP network gets up, retry sending every IMDN message that has not
// successfully been delivered
auto messages = sentImdnMessages;
// When the SIP network gets up, retry notification
sentImdnMessages.clear();
for (const auto &message : messages) {
auto imdnMessage = chatRoom->getPrivate()->createImdnMessage(message);
sentImdnMessages.push_back(imdnMessage);
imdnMessage->send();
}
send();
}
}
@ -208,26 +202,37 @@ int Imdn::timerExpired (void *data, unsigned int revents) {
// -----------------------------------------------------------------------------
bool Imdn::aggregationEnabled () const {
auto config = linphone_core_get_config(chatRoom->getCore()->getCCore());
bool aggregateImdn = linphone_config_get_bool(config, "misc", "aggregate_imdn", TRUE);
return (chatRoom->canHandleCpim() && aggregateImdn);
}
void Imdn::send () {
bool networkReachable = linphone_core_is_network_reachable(chatRoom->getCore()->getCCore());
if (!networkReachable)
return;
if (!deliveredMessages.empty() || !displayedMessages.empty()) {
auto imdnMessage = chatRoom->getPrivate()->createImdnMessage(deliveredMessages, displayedMessages);
sentImdnMessages.push_back(imdnMessage);
if (networkReachable)
imdnMessage->getPrivate()->send();
imdnMessage->getPrivate()->send();
if (!aggregationEnabled()) {
deliveredMessages.clear();
displayedMessages.clear();
}
}
if (!nonDeliveredMessages.empty()) {
auto imdnMessage = chatRoom->getPrivate()->createImdnMessage(nonDeliveredMessages);
sentImdnMessages.push_back(imdnMessage);
if (networkReachable)
imdnMessage->getPrivate()->send();
imdnMessage->getPrivate()->send();
if (!aggregationEnabled())
nonDeliveredMessages.clear();
}
}
void Imdn::startTimer () {
auto config = linphone_core_get_config(chatRoom->getCore()->getCCore());
bool aggregateImdn = linphone_config_get_bool(config, "misc", "aggregate_imdn", TRUE);
if (!chatRoom->canHandleCpim() || !aggregateImdn) {
if (!aggregationEnabled()) {
// Compatibility mode for basic chat rooms, do not aggregate notifications
send();
return;

5
src/chat/notification/imdn.h
View file

@ -46,7 +46,9 @@ public:
MessageReason (const std::shared_ptr<ChatMessage> &message, LinphoneReason reason)
: message(message), reason(reason) {}
bool operator== (const MessageReason &other) const {return message == other.message && reason == other.reason;}
bool operator== (const MessageReason &other) const {
return (message == other.message) && (reason == other.reason);
}
const std::shared_ptr<ChatMessage> message;
LinphoneReason reason;
@ -73,6 +75,7 @@ public:
private:
static int timerExpired (void *data, unsigned int revents);
bool aggregationEnabled () const;
void send ();
void startTimer ();
void stopTimer ();