aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--matrix/matrix.go15
-rw-r--r--matrix/sync.go2
2 files changed, 11 insertions, 6 deletions
diff --git a/matrix/matrix.go b/matrix/matrix.go
index b360c56..617bbd5 100644
--- a/matrix/matrix.go
+++ b/matrix/matrix.go
@@ -331,12 +331,15 @@ func (c *Container) OnLogin() {
c.syncer.OnEventType(event.AccountDataPushRules, c.HandlePushRules)
c.syncer.OnEventType(event.AccountDataRoomTags, c.HandleTag)
c.syncer.OnEventType(AccountDataGomuksPreferences, c.HandlePreferences)
- c.syncer.Progress = c.ui.MainView().OpenSyncingModal()
- c.syncer.Progress.SetMessage("Waiting for /sync response from server")
- c.syncer.Progress.SetIndeterminate()
- c.syncer.FirstDoneCallback = func() {
- c.syncer.Progress.Close()
- c.syncer.Progress = StubSyncingModal{}
+ if len(c.config.AuthCache.NextBatch) == 0 {
+ c.syncer.Progress = c.ui.MainView().OpenSyncingModal()
+ c.syncer.Progress.SetMessage("Waiting for /sync response from server")
+ c.syncer.Progress.SetIndeterminate()
+ c.syncer.FirstDoneCallback = func() {
+ c.syncer.Progress.Close()
+ c.syncer.Progress = StubSyncingModal{}
+ c.syncer.FirstDoneCallback = nil
+ }
}
c.syncer.InitDoneCallback = func() {
debug.Print("Initial sync done")
diff --git a/matrix/sync.go b/matrix/sync.go
index fdf2d4b..85de68c 100644
--- a/matrix/sync.go
+++ b/matrix/sync.go
@@ -99,6 +99,7 @@ func NewGomuksSyncer(rooms *rooms.RoomCache) *GomuksSyncer {
rooms: rooms,
listeners: make(map[event.Type][]EventHandler),
FirstSyncDone: false,
+ Progress: StubSyncingModal{},
}
}
@@ -138,6 +139,7 @@ func (s *GomuksSyncer) ProcessResponse(res *mautrix.RespSync, since string) (err
}
wait.Wait()
+ s.Progress.SetMessage("Finishing sync")
if since == "" && s.InitDoneCallback != nil {
s.InitDoneCallback()