Skip to content

Disable including timestamp for Session Android #36

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

Open
wants to merge 1 commit into
base: v2
Choose a base branch
from
Open

Disable including timestamp for Session Android #36

Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion spns/notifiers/firebase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,10 @@ def validate(msg: Message):
def push_notification(msg: Message):
data = oxenc.bt_deserialize(msg.data()[0])

enc_payload = encrypt_notify_payload(data, max_msg_size=MAX_MSG_SIZE)
# TODO: remote `include_ts=False` parameter here start including timestamps; current Android
# release breaks when receiving extra fields, so it is disabled for now until we have a release
# (and enough time for upgrades).
enc_payload = encrypt_notify_payload(data, max_msg_size=MAX_MSG_SIZE, include_ts=False)

device_token = data[b"&"].decode() # unique service id, as we returned from validate

Expand Down
5 changes: 4 additions & 1 deletion spns/notifiers/huawei.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,10 @@ def validate(msg: Message):
def push_notification(msg: Message):
data = oxenc.bt_deserialize(msg.data()[0])

enc_payload = encrypt_notify_payload(data, max_msg_size=MAX_MSG_SIZE)
# TODO: remote `include_ts=False` parameter here start including timestamps; current Android
# release breaks when receiving extra fields, so it is disabled for now until we have a release
# (and enough time for upgrades).
enc_payload = encrypt_notify_payload(data, max_msg_size=MAX_MSG_SIZE, include_ts=False)

device_token = data[b"&"].decode() # unique service id, as we returned from validate

Expand Down
6 changes: 5 additions & 1 deletion spns/notifiers/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,14 @@ def encrypt_payload(msg: bytes, enc_key: bytes):
return nonce + ciphertext


def encrypt_notify_payload(data: dict, max_msg_size: int = 2500):
def encrypt_notify_payload(data: dict, max_msg_size: int = 2500, include_ts: bool = True):
enc_key = data[b"^"]

metadata = {"@": data[b"@"].hex(), "#": data[b"#"].decode(), "n": data[b"n"], "t": data[b"t"], "z": data[b"z"]}
if not include_ts:
for t in ("t", "z"):
del metadata[t]

body = data.get(b"~")

if body:
Expand Down