cleanup unused code

background.html

@@ -214,8 +214,6 @@
   <script type='text/javascript' src='js/views/whisper_view.js'></script>
   <script type='text/javascript' src='js/views/toast_view.js'></script>
   <script type='text/javascript' src='js/views/session_toast_view.js'></script>
-  <script type='text/javascript' src='js/views/conversation_loading_view.js'></script>
-  <script type='text/javascript' src='js/views/session_toggle_view.js'></script>
   <script type='text/javascript' src='js/views/session_modal_view.js'></script>
   <script type='text/javascript' src='js/views/session_dropdown_view.js'></script>
   <script type='text/javascript' src='js/views/session_confirm_view.js'></script>

background_test.html

@@ -216,8 +216,6 @@
   <script type='text/javascript' src='js/views/whisper_view.js'></script>
   <script type='text/javascript' src='js/views/toast_view.js'></script>
   <script type='text/javascript' src='js/views/session_toast_view.js'></script>
-  <script type='text/javascript' src='js/views/conversation_loading_view.js'></script>
-  <script type='text/javascript' src='js/views/session_toggle_view.js'></script>
   <script type='text/javascript' src='js/views/session_modal_view.js'></script>
   <script type='text/javascript' src='js/views/session_dropdown_view.js'></script>
   <script type='text/javascript' src='js/views/session_confirm_view.js'></script>

js/background.js

@@ -919,23 +919,6 @@
       return conversation;
     };
 
-    window.sendGroupInvitations = (serverInfo, pubkeys) => {
-      pubkeys.forEach(async pubkeyStr => {
-        const convo = await ConversationController.getOrCreateAndWait(
-          pubkeyStr,
-          'private'
-        );
-
-        if (convo) {
-          convo.sendMessage('', null, null, null, {
-            serverName: serverInfo.name,
-            channelId: serverInfo.channelId,
-            serverAddress: serverInfo.address,
-          });
-        }
-      });
-    };
-
     Whisper.events.on('updateGroupName', async groupConvo => {
       if (appView) {
         appView.showUpdateGroupNameDialog(groupConvo);

js/modules/signal.js

@@ -50,7 +50,6 @@ const {
   SettingsView,
 } = require('../../ts/components/session/settings/SessionSettings');
 const { SessionToast } = require('../../ts/components/session/SessionToast');
-const { SessionToggle } = require('../../ts/components/session/SessionToggle');
 const { SessionModal } = require('../../ts/components/session/SessionModal');
 const {
   SessionSeedModal,
@@ -272,7 +271,6 @@ exports.setup = (options = {}) => {
     GroupInvitation,
     SessionConversation,
     SessionToast,
-    SessionToggle,
     SessionConfirm,
     SessionModal,
     SessionSeedModal,

js/modules/types/attachment.js

@@ -215,6 +215,7 @@ exports.isVoiceMessage = AttachmentTS.isVoiceMessage;
 exports.save = AttachmentTS.save;
 exports.getFileExtension = AttachmentTS.getFileExtension;
 exports.getSuggestedFilenameSending = AttachmentTS.getSuggestedFilenameSending;
+exports.arrayBufferFromFile = AttachmentTS.arrayBufferFromFile;
 
 const THUMBNAIL_SIZE = 150;
 const THUMBNAIL_CONTENT_TYPE = 'image/png';

js/views/conversation_loading_view.js

@@ -1,22 +0,0 @@
-/* global Whisper */
-
-// eslint-disable-next-line func-names
-(function() {
-  'use strict';
-
-  window.Whisper = window.Whisper || {};
-
-  Whisper.ConversationLoadingScreen = Whisper.View.extend({
-    initialize() {},
-
-    render() {
-      this.dialogView = new Whisper.ReactWrapperView({
-        className: 'app-loading-wrapper',
-        Component: window.Signal.Components.ConversationLoadingScreen,
-        props: this.props,
-      });
-
-      this.$el.append(this.dialogView.el);
-    },
-  });
-})();

js/views/conversation_view.js

@@ -210,37 +210,6 @@
       // paste: 'onPaste',
     },
 
-    onChooseAttachment(e) {
-      if (e) {
-        e.stopPropagation();
-        e.preventDefault();
-      }
-
-      this.$('input.file-input').click();
-    },
-    async onChoseAttachment() {
-      const fileField = this.$('input.file-input');
-      const files = fileField.prop('files');
-
-      for (let i = 0, max = files.length; i < max; i += 1) {
-        const file = files[i];
-        // eslint-disable-next-line no-await-in-loop
-        await this.fileInput.maybeAddAttachment(file);
-        this.toggleMicrophone();
-      }
-
-      fileField.val(null);
-    },
-
-    onDragOver(e) {
-      this.fileInput.onDragOver(e);
-    },
-    onDragLeave(e) {
-      this.fileInput.onDragLeave(e);
-    },
-    onDrop(e) {
-      this.fileInput.onDrop(e);
-    },
     onPaste(e) {
       this.fileInput.onPaste(e);
     },
@@ -258,13 +227,6 @@
       }
     },
 
-    onDisableInput(disable) {
-      this.$('button.microphone, button.paperclip, .send-message').attr(
-        'disabled',
-        disable
-      );
-    },
-
     onChangePlaceholder(type) {
       if (!this.$messageField) {
         return;

js/views/invite_contacts_dialog_view.js

@@ -57,14 +57,21 @@
     submit(pubkeys) {
       // public group chats
       if (this.isPublic) {
-        window.sendGroupInvitations(
-          {
-            address: this.chatServer,
-            name: this.chatName,
-            channelId: this.channelId,
-          },
-          pubkeys
-        );
+        const serverInfos = {
+          address: this.chatServer,
+          name: this.chatName,
+          channelId: this.channelId,
+        };
+        pubkeys.forEach(async pubkeyStr => {
+          const convo = await window.ConversationController.getOrCreateAndWait(
+            pubkeyStr,
+            'private'
+          );
+
+          if (convo) {
+            convo.sendMessage('', null, null, null, serverInfos);
+          }
+        });
       } else {
         // private group chats
         const ourPK = window.textsecure.storage.user.getNumber();

js/views/session_toggle_view.js

@@ -1,31 +0,0 @@
-/* global Whisper */
-
-// eslint-disable-next-line func-names
-(function() {
-  'use strict';
-
-  window.Whisper = window.Whisper || {};
-
-  Whisper.SessionToggleView = Whisper.View.extend({
-    initialize(options) {
-      this.props = {
-        active: options.active,
-      };
-    },
-
-    render() {
-      this.toggleView = new Whisper.ReactWrapperView({
-        className: 'session-toggle-wrapper',
-        Component: window.Signal.Components.SessionToggle,
-        props: this.props,
-      });
-
-      this.$el.append(this.toggleView.el);
-    },
-
-    toggle() {
-      this.props.active = !this.props.active;
-      this.toggleView.update(this.props);
-    },
-  });
-})();

test/index.html

@@ -251,8 +251,6 @@
   <script type="text/javascript" src="../js/views/whisper_view.js"></script>
   <script type="text/javascript" src="../js/views/toast_view.js"></script>
   <script type="text/javascript" src="../js/views/session_toast_view.js"></script>
-  <script type="text/javascript" src="../js/views/conversation_loading_view.js"></script>
-  <script type="text/javascript" src="../js/views/session_toggle_view.js"></script>
   <script type="text/javascript" src="../js/views/session_modal_view.js"></script>
   <script type="text/javascript" src="../js/views/session_dropdown_view.js"></script>
   <script type="text/javascript" src="../js/views/session_confirm_view.js"></script>