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

Fix reinstalls

Browse source 
Delay saving of new account info until we confirm with the server.
Explicitly delete old account info beforehand.

// FREEBIE
This commit is contained in:
lilia 2015-06-23 14:24:13 -07:00
parent db31835f68
commit 4c40861728
2 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
js/libtextsecure.js
View file

@ -39409,23 +39409,28 @@ TextSecureServer = function () {
} }
}; };
function createAccount(number, verificationCode, identityKeyPair, deviceName) { function createAccount(number, verificationCode, identityKeyPair, deviceName) {
textsecure.storage.put('identityKey', identityKeyPair);
var signalingKey = textsecure.crypto.getRandomBytes(32 + 20); var signalingKey = textsecure.crypto.getRandomBytes(32 + 20);
textsecure.storage.put('signaling_key', signalingKey);
var password = btoa(getString(textsecure.crypto.getRandomBytes(16))); var password = btoa(getString(textsecure.crypto.getRandomBytes(16)));
password = password.substring(0, password.length - 2); password = password.substring(0, password.length - 2);
textsecure.storage.put("password", password);
var registrationId = axolotl.util.generateRegistrationId(); var registrationId = axolotl.util.generateRegistrationId();
textsecure.storage.put("registrationId", registrationId);
return TextSecureServer.confirmCode( return TextSecureServer.confirmCode(
number, verificationCode, password, signalingKey, registrationId, deviceName number, verificationCode, password, signalingKey, registrationId, deviceName
).then(function(response) { ).then(function(response) {
textsecure.storage.remove('identityKey');
textsecure.storage.remove('signaling_key');
textsecure.storage.remove('password');
textsecure.storage.remove('registrationId');
textsecure.storage.remove('number_id');
textsecure.storage.remove('regionCode');
textsecure.storage.put('identityKey', identityKeyPair);
textsecure.storage.put('signaling_key', signalingKey);
textsecure.storage.put('password', password);
textsecure.storage.put('registrationId', registrationId);
textsecure.storage.user.setNumberAndDeviceId(number, response.deviceId || 1, deviceName); textsecure.storage.user.setNumberAndDeviceId(number, response.deviceId || 1, deviceName);
textsecure.storage.put("regionCode", libphonenumber.util.getRegionCodeForNumber(number)); textsecure.storage.put('regionCode', libphonenumber.util.getRegionCodeForNumber(number));
}); });
} }

21
libtextsecure/account_manager.js
View file

@ -89,23 +89,28 @@
} }
}; };
function createAccount(number, verificationCode, identityKeyPair, deviceName) { function createAccount(number, verificationCode, identityKeyPair, deviceName) {
textsecure.storage.put('identityKey', identityKeyPair);
var signalingKey = textsecure.crypto.getRandomBytes(32 + 20); var signalingKey = textsecure.crypto.getRandomBytes(32 + 20);
textsecure.storage.put('signaling_key', signalingKey);
var password = btoa(getString(textsecure.crypto.getRandomBytes(16))); var password = btoa(getString(textsecure.crypto.getRandomBytes(16)));
password = password.substring(0, password.length - 2); password = password.substring(0, password.length - 2);
textsecure.storage.put("password", password);
var registrationId = axolotl.util.generateRegistrationId(); var registrationId = axolotl.util.generateRegistrationId();
textsecure.storage.put("registrationId", registrationId);
return TextSecureServer.confirmCode( return TextSecureServer.confirmCode(
number, verificationCode, password, signalingKey, registrationId, deviceName number, verificationCode, password, signalingKey, registrationId, deviceName
).then(function(response) { ).then(function(response) {
textsecure.storage.remove('identityKey');
textsecure.storage.remove('signaling_key');
textsecure.storage.remove('password');
textsecure.storage.remove('registrationId');
textsecure.storage.remove('number_id');
textsecure.storage.remove('regionCode');
textsecure.storage.put('identityKey', identityKeyPair);
textsecure.storage.put('signaling_key', signalingKey);
textsecure.storage.put('password', password);
textsecure.storage.put('registrationId', registrationId);
textsecure.storage.user.setNumberAndDeviceId(number, response.deviceId || 1, deviceName); textsecure.storage.user.setNumberAndDeviceId(number, response.deviceId || 1, deviceName);
textsecure.storage.put("regionCode", libphonenumber.util.getRegionCodeForNumber(number)); textsecure.storage.put('regionCode', libphonenumber.util.getRegionCodeForNumber(number));
}); });
} }