login: save master key from provisioning message

mautrix · Nov 13, 2024 · a0389f9 · a0389f9
1 parent d011d23
commit a0389f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/pkg/connector/login.go b/pkg/connector/login.go
@@ -21,6 +21,7 @@ import (
 	"fmt"
 
 	"github.com/google/uuid"
+	"github.com/rs/zerolog"
 	"maunium.net/go/mautrix/bridge/status"
 	"maunium.net/go/mautrix/bridgev2"
 	"maunium.net/go/mautrix/bridgev2/database"
@@ -175,6 +176,10 @@ func (qr *QRLogin) processingWait(ctx context.Context) (*bridgev2.LoginStep, err
 	if err != nil {
 		return nil, fmt.Errorf("failed to connect after login: %w", err)
 	}
+	if signalClient := ul.Client.(*SignalClient).Client; signalClient.Store.MasterKey != nil {
+		zerolog.Ctx(ctx).Info().Msg("Received master key in login, syncing storage immediately")
+		go signalClient.SyncStorage(ctx)
+	}
 	return &bridgev2.LoginStep{
 		Type:         bridgev2.LoginStepTypeComplete,
 		StepID:       LoginStepComplete,

diff --git a/pkg/signalmeow/provisioning.go b/pkg/signalmeow/provisioning.go
@@ -164,6 +164,7 @@ func PerformProvisioning(ctx context.Context, deviceStore store.DeviceStore, dev
 			DeviceID:           deviceId,
 			Number:             *provisioningMessage.Number,
 			Password:           password,
+			MasterKey:          provisioningMessage.GetMasterKey(),
 		}
 
 		// Store the provisioning data