mirror of
https://github.com/oxen-io/session-desktop.git
synced 2023-12-14 02:12:57 +01:00
remove unused USERNAME and PASSWORD from MessageReceiver & MessageSender
This commit is contained in:
parent
ffbba2480f
commit
5d7ecc690d
|
@ -1486,9 +1486,6 @@
|
|||
if (messageReceiver) {
|
||||
await messageReceiver.close();
|
||||
}
|
||||
|
||||
const USERNAME = storage.get('number_id');
|
||||
const PASSWORD = storage.get('password');
|
||||
const mySignalingKey = storage.get('signaling_key');
|
||||
|
||||
connectCount += 1;
|
||||
|
@ -1518,8 +1515,6 @@
|
|||
window.lokiPublicChatAPI = null;
|
||||
window.feeds = [];
|
||||
messageReceiver = new textsecure.MessageReceiver(
|
||||
USERNAME,
|
||||
PASSWORD,
|
||||
mySignalingKey,
|
||||
options
|
||||
);
|
||||
|
@ -1527,18 +1522,13 @@
|
|||
'message',
|
||||
window.NewReceiver.handleMessageEvent
|
||||
);
|
||||
window.textsecure.messaging = new textsecure.MessageSender(
|
||||
USERNAME,
|
||||
PASSWORD
|
||||
);
|
||||
window.textsecure.messaging = new textsecure.MessageSender();
|
||||
return;
|
||||
}
|
||||
|
||||
initAPIs();
|
||||
await initSpecialConversations();
|
||||
messageReceiver = new textsecure.MessageReceiver(
|
||||
USERNAME,
|
||||
PASSWORD,
|
||||
mySignalingKey,
|
||||
options
|
||||
);
|
||||
|
@ -1560,10 +1550,7 @@
|
|||
logger: window.log,
|
||||
});
|
||||
|
||||
window.textsecure.messaging = new textsecure.MessageSender(
|
||||
USERNAME,
|
||||
PASSWORD
|
||||
);
|
||||
window.textsecure.messaging = new textsecure.MessageSender();
|
||||
|
||||
// On startup after upgrading to a new version, request a contact sync
|
||||
// (but only if we're not the primary device)
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
/* global window: false */
|
||||
/* global callWorker: false */
|
||||
/* global textsecure: false */
|
||||
/* global libsignal: false */
|
||||
/* global WebSocket: false */
|
||||
/* global Event: false */
|
||||
/* global dcodeIO: false */
|
||||
|
@ -18,14 +17,8 @@ function MessageReceiver(username, password, signalingKey) {
|
|||
this.count = 0;
|
||||
|
||||
this.signalingKey = signalingKey;
|
||||
this.username = username;
|
||||
this.password = password;
|
||||
this.server = WebAPI.connect();
|
||||
|
||||
const address = libsignal.SignalProtocolAddress.fromString(username);
|
||||
this.number = address.getName();
|
||||
this.deviceId = address.getDeviceId();
|
||||
|
||||
this.pending = Promise.resolve();
|
||||
|
||||
// only do this once to prevent duplicates
|
||||
|
|
|
@ -533,8 +533,8 @@ MessageSender.prototype = {
|
|||
|
||||
window.textsecure = window.textsecure || {};
|
||||
|
||||
textsecure.MessageSender = function MessageSenderWrapper(username, password) {
|
||||
const sender = new MessageSender(username, password);
|
||||
textsecure.MessageSender = function MessageSenderWrapper() {
|
||||
const sender = new MessageSender();
|
||||
this.sendContactSyncMessage = sender.sendContactSyncMessage.bind(sender);
|
||||
this.sendGroupSyncMessage = sender.sendGroupSyncMessage.bind(sender);
|
||||
this.sendOpenGroupsSyncMessage = sender.sendOpenGroupsSyncMessage.bind(
|
||||
|
|
|
@ -95,8 +95,6 @@ describe('MessageReceiver', () => {
|
|||
});
|
||||
|
||||
window.messageReceiver = new textsecure.MessageReceiver(
|
||||
'username',
|
||||
'password',
|
||||
'signalingKey'
|
||||
// 'ws://localhost:8080',
|
||||
// window,
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
'use strict';
|
||||
|
||||
describe('ConversationCollection', () => {
|
||||
textsecure.messaging = new textsecure.MessageSender('');
|
||||
textsecure.messaging = new textsecure.MessageSender();
|
||||
|
||||
before(clearDatabase);
|
||||
after(clearDatabase);
|
||||
|
|
Loading…
Reference in a new issue