webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-09-03 20:50:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make Json store use Jackson instead of Gson (as it's already linked)

Browse source 
Closes #4
This commit is contained in:
xardas 2015-10-06 21:34:26 +03:00 • committed by AsamK
parent ae8479df8c
commit 4d83d2168a
6 changed files with 277 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/main/java/cli/JsonSignedPreKeyStore.java
View file

@ -1,7 +1,9 @@
package cli;
import org.json.JSONArray;
import org.json.JSONObject;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.*;
import org.whispersystems.libaxolotl.InvalidKeyIdException;
import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
import org.whispersystems.libaxolotl.state.SignedPreKeyStore;
@ -20,23 +22,9 @@ class JsonSignedPreKeyStore implements SignedPreKeyStore {
}
public JsonSignedPreKeyStore(JSONArray list) {
for (int i = 0; i < list.length(); i++) {
JSONObject k = list.getJSONObject(i);
try {
store.put(k.getInt("id"), Base64.decode(k.getString("record")));
} catch (IOException e) {
System.out.println("Error while decoding prekey for: " + k.getString("name"));
}
}
}
public JSONArray getJson() {
JSONArray result = new JSONArray();
for (Integer id : store.keySet()) {
result.put(new JSONObject().put("id", id.toString()).put("record", Base64.encodeBytes(store.get(id))));
}
return result;
public void addSignedPreKeys(Map<Integer, byte[]> preKeys) {
store.putAll(preKeys);
}
@Override
@ -81,4 +69,46 @@ class JsonSignedPreKeyStore implements SignedPreKeyStore {
public void removeSignedPreKey(int signedPreKeyId) {
store.remove(signedPreKeyId);
}
public static class JsonSignedPreKeyStoreDeserializer extends JsonDeserializer<JsonSignedPreKeyStore> {
@Override
public JsonSignedPreKeyStore deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
JsonNode node = jsonParser.getCodec().readTree(jsonParser);
Map<Integer, byte[]> preKeyMap = new HashMap<>();
if (node.isArray()) {
for (JsonNode preKey : node) {
Integer preKeyId = preKey.get("id").asInt();
try {
preKeyMap.put(preKeyId, Base64.decode(preKey.get("record").asText()));
} catch (IOException e) {
System.out.println(String.format("Error while decoding prekey for: %s", preKeyId));
}
}
}
JsonSignedPreKeyStore keyStore = new JsonSignedPreKeyStore();
keyStore.addSignedPreKeys(preKeyMap);
return keyStore;
}
}
public static class JsonSignedPreKeyStoreSerializer extends JsonSerializer<JsonSignedPreKeyStore> {
@Override
public void serialize(JsonSignedPreKeyStore jsonPreKeyStore, JsonGenerator json, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
json.writeStartArray();
for (Map.Entry<Integer, byte[]> signedPreKey : jsonPreKeyStore.store.entrySet()) {
json.writeStartObject();
json.writeNumberField("id", signedPreKey.getKey());
json.writeStringField("record", Base64.encodeBytes(signedPreKey.getValue()));
json.writeEndObject();
}
json.writeEndArray();
}
}
}