mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Merge (un)encrypted storage layers

Browse source
This commit is contained in:
Matt Corallo 2015-03-24 16:20:36 -07:00 • committed by lilia
parent 454b4726bd
commit 00cb420d37
12 changed files with 102 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libtextsecure/api.js
View file

@ -96,7 +96,7 @@ window.textsecure.api = function () {
if (param.do_auth) {
param.user = textsecure.storage.user.getNumber() + "." + textsecure.storage.user.getDeviceId();
param.password = textsecure.storage.getEncrypted("password");
param.password = textsecure.storage.get("password");
}
return new Promise(function (resolve, reject) {
@ -322,7 +322,7 @@ window.textsecure.api = function () {
var params = '';
if (auth) {
var user = textsecure.storage.user.getNumber() + "." + textsecure.storage.user.getDeviceId();
var password = textsecure.storage.getEncrypted("password");
var password = textsecure.storage.get("password");
var params = 'login=%2B' + encodeURIComponent(user.substring(1)) + '&password=' + encodeURIComponent(password);
}
return window.textsecure.websocket(URL+params)