Undo the hash algorithm additions; retain flag checks

2016-01-12 12:12:33 +01:00
parent 357089a438
commit 8b3d75b339
4 changed files with 5 additions and 101 deletions
--- a/lib/protocol/protocol.go
+++ b/lib/protocol/protocol.go
@@ -66,13 +66,7 @@ const (
 	FlagFolderReadOnly     uint32 = 1 << 0
 	FlagFolderIgnorePerms         = 1 << 1
 	FlagFolderIgnoreDelete        = 1 << 2
-
-	// The folder hash algorithm IDs, to be put in the flags field by shifting
-	// left FolderHashShiftBits. 1 through 15 currently reserved.
-
-	FolderHashSHA256    = 0
-	FolderHashMask      = 15
-	FolderHashShiftBits = 3
+	FlagFolderAll                 = 1<<3 - 1
 )

 // ClusterConfigMessage.Folders.Devices flags