From bbab4bba1034a91c4557ad39be234694e6c61eee Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@nonnenberg.com>
Date: Wed, 10 Jan 2018 18:12:24 -0800
Subject: [PATCH] Fix device ID check, clean up prekey fetch logging (#1961)

* DeviceId is a string, so we use the less-strict comparison

* Clean up prekey fetch logging
---
 js/signal_protocol_store.js  | 6 +++---
 libtextsecure/sendmessage.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/signal_protocol_store.js b/js/signal_protocol_store.js
index f9a5403df..0400b42f7 100644
--- a/js/signal_protocol_store.js
+++ b/js/signal_protocol_store.js
@@ -192,7 +192,7 @@
                         privKey: prekey.get('privateKey'),
                     });
                 }, function() {
-                    console.log('Failed to load prekey:', keyId);
+                    console.log('Failed to fetch prekey:', keyId);
                     resolve();
                 });
             });
@@ -235,7 +235,7 @@
             var prekey = new SignedPreKey({id: keyId});
             return new Promise(function(resolve) {
                 prekey.fetch().then(function() {
-                    console.log('Successfully loaded prekey:', prekey.get('id'));
+                    console.log('Successfully fetched signed prekey:', prekey.get('id'));
                     resolve({
                         pubKey     : prekey.get('publicKey'),
                         privKey    : prekey.get('privateKey'),
@@ -244,7 +244,7 @@
                         confirmed  : prekey.get('confirmed'),
                     });
                 }).fail(function() {
-                    console.log('Failed to load signed prekey:', keyId);
+                    console.log('Failed to fetch signed prekey:', keyId);
                     resolve();
                 });
             });
diff --git a/libtextsecure/sendmessage.js b/libtextsecure/sendmessage.js
index 216441f53..c3a7762ac 100644
--- a/libtextsecure/sendmessage.js
+++ b/libtextsecure/sendmessage.js
@@ -422,7 +422,7 @@ MessageSender.prototype = {
         var myDevice = textsecure.storage.user.getDeviceId();
         var now = Date.now();
 
-        if (myDevice === 1) {
+        if (myDevice == 1) {
             return Promise.resolve();
         }