From d69a0a9fd44095f3edc28294aaab56016df149b8 Mon Sep 17 00:00:00 2001
From: Ryan Tharp <neuro@interx.net>
Date: Mon, 3 Feb 2020 19:00:00 -0800
Subject: [PATCH] lint

---
 js/modules/loki_file_server_api.js  |  2 +-
 js/views/file_input_view.js         |  2 +-
 js/views/inbox_view.js              |  2 +-
 libtextsecure/message_receiver.js   | 16 +++++++++++-----
 stylesheets/_session_left_pane.scss |  2 +-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/js/modules/loki_file_server_api.js b/js/modules/loki_file_server_api.js
index 49fb47fe6..601ab2e9a 100644
--- a/js/modules/loki_file_server_api.js
+++ b/js/modules/loki_file_server_api.js
@@ -311,7 +311,7 @@ class LokiFileServerFactoryAPI {
     if (!thisServer) {
       thisServer = new LokiFileServerInstance(this.ourKey);
       log.info(`Registering FileServer ${serverUrl}`);
-      await thisServer.establishConnection(serverUrl, { skipToken: true } );
+      await thisServer.establishConnection(serverUrl, { skipToken: true });
       this.servers.push(thisServer);
     }
     return thisServer;
diff --git a/js/views/file_input_view.js b/js/views/file_input_view.js
index 41f660cd0..3d95bc6cc 100644
--- a/js/views/file_input_view.js
+++ b/js/views/file_input_view.js
@@ -236,7 +236,7 @@
         id: 'maximumAttachments',
       });
     },
-    
+
     // Housekeeping
     addAttachment(attachment) {
       if (attachment.isVoiceNote && this.attachments.length > 0) {
diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js
index 3a9141250..d57b6a824 100644
--- a/js/views/inbox_view.js
+++ b/js/views/inbox_view.js
@@ -156,7 +156,7 @@
         .find('.network-status-container')
         .append(this.networkStatusView.render().el);
 
-      extension.expired((expired) => {
+      extension.expired(expired => {
         if (expired) {
           const banner = new Whisper.ExpiredAlertBanner().render();
           banner.$el.prependTo(this.$el);
diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index e803acb36..ae43c33cf 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -702,8 +702,6 @@ MessageReceiver.prototype.extend({
       this.activeSessionBaseKey = await getCurrentSessionBaseKey(sessionCipher);
     };
 
-    const handleSessionReset = async result => result;
-
     switch (envelope.type) {
       case textsecure.protobuf.Envelope.Type.CIPHERTEXT:
         window.log.info('message from', this.getEnvelopeId(envelope));
@@ -745,7 +743,7 @@ MessageReceiver.prototype.extend({
           );
         });
         break;
-      case textsecure.protobuf.Envelope.Type.UNIDENTIFIED_SENDER:
+      case textsecure.protobuf.Envelope.Type.UNIDENTIFIED_SENDER: {
         window.log.info('received unidentified sender message');
 
         const secretSessionCipher = new window.Signal.Metadata.SecretSessionCipher(
@@ -823,6 +821,7 @@ MessageReceiver.prototype.extend({
             }
           );
         break;
+      }
       default:
         promise = Promise.reject(new Error('Unknown message type'));
     }
@@ -845,12 +844,18 @@ MessageReceiver.prototype.extend({
           window.log.info('Error getting conversation: ', envelope.source);
         }
 
-        /// *** BEGIN: session reset ***
+        // lint hates anything after // (so /// is no good)
+        // *** BEGIN: session reset ***
 
+        // we have address in scope from parent scope
+        // seems to be the same input parameters
+        // going to comment out due to lint complaints
+        /*
         const address = new libsignal.SignalProtocolAddress(
           envelope.source,
           envelope.sourceDevice
         );
+        */
 
         const restoreActiveSession = async () => {
           const record = await sessionCipher.getRecord(address.toString());
@@ -902,7 +907,8 @@ MessageReceiver.prototype.extend({
           }
         }
 
-        /// *** END ***
+        // lint hates anything after // (so /// is no good)
+        // *** END ***
 
         // Type here can actually be UNIDENTIFIED_SENDER even if
         // the underlying message is FRIEND_REQUEST
diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss
index 776f73a02..7fea21411 100644
--- a/stylesheets/_session_left_pane.scss
+++ b/stylesheets/_session_left_pane.scss
@@ -626,7 +626,7 @@ $session-compose-margin: 20px;
     background-color: $session-background;
     color: $session-color-light-grey;
     border: 1px solid $session-color-dark-grey;
-    font-family: "SF Pro Text";
+    font-family: 'SF Pro Text';
     font-size: $session-font-sm;
   }
 }