From a749aee247d657fdcd40b4b7bc1ffde7ca9baea3 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Thu, 8 Aug 2019 19:57:51 +0200 Subject: [PATCH] fix some longer standing nonsense code that sent to misleading MSG_READ events instead of one correct one --- python/tests/test_account.py | 4 +++- src/dc_receive_imf.rs | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/python/tests/test_account.py b/python/tests/test_account.py index 6e6c1e2c2..c9fa5db94 100644 --- a/python/tests/test_account.py +++ b/python/tests/test_account.py @@ -421,7 +421,9 @@ class TestOnlineAccount: lp.sec("mark message as seen on ac2, wait for changes on ac1") ac2.mark_seen_messages([msg_in]) lp.step("1") - ac1._evlogger.get_matching("DC_EVENT_MSG_READ") + ev = ac1._evlogger.get_matching("DC_EVENT_MSG_READ") + assert ev[1] >= const.DC_CHAT_ID_LAST_SPECIAL + assert ev[2] >= const.DC_MSG_ID_LAST_SPECIAL lp.step("2") assert msg_out.is_out_mdn_received() diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs index 8be5287f3..47c1e3004 100644 --- a/src/dc_receive_imf.rs +++ b/src/dc_receive_imf.rs @@ -723,8 +723,7 @@ pub unsafe fn dc_receive_imf( &mut msg_id, ) { rr_event_to_send - .push((chat_id_0, 0)); - rr_event_to_send.push((msg_id, 0)); + .push((chat_id_0, msg_id)); } mdn_consumed = (msg_id != 0 as libc::c_uint)