lib/model: Don't send locally changed on recv-enc (fixes #7137) (#7147)

2020-11-24 21:49:45 +01:00
parent 5d2c83a7e9
commit 100ef10d84
3 changed files with 75 additions and 8 deletions
@@ -312,14 +312,15 @@ func (r *indexSenderRegistry) addLocked(folder config.FolderConfiguration, fset
 	}

 	is := &indexSender{
-		conn:         r.conn,
-		connClosed:   r.closed,
-		folder:       folder.ID,
-		fset:         fset,
-		prevSequence: startSequence,
-		evLogger:     r.evLogger,
-		pauseChan:    make(chan struct{}),
-		resumeChan:   make(chan *db.FileSet),
+		conn:                     r.conn,
+		connClosed:               r.closed,
+		folder:                   folder.ID,
+		folderIsReceiveEncrypted: folder.Type == config.FolderTypeReceiveEncrypted,
+		fset:                     fset,
+		prevSequence:             startSequence,
+		evLogger:                 r.evLogger,
+		pauseChan:                make(chan struct{}),
+		resumeChan:               make(chan *db.FileSet),
 	}
 	is.token = r.sup.Add(is)
 	r.indexSenders[folder.ID] = is