Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-19 23:06:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(python): Use cached message object if dc_get_msg() returns NULL

Browse Source 
Particularly, in _msgstate() and download_state(). If the message has been trashed, dc_get_msg()
returns NULL now.
This commit is contained in:
iequidoo
2024-04-14 23:18:24 -03:00
committed by link2xt
parent 20a64ec357
commit 7a3be74350
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
python/src/deltachat/message.py
View File

@@ -364,6 +364,9 @@ class Message:
else: else:
# load message from db to get a fresh/current state # load message from db to get a fresh/current state
dc_msg = ffi.gc(lib.dc_get_msg(self.account._dc_context, self.id), lib.dc_msg_unref) dc_msg = ffi.gc(lib.dc_get_msg(self.account._dc_context, self.id), lib.dc_msg_unref)
# Message could be trashed, use the cached object if so.
if dc_msg == ffi.NULL:
dc_msg = self._dc_msg
return lib.dc_msg_get_state(dc_msg) return lib.dc_msg_get_state(dc_msg)
def is_in_fresh(self): def is_in_fresh(self):
@@ -484,6 +487,9 @@ class Message:
# load message from db to get a fresh/current state # load message from db to get a fresh/current state
dc_msg = ffi.gc(lib.dc_get_msg(self.account._dc_context, self.id), lib.dc_msg_unref) dc_msg = ffi.gc(lib.dc_get_msg(self.account._dc_context, self.id), lib.dc_msg_unref)
# Message could be trashed, use the cached object if so.
if dc_msg == ffi.NULL:
dc_msg = self._dc_msg
return lib.dc_msg_get_download_state(dc_msg) return lib.dc_msg_get_download_state(dc_msg)
def download_full(self) -> None: def download_full(self) -> None: