Merge pull request #568 from BeaudanBrown/hide-android-accepts

Hide android friend request accepts and lint

js/models/messages.js

@@ -1993,6 +1993,14 @@
             }
           } else {
             await conversation.onFriendRequestAccepted();
+            // We need to return for these types of messages because android struggles
+            if (
+              !message.get('body') &&
+              !message.get('attachments').length &&
+              !message.get('preview').length
+            ) {
+              return;
+            }
           }
           const id = await window.Signal.Data.saveMessage(message.attributes, {
             Message: Whisper.Message,

js/views/add_server_dialog_view.js

@@ -31,7 +31,9 @@
     confirm() {
       // Remove error if there is one
       this.showError(null);
-      const serverUrl = this.$('#server-url').val().toLowerCase();
+      const serverUrl = this.$('#server-url')
+        .val()
+        .toLowerCase();
       // TODO: Make this not hard coded
       const channelId = 1;
       const dialog = new Whisper.ConnectingToServerDialogView({