Merge 1200dceb4c661975c96dd12faab46e1fe64a94ed into 326c0eed8f767e298eb3f09340a41314c254ddda

This commit is contained in:
geemili 2025-03-17 12:19:29 -04:00 committed by GitHub
commit 401cfc18eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -757,8 +757,16 @@ class LXMessage:
message.timestamp = timestamp
message.packed = lxmf_bytes
message.packed_size = len(lxmf_bytes)
message.set_title_from_bytes(title_bytes)
message.set_content_from_bytes(content_bytes)
if type(title_bytes) is bytes:
message.set_title_from_bytes(title_bytes)
elif type(title_bytes) is str:
message.set_title_from_string(title_bytes)
if type(content_bytes) is bytes:
message.set_content_from_bytes(content_bytes)
elif type(content_bytes) is str:
message.set_content_from_string(content_bytes)
try:
if source:
@ -795,4 +803,4 @@ class LXMessage:
return lxm
except Exception as e:
RNS.log("Could not unpack LXMessage from file. The contained exception was: "+str(e), RNS.LOG_ERROR)
return None
return None