Fix bug where picture files where not uploaded at all when encryption and cloud storage was active as well as SaveToLocal #247

internal/storage/FileServing.go

@@ -194,7 +194,11 @@ func NewFileFromChunk(chunkId string, fileHeader chunking.FileHeader, userId int
 			fileToMove = tempFile
 		}
 		processingstatus.Set(chunkId, processingstatus.StatusUploading, models.File{}, nil)
-		err = filesystem.ActiveStorageSystem.MoveToFilesystem(fileToMove, metaData)
+		if metaData.IsLocalStorage() {
+			err = filesystem.GetLocal().MoveToFilesystem(fileToMove, metaData)
+		} else {
+			err = filesystem.ActiveStorageSystem.MoveToFilesystem(fileToMove, metaData)
+		}
 		if err != nil {
 			return models.File{}, err
 		}

internal/storage/filesystem/FileSystem.go

@@ -42,5 +42,11 @@ func SetLocal() {
 	ActiveStorageSystem = dataFilesystem
 }
 
+// GetLocal gets the local filesystem, regardless of what filesystem is used by default. This is required when encrypted
+// pictures are stored locally instead of the cloud to support hotlinking
+func GetLocal() interfaces.System {
+	return dataFilesystem
+}
+
 // isUnitTesting is only set to true when testing, to avoid login with aws
 var isUnitTesting = false