signalmeow: clean up decryption code

mautrix · Sep 9, 2024 · ffd1ba3 · ffd1ba3
1 parent 798ebb6
commit ffd1ba3
Show file tree

Hide file tree

Showing 4 changed files with 148 additions and 164 deletions.
diff --git a/pkg/connector/handlesignal.go b/pkg/connector/handlesignal.go
@@ -110,7 +110,8 @@ func (s *SignalClient) wrapDecryptionError(evt *events.DecryptionError) bridgev2
  Timestamp: time.UnixMilli(int64(evt.Timestamp)),
  },
  Data: evt,
- ID: "decrypterr|" + signalid.MakeMessageID(evt.Sender, evt.Timestamp),
+ // TODO use main message id and edit it if it later becomes decryptable?
+ ID: "decrypterr|" + signalid.MakeMessageID(evt.Sender, evt.Timestamp),
 
  ConvertMessageFunc: convertDecryptionError,
  }

diff --git a/pkg/libsignalgo/sealedsender.go b/pkg/libsignalgo/sealedsender.go
@@ -24,7 +24,6 @@ import "C"
 import (
  "context"
  "runtime"
- "time"
 
  "github.com/google/uuid"
 )
@@ -113,7 +112,7 @@ func SealedSenderDecrypt(
  ciphertext []byte,
  localAddress *SealedSenderAddress,
  trustRoot *PublicKey,
- timestamp time.Time,
+ timestamp uint64,
  sessionStore SessionStore,
  identityStore IdentityKeyStore,
  preKeyStore PreKeyStore,
@@ -134,7 +133,7 @@ func SealedSenderDecrypt(
  &senderDeviceID,
  BytesToBuffer(ciphertext),
  trustRoot.ptr,
- C.uint64_t(timestamp.UnixMilli()),
+ C.uint64_t(timestamp),
  C.CString(localAddress.E164),
  C.CString(localAddress.UUID.String()),
  C.uint32_t(localAddress.DeviceID),

diff --git a/pkg/libsignalgo/session_test.go b/pkg/libsignalgo/session_test.go
@@ -294,7 +294,7 @@ func TestSealedSenderSession(t *testing.T) {
  ciphertext,
  recipientAddress,
  trustRoot.GetPublicKey(),
- time.UnixMilli(31335),
+ 31335,
  bobStore,
  bobStore,
  bobStore,