Merge pull request #2879 from matrix-org/dbkr/file_upload_fallout

Fix a few bugs introduced in file upload rework

src/components/structures/RoomView.js

@@ -536,7 +536,9 @@ module.exports = React.createClass({
                   payload.data.description || payload.data.name);
               break;
             case 'picture_snapshot':
-                this.uploadFile(payload.file);
+                return ContentMessages.sharedInstance().sendContentListToRoom(
+                    [payload.file], this.state.room.roomId, MatrixClientPeg.get(),
+                );
                 break;
             case 'notifier_enabled':
             case 'upload_started':

src/components/views/rooms/MessageComposerInput.js

@@ -47,7 +47,7 @@ import {Completion} from "../../../autocomplete/Autocompleter";
 import Markdown from '../../../Markdown';
 import ComposerHistoryManager from '../../../ComposerHistoryManager';
 import MessageComposerStore from '../../../stores/MessageComposerStore';
-import ContentMessage from '../../../ContentMessages';
+import ContentMessages from '../../../ContentMessages';
 
 import {MATRIXTO_URL_PATTERN} from '../../../linkify-matrix';
 
@@ -139,8 +139,6 @@ export default class MessageComposerInput extends React.Component {
         // js-sdk Room object
         room: PropTypes.object.isRequired,
 
-        onFilesPasted: PropTypes.func,
-
         onInputStateChanged: PropTypes.func,
     };
 
@@ -1014,7 +1012,7 @@ export default class MessageComposerInput extends React.Component {
                 // neither chrome nor firefox let you paste a plain file copied
                 // from Finder) but more images copied from a different website
                 // / word processor etc.
-                return ContentMessage.sharedInstance().sendContentListToRoom(
+                return ContentMessages.sharedInstance().sendContentListToRoom(
                     transfer.files, this.props.room.roomId, this.client,
                 );
             case 'html': {