all: Add folder pause, make pauses permanent (fixes #3407, fixes #215, fixes #3001)

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3520
2016-12-21 18:41:25 +00:00
parent 0725e3af38
commit bab7c8ebbf
20 changed files with 548 additions and 307 deletions
--- a/lib/connections/service.go
+++ b/lib/connections/service.go
@@ -343,8 +343,7 @@ func (s *Service) connect() {
 				continue
 			}

-			paused := s.model.IsPaused(deviceID)
-			if paused {
+			if deviceCfg.Paused {
 				continue
 			}

--- a/lib/connections/structs.go
+++ b/lib/connections/structs.go
@@ -116,7 +116,6 @@ type Model interface {
 	protocol.Model
 	AddConnection(conn Connection, hello protocol.HelloResult)
 	ConnectedTo(remoteID protocol.DeviceID) bool
-	IsPaused(remoteID protocol.DeviceID) bool
 	OnHello(protocol.DeviceID, net.Addr, protocol.HelloResult) error
 	GetHello(protocol.DeviceID) protocol.HelloIntf
 }