From a3019e12bf89a30cad1fb12d535279ac9d3e20a9 Mon Sep 17 00:00:00 2001
From: Beaudan Brown <beau@loki.network>
Date: Tue, 22 Oct 2019 14:21:36 +1100
Subject: [PATCH] Hide android friend request accepts and lint

---
 js/models/messages.js              | 8 ++++++++
 js/views/add_server_dialog_view.js | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/js/models/messages.js b/js/models/messages.js
index 874b76196..37c900525 100644
--- a/js/models/messages.js
+++ b/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,
diff --git a/js/views/add_server_dialog_view.js b/js/views/add_server_dialog_view.js
index 270912825..718a154c4 100644
--- a/js/views/add_server_dialog_view.js
+++ b/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({