Fix typo

diff --git a/src/main/java/org/asamk/signal/JsonContactsStore.java b/src/main/java/org/asamk/signal/JsonContactsStore.java
index e2807d8f2b57b10c930c9f4c56795d7c2f47bc40..e288eca63974f97dc1326373de23a1b286dfebee 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonContactsStore.java
+++ b/src/main/java/org/asamk/signal/JsonContactsStore.java
@@ -19,7 +19,7 @@ public class JsonContactsStore {
     @JsonDeserialize(using = ContactsDeserializer.class)
     private Map<String, ContactInfo> contacts = new HashMap<>();
 
     @JsonDeserialize(using = ContactsDeserializer.class)
     private Map<String, ContactInfo> contacts = new HashMap<>();
 

-    private static final ObjectMapper jsonProcessot = new ObjectMapper();
+    private static final ObjectMapper jsonProcessor = new ObjectMapper();

 
     void updateContact(ContactInfo contact) {
         contacts.put(contact.number, contact);
 
     void updateContact(ContactInfo contact) {
         contacts.put(contact.number, contact);


@@ -47,7 +47,7 @@ public class JsonContactsStore {
             Map<String, ContactInfo> contacts = new HashMap<>();
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
             for (JsonNode n : node) {
             Map<String, ContactInfo> contacts = new HashMap<>();
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
             for (JsonNode n : node) {

-                ContactInfo c = jsonProcessot.treeToValue(n, ContactInfo.class);
+                ContactInfo c = jsonProcessor.treeToValue(n, ContactInfo.class);

                 contacts.put(c.number, c);
             }
 
                 contacts.put(c.number, c);
             }
 

diff --git a/src/main/java/org/asamk/signal/JsonGroupStore.java b/src/main/java/org/asamk/signal/JsonGroupStore.java
index da512706928773d7690ae53972c5fc476e985da7..aa7e3a4501371986d07f497e61de70c20b5d3d1f 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonGroupStore.java
+++ b/src/main/java/org/asamk/signal/JsonGroupStore.java
@@ -21,7 +21,7 @@ public class JsonGroupStore {
 
     public static List<GroupInfo> groupsWithLegacyAvatarId = new ArrayList<>();
 
 
     public static List<GroupInfo> groupsWithLegacyAvatarId = new ArrayList<>();
 

-    private static final ObjectMapper jsonProcessot = new ObjectMapper();
+    private static final ObjectMapper jsonProcessor = new ObjectMapper();

 
     void updateGroup(GroupInfo group) {
         groups.put(Base64.encodeBytes(group.groupId), group);
 
     void updateGroup(GroupInfo group) {
         groups.put(Base64.encodeBytes(group.groupId), group);


@@ -49,7 +49,7 @@ public class JsonGroupStore {
             Map<String, GroupInfo> groups = new HashMap<>();
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
             for (JsonNode n : node) {
             Map<String, GroupInfo> groups = new HashMap<>();
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
             for (JsonNode n : node) {

-                GroupInfo g = jsonProcessot.treeToValue(n, GroupInfo.class);
+                GroupInfo g = jsonProcessor.treeToValue(n, GroupInfo.class);

                 // Check if a legacy avatarId exists
                 if (g.getAvatarId() != 0) {
                     groupsWithLegacyAvatarId.add(g);
                 // Check if a legacy avatarId exists
                 if (g.getAvatarId() != 0) {
                     groupsWithLegacyAvatarId.add(g);

diff --git a/src/main/java/org/asamk/signal/Manager.java b/src/main/java/org/asamk/signal/Manager.java
index 34bb5068ba5c03ad726c5489c70d0fcba7a74c3a..6c73d2c489d9cc6678b0ba0789407f52bf99e940 100644 (file)
--- a/src/main/java/org/asamk/signal/Manager.java
+++ b/src/main/java/org/asamk/signal/Manager.java
@@ -93,7 +93,7 @@ class Manager implements Signal {
     private FileChannel fileChannel;
     private FileLock lock;
 
     private FileChannel fileChannel;
     private FileLock lock;
 

-    private final ObjectMapper jsonProcessot = new ObjectMapper();
+    private final ObjectMapper jsonProcessor = new ObjectMapper();

     private String username;
     private int deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID;
     private String password;
     private String username;
     private int deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID;
     private String password;


@@ -115,12 +115,12 @@ class Manager implements Signal {
         this.attachmentsPath = this.settingsPath + "/attachments";
         this.avatarsPath = this.settingsPath + "/avatars";
 
         this.attachmentsPath = this.settingsPath + "/attachments";
         this.avatarsPath = this.settingsPath + "/avatars";
 

-        jsonProcessot.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE); // disable autodetect
-        jsonProcessot.enable(SerializationFeature.INDENT_OUTPUT); // for pretty print, you can disable it.
-        jsonProcessot.enable(SerializationFeature.WRITE_NULL_MAP_VALUES);
-        jsonProcessot.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
-        jsonProcessot.disable(JsonParser.Feature.AUTO_CLOSE_SOURCE);
-        jsonProcessot.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
+        jsonProcessor.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE); // disable autodetect
+        jsonProcessor.enable(SerializationFeature.INDENT_OUTPUT); // for pretty print, you can disable it.
+        jsonProcessor.enable(SerializationFeature.WRITE_NULL_MAP_VALUES);
+        jsonProcessor.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+        jsonProcessor.disable(JsonParser.Feature.AUTO_CLOSE_SOURCE);
+        jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);

     }
 
     public String getUsername() {
     }
 
     public String getUsername() {


@@ -229,7 +229,7 @@ class Manager implements Signal {
 
     private void load() throws IOException {
         openFileChannel();
 
     private void load() throws IOException {
         openFileChannel();

-        JsonNode rootNode = jsonProcessot.readTree(Channels.newInputStream(fileChannel));
+        JsonNode rootNode = jsonProcessor.readTree(Channels.newInputStream(fileChannel));

 
         JsonNode node = rootNode.get("deviceId");
         if (node != null) {
 
         JsonNode node = rootNode.get("deviceId");
         if (node != null) {


@@ -250,11 +250,11 @@ class Manager implements Signal {
         } else {
             nextSignedPreKeyId = 0;
         }
         } else {
             nextSignedPreKeyId = 0;
         }

-        signalProtocolStore = jsonProcessot.convertValue(getNotNullNode(rootNode, "axolotlStore"), JsonSignalProtocolStore.class);
+        signalProtocolStore = jsonProcessor.convertValue(getNotNullNode(rootNode, "axolotlStore"), JsonSignalProtocolStore.class);

         registered = getNotNullNode(rootNode, "registered").asBoolean();
         JsonNode groupStoreNode = rootNode.get("groupStore");
         if (groupStoreNode != null) {
         registered = getNotNullNode(rootNode, "registered").asBoolean();
         JsonNode groupStoreNode = rootNode.get("groupStore");
         if (groupStoreNode != null) {

-            groupStore = jsonProcessot.convertValue(groupStoreNode, JsonGroupStore.class);
+            groupStore = jsonProcessor.convertValue(groupStoreNode, JsonGroupStore.class);

         }
         if (groupStore == null) {
             groupStore = new JsonGroupStore();
         }
         if (groupStore == null) {
             groupStore = new JsonGroupStore();


@@ -262,7 +262,7 @@ class Manager implements Signal {
 
         JsonNode contactStoreNode = rootNode.get("contactStore");
         if (contactStoreNode != null) {
 
         JsonNode contactStoreNode = rootNode.get("contactStore");
         if (contactStoreNode != null) {

-            contactStore = jsonProcessot.convertValue(contactStoreNode, JsonContactsStore.class);
+            contactStore = jsonProcessor.convertValue(contactStoreNode, JsonContactsStore.class);

         }
         if (contactStore == null) {
             contactStore = new JsonContactsStore();
         }
         if (contactStore == null) {
             contactStore = new JsonContactsStore();


@@ -294,7 +294,7 @@ class Manager implements Signal {
         if (username == null) {
             return;
         }
         if (username == null) {
             return;
         }

-        ObjectNode rootNode = jsonProcessot.createObjectNode();
+        ObjectNode rootNode = jsonProcessor.createObjectNode();

         rootNode.put("username", username)
                 .put("deviceId", deviceId)
                 .put("password", password)
         rootNode.put("username", username)
                 .put("deviceId", deviceId)
                 .put("password", password)


@@ -309,7 +309,7 @@ class Manager implements Signal {
         try {
             openFileChannel();
             fileChannel.position(0);
         try {
             openFileChannel();
             fileChannel.position(0);

-            jsonProcessot.writeValue(Channels.newOutputStream(fileChannel), rootNode);
+            jsonProcessor.writeValue(Channels.newOutputStream(fileChannel), rootNode);

             fileChannel.truncate(fileChannel.position());
             fileChannel.force(false);
         } catch (Exception e) {
             fileChannel.truncate(fileChannel.position());
             fileChannel.force(false);
         } catch (Exception e) {