From: AsamK <asamk@gmx.de>
Date: Mon, 6 Jul 2015 08:47:43 +0000 (+0200)
Subject: Load json even if signalingKey is missing
X-Git-Tag: v0.0.2~14
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/9d71313a0c2b2dc369a5974f4733204f22e89998

Load json even if signalingKey is missing

Is the case when the account is registered, but not verified
---

diff --git a/src/main/java/cli/Manager.java b/src/main/java/cli/Manager.java
index 1e7f0226..ff2178b4 100644
--- a/src/main/java/cli/Manager.java
+++ b/src/main/java/cli/Manager.java
@@ -81,7 +81,9 @@ public class Manager {
         JSONObject in = new JSONObject(IOUtils.toString(new FileInputStream(getFileName())));
         username = in.getString("username");
         password = in.getString("password");
-        signalingKey = in.getString("signalingKey");
+        if (in.has("signalingKey")) {
+            signalingKey = in.getString("signalingKey");
+        }
         axolotlStore = new JsonAxolotlStore(in.getJSONObject("axolotlStore"));
         registered = in.getBoolean("registered");
         accountManager = new TextSecureAccountManager(URL, TRUST_STORE, username, password);