Fix FolderCipher creation, handle some errors

src/db/models/cipher.rs

@@ -163,10 +163,10 @@ impl Cipher {
                                     current_folder.delete(&conn).or(Err("Failed removing old folder mapping"))
                                 },
                                 None => Ok(()) // Weird, but nothing to do
-                            };
-
-                            FolderCipher::new(&new_folder, &self.uuid)
-                            .save(&conn).or(Err("Couldn't save folder setting"))
+                            }.and_then(
+                                |()| FolderCipher::new(&new_folder, &self.uuid)
+                                .save(&conn).or(Err("Couldn't save folder setting"))
+                            )
                         }
                     },
                     None => {

src/db/models/folder.rs

@@ -55,10 +55,10 @@ impl Folder {
 }
 
 impl FolderCipher {
-    pub fn new(cipher_uuid: &str, folder_uuid: &str) -> Self {
+    pub fn new(folder_uuid: &str, cipher_uuid: &str) -> Self {
         Self {
-            cipher_uuid: cipher_uuid.to_string(),
             folder_uuid: folder_uuid.to_string(),
+            cipher_uuid: cipher_uuid.to_string(),
         }
     }
 }