webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 10:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Load json even if signalingKey is missing

Browse source 
Is the case when the account is registered, but not verified
This commit is contained in:
AsamK 2015-07-06 10:47:43 +02:00
parent 73e8c4cabf
commit 9d71313a0c
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/cli/Manager.java
View file

@ -81,7 +81,9 @@ public class Manager {
JSONObject in = new JSONObject(IOUtils.toString(new FileInputStream(getFileName()))); JSONObject in = new JSONObject(IOUtils.toString(new FileInputStream(getFileName())));
username = in.getString("username"); username = in.getString("username");
password = in.getString("password"); password = in.getString("password");
signalingKey = in.getString("signalingKey"); if (in.has("signalingKey")) {
signalingKey = in.getString("signalingKey");
}
axolotlStore = new JsonAxolotlStore(in.getJSONObject("axolotlStore")); axolotlStore = new JsonAxolotlStore(in.getJSONObject("axolotlStore"));
registered = in.getBoolean("registered"); registered = in.getBoolean("registered");
accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password); accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password);