src/main/java/fr/insa/clavardator/db/DatabaseController.java

@@ -248,7 +248,13 @@ public class DatabaseController {
 			// Handle messages containing a file
 			String filePath = "NULL";
 			if (message instanceof FileMessage) {
-				filePath = "'" + ((FileMessage) message).getPath() + "'";
+				try {
+					filePath = "'" + ((FileMessage) message).storeFile() + "'";
+				} catch (IOException e) {
+					Log.e(getClass().getSimpleName(), "Error while saving the file", e);
+					errorCallback.onError(e);
+					return;
+				}
 			}
 
 			String recipientId = message.getRecipient().id;

src/main/java/fr/insa/clavardator/users/PeerUser.java

@@ -66,7 +66,6 @@ public class PeerUser extends User implements Comparable<PeerUser> {
 					"Sending file message to " + this.getUsername() + " / " + this.getId() + ": " + msg);
 			try {
 				final FileMessage message = new FileMessage(CurrentUser.getInstance(), this, new Date(), msg, file.getPath());
-				message.storeFile();
 				connection.send(message, () -> history.addMessage(message, errorCallback), errorCallback);
 			} catch (IOException e) {
 				Log.e(this.getClass().getSimpleName(), "Could not send message: error while opening file", e);