Use SignalProtocolAddress in MessageReceiver constructor

// FREEBIE
9 years ago · 9ecfe6acb0
parent 213b44935d
commit 9ecfe6acb0
2 changed files with 6 additions and 6 deletions
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@ -36929,9 +36929,9 @@ function MessageReceiver(url, username, password, signalingKey, attachment_serve
    this.password = password;
    this.server = new TextSecureServer(url, username, password, attachment_server_url);

-    var unencoded = textsecure.utils.unencodeNumber(username);
-    this.number = unencoded[0];
-    this.deviceId = unencoded[1];
+    var address = libsignal.SignalProtocolAddress.fromString(username);
+    this.number = address.getName();
+    this.deviceId = address.getDeviceId();
 }

 MessageReceiver.prototype = new textsecure.EventTarget();
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@ -9,9 +9,9 @@ function MessageReceiver(url, username, password, signalingKey, attachment_serve
    this.password = password;
    this.server = new TextSecureServer(url, username, password, attachment_server_url);

-    var unencoded = textsecure.utils.unencodeNumber(username);
-    this.number = unencoded[0];
-    this.deviceId = unencoded[1];
+    var address = libsignal.SignalProtocolAddress.fromString(username);
+    this.number = address.getName();
+    this.deviceId = address.getDeviceId();
 }

 MessageReceiver.prototype = new textsecure.EventTarget();