Skip to content

fix: show an MMS as delivered when the network says so #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Alaraajavamma wants to merge 1 commit into from
Closed

fix: show an MMS as delivered when the network says so #79

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion src/telephony/daemon/managers/mms_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

MMS_RESOLVE_TIMEOUT_SECONDS = 180
UNCLAIMED_STATE_LIMIT = 20
DELIVERY_WATCH_LIMIT = 50
SEEN_SIGNATURE_LIMIT = 50

MIME_EXTENSION_MAP = {
Expand Down Expand Up @@ -111,6 +112,7 @@ def __init__(self, db_manager, eds_manager=None, gsettings_mgr=None, notificatio
self.inflight_mms = {}
self.inflight_mms_paths = {}
self.unclaimed_mms_states = {}
self.mms_delivery_watch = {}
self.mms_send_lock = threading.Lock()

if not mimetypes.inited:
Expand Down Expand Up @@ -384,7 +386,14 @@ def _on_message_prop_changed(self, conn, sender, path, iface, signal, params, us
logger.debug(f"[MMS] Message state unpack failed: {e}")
return

if name != "status" or value != "sent":
if name != "status":
return

if value == "delivered":
self._on_mms_delivered(path)
return

if value != "sent":
return

row_id = None
Expand All @@ -398,8 +407,28 @@ def _on_message_prop_changed(self, conn, sender, path, iface, signal, params, us
self.unclaimed_mms_states.pop(next(iter(self.unclaimed_mms_states)))

if row_id is not None:
with self.mms_send_lock:
self.mms_delivery_watch[path] = row_id
while len(self.mms_delivery_watch) > DELIVERY_WATCH_LIMIT:
self.mms_delivery_watch.pop(next(iter(self.mms_delivery_watch)))
self._resolve_mms(row_id, "sent")

def _on_mms_delivered(self, path):
"""Mark a sent message delivered once the network confirms it.

The confirmation arrives long after the send resolved, so the
message is no longer in flight and is remembered separately.
Only a delivery is reported this way: a message that expired or
was rejected was still sent, and saying otherwise would be a
worse lie than saying nothing.
"""
with self.mms_send_lock:
row_id = self.mms_delivery_watch.pop(path, None)
if row_id is None:
return
logger.info(f"[MMS] Row {row_id} delivered")
self.db.update_message_status(row_id, "delivered")

def _on_message_send_error(self, conn, sender, path, iface, signal, params, user_data):
"""Fail the oldest in-flight MMS when the daemon reports a send error."""
logger.warning(f"[MMS] MessageSendError from daemon: {params.unpack() if params else None}")
Expand Down