From 3de8555c10d54060401688c2d1d3beb7fb6cc063 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= <havar@fosstveit.net>
Date: Thu, 30 Apr 2020 23:06:02 +0200
Subject: [PATCH] Proper handling of moderator clearing files and sharing same
 file twice. Fixes #257

---
 app/src/RoomClient.js                         | 33 ++++++++++++++++---
 .../MeetingDrawer/FileSharing/FileSharing.js  |  4 ++-
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js
index f499871..afb1d78 100644
--- a/app/src/RoomClient.js
+++ b/app/src/RoomClient.js
@@ -674,7 +674,7 @@ export default class RoomClient
 		{
 			if (err)
 			{
-				return store.dispatch(requestActions.notify(
+				store.dispatch(requestActions.notify(
 					{
 						type : 'error',
 						text : intl.formatMessage({
@@ -682,6 +682,8 @@ export default class RoomClient
 							defaultMessage : 'Unable to save file'
 						})
 					}));
+
+				return;
 			}
 
 			saveAs(blob, file.name);
@@ -698,7 +700,9 @@ export default class RoomClient
 		if (existingTorrent)
 		{
 			// Never add duplicate torrents, use the existing one instead.
-			return this._handleTorrent(existingTorrent);
+			this._handleTorrent(existingTorrent);
+
+			return;
 		}
 
 		this._webTorrent.add(magnetUri, this._handleTorrent);
@@ -710,11 +714,13 @@ export default class RoomClient
 		// same file was sent multiple times.
 		if (torrent.progress === 1)
 		{
-			return store.dispatch(
+			store.dispatch(
 				fileActions.setFileDone(
 					torrent.magnetURI,
 					torrent.files
 				));
+
+			return;
 		}
 
 		let lastMove = 0;
@@ -757,7 +763,7 @@ export default class RoomClient
 		{
 			if (err)
 			{
-				return store.dispatch(requestActions.notify(
+				store.dispatch(requestActions.notify(
 					{
 						type : 'error',
 						text : intl.formatMessage({
@@ -765,13 +771,30 @@ export default class RoomClient
 							defaultMessage : 'Unable to share file'
 						})
 					}));
+
+				return;
 			}
 
 			const existingTorrent = this._webTorrent.get(torrent);
 
 			if (existingTorrent)
 			{
-				return this._sendFile(existingTorrent.magnetURI);
+				store.dispatch(requestActions.notify(
+					{
+						text : intl.formatMessage({
+							id             : 'filesharing.successfulFileShare',
+							defaultMessage : 'File successfully shared'
+						})
+					}));
+
+				store.dispatch(fileActions.addFile(
+					this._peerId,
+					existingTorrent.magnetURI
+				));
+
+				this._sendFile(existingTorrent.magnetURI);
+
+				return;
 			}
 
 			this._webTorrent.seed(
diff --git a/app/src/components/MeetingDrawer/FileSharing/FileSharing.js b/app/src/components/MeetingDrawer/FileSharing/FileSharing.js
index 11857f6..6278e46 100644
--- a/app/src/components/MeetingDrawer/FileSharing/FileSharing.js
+++ b/app/src/components/MeetingDrawer/FileSharing/FileSharing.js
@@ -36,7 +36,7 @@ const FileSharing = (props) =>
 	{
 		if (event.target.files.length > 0)
 		{
-			props.roomClient.shareFiles(event.target.files);
+			await props.roomClient.shareFiles(event.target.files);
 		}
 	};
 
@@ -65,6 +65,8 @@ const FileSharing = (props) =>
 				type='file'
 				disabled={!canShare}
 				onChange={handleFileChange}
+				// Need to reset to be able to share same file twice
+				onClick={(e) => (e.target.value = null)}
 				id='share-files-button'
 			/>
 			<label htmlFor='share-files-button'>