From e7a5be2c733dfa5eb2a27ce47197c5e93572edb9 Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 2 Feb 2024 18:25:36 +1030 Subject: [PATCH] Fix ExpirationTimerUpdate deserialisation --- .../messaging/messages/control/ExpirationTimerUpdate.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt index e8732db889..22a88e54b1 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt @@ -2,7 +2,6 @@ package org.session.libsession.messaging.messages.control import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.messages.copyExpiration -import org.session.libsession.messaging.messages.visible.VisibleMessage import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos.DataMessage.Flags.EXPIRATION_TIMER_UPDATE_VALUE import org.session.libsignal.utilities.Log @@ -20,7 +19,7 @@ data class ExpirationTimerUpdate(var syncTarget: String? = null, val isGroup: Bo fun fromProto(proto: SignalServiceProtos.Content): ExpirationTimerUpdate? = proto.dataMessage?.takeIf { it.flags and EXPIRATION_TIMER_UPDATE_VALUE != 0 }?.run { - ExpirationTimerUpdate(syncTarget, hasGroup()).copyExpiration(proto) + ExpirationTimerUpdate(takeIf { hasSyncTarget() }?.syncTarget, hasGroup()).copyExpiration(proto) } }