Fix minor inspection issues

diff --git a/src/main/java/org/asamk/signal/storage/groups/JsonGroupStore.java b/src/main/java/org/asamk/signal/storage/groups/JsonGroupStore.java
index e8e9730900fc19273b6e8ba92f741deec864e734..6a3cdedbae7220ea2dc00655c143511813faa0b7 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/groups/JsonGroupStore.java
+++ b/src/main/java/org/asamk/signal/storage/groups/JsonGroupStore.java
@@ -30,8 +30,7 @@ public class JsonGroupStore {
     }
 
     public GroupInfo getGroup(byte[] groupId) {
     }
 
     public GroupInfo getGroup(byte[] groupId) {

-        GroupInfo g = groups.get(Base64.encodeBytes(groupId));
-        return g;
+        return groups.get(Base64.encodeBytes(groupId));

     }
 
     public List<GroupInfo> getGroups() {
     }
 
     public List<GroupInfo> getGroups() {

diff --git a/src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java b/src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java
index e086b929e37a92b1c6dc0bde5893064bf3729566..a343ad4e4c9894a5638bf4f9d06d7c3f5a02d0c2 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java
+++ b/src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java
@@ -94,7 +94,7 @@ public class JsonIdentityKeyStore implements IdentityKeyStore {
     @Override
     public IdentityKey getIdentity(SignalProtocolAddress address) {
         List<Identity> identities = trustedKeys.get(address.getName());
     @Override
     public IdentityKey getIdentity(SignalProtocolAddress address) {
         List<Identity> identities = trustedKeys.get(address.getName());

-        if (identities == null) {
+        if (identities == null || identities.size() == 0) {

             return null;
         }
 
             return null;
         }
 


@@ -102,7 +102,7 @@ public class JsonIdentityKeyStore implements IdentityKeyStore {
         Identity maxIdentity = null;
         for (Identity id : identities) {
             final long time = id.getDateAdded().getTime();
         Identity maxIdentity = null;
         for (Identity id : identities) {
             final long time = id.getDateAdded().getTime();

-            if (maxDate <= time) {
+            if (maxIdentity == null || maxDate <= time) {

                 maxDate = time;
                 maxIdentity = id;
             }
                 maxDate = time;
                 maxIdentity = id;
             }


@@ -123,7 +123,7 @@ public class JsonIdentityKeyStore implements IdentityKeyStore {
     public static class JsonIdentityKeyStoreDeserializer extends JsonDeserializer<JsonIdentityKeyStore> {
 
         @Override
     public static class JsonIdentityKeyStoreDeserializer extends JsonDeserializer<JsonIdentityKeyStore> {
 
         @Override

-        public JsonIdentityKeyStore deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+        public JsonIdentityKeyStore deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {

             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
 
             try {
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
 
             try {


@@ -157,7 +157,7 @@ public class JsonIdentityKeyStore implements IdentityKeyStore {
     public static class JsonIdentityKeyStoreSerializer extends JsonSerializer<JsonIdentityKeyStore> {
 
         @Override
     public static class JsonIdentityKeyStoreSerializer extends JsonSerializer<JsonIdentityKeyStore> {
 
         @Override

-        public void serialize(JsonIdentityKeyStore jsonIdentityKeyStore, JsonGenerator json, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
+        public void serialize(JsonIdentityKeyStore jsonIdentityKeyStore, JsonGenerator json, SerializerProvider serializerProvider) throws IOException {

             json.writeStartObject();
             json.writeNumberField("registrationId", jsonIdentityKeyStore.getLocalRegistrationId());
             json.writeStringField("identityKey", Base64.encodeBytes(jsonIdentityKeyStore.getIdentityKeyPair().serialize()));
             json.writeStartObject();
             json.writeNumberField("registrationId", jsonIdentityKeyStore.getLocalRegistrationId());
             json.writeStringField("identityKey", Base64.encodeBytes(jsonIdentityKeyStore.getIdentityKeyPair().serialize()));

diff --git a/src/main/java/org/asamk/signal/storage/protocol/JsonPreKeyStore.java b/src/main/java/org/asamk/signal/storage/protocol/JsonPreKeyStore.java
index 184c084bd5917d328a6d1bbd7adfa783a4f78ecb..3d4e21a36bfd3bf00a031db9cb2890f3ba49896b 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonPreKeyStore.java
+++ b/src/main/java/org/asamk/signal/storage/protocol/JsonPreKeyStore.java
@@ -56,7 +56,7 @@ class JsonPreKeyStore implements PreKeyStore {
     public static class JsonPreKeyStoreDeserializer extends JsonDeserializer<JsonPreKeyStore> {
 
         @Override
     public static class JsonPreKeyStoreDeserializer extends JsonDeserializer<JsonPreKeyStore> {
 
         @Override

-        public JsonPreKeyStore deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+        public JsonPreKeyStore deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {

             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
 
             Map<Integer, byte[]> preKeyMap = new HashMap<>();
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
 
             Map<Integer, byte[]> preKeyMap = new HashMap<>();


@@ -82,7 +82,7 @@ class JsonPreKeyStore implements PreKeyStore {
     public static class JsonPreKeyStoreSerializer extends JsonSerializer<JsonPreKeyStore> {
 
         @Override
     public static class JsonPreKeyStoreSerializer extends JsonSerializer<JsonPreKeyStore> {
 
         @Override

-        public void serialize(JsonPreKeyStore jsonPreKeyStore, JsonGenerator json, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
+        public void serialize(JsonPreKeyStore jsonPreKeyStore, JsonGenerator json, SerializerProvider serializerProvider) throws IOException {

             json.writeStartArray();
             for (Map.Entry<Integer, byte[]> preKey : jsonPreKeyStore.store.entrySet()) {
                 json.writeStartObject();
             json.writeStartArray();
             for (Map.Entry<Integer, byte[]> preKey : jsonPreKeyStore.store.entrySet()) {
                 json.writeStartObject();

diff --git a/src/main/java/org/asamk/signal/storage/protocol/JsonSessionStore.java b/src/main/java/org/asamk/signal/storage/protocol/JsonSessionStore.java
index bf6891c893b6c87d5e4d91520350b45f27820a06..87007d356657624de3803fb586437bcab8287983 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonSessionStore.java
+++ b/src/main/java/org/asamk/signal/storage/protocol/JsonSessionStore.java
@@ -78,7 +78,7 @@ class JsonSessionStore implements SessionStore {
     public static class JsonSessionStoreDeserializer extends JsonDeserializer<JsonSessionStore> {
 
         @Override
     public static class JsonSessionStoreDeserializer extends JsonDeserializer<JsonSessionStore> {
 
         @Override

-        public JsonSessionStore deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+        public JsonSessionStore deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {

             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
 
             Map<SignalProtocolAddress, byte[]> sessionMap = new HashMap<>();
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
 
             Map<SignalProtocolAddress, byte[]> sessionMap = new HashMap<>();


@@ -104,7 +104,7 @@ class JsonSessionStore implements SessionStore {
     public static class JsonPreKeyStoreSerializer extends JsonSerializer<JsonSessionStore> {
 
         @Override
     public static class JsonPreKeyStoreSerializer extends JsonSerializer<JsonSessionStore> {
 
         @Override

-        public void serialize(JsonSessionStore jsonSessionStore, JsonGenerator json, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
+        public void serialize(JsonSessionStore jsonSessionStore, JsonGenerator json, SerializerProvider serializerProvider) throws IOException {

             json.writeStartArray();
             for (Map.Entry<SignalProtocolAddress, byte[]> preKey : jsonSessionStore.sessions.entrySet()) {
                 json.writeStartObject();
             json.writeStartArray();
             for (Map.Entry<SignalProtocolAddress, byte[]> preKey : jsonSessionStore.sessions.entrySet()) {
                 json.writeStartObject();

diff --git a/src/main/java/org/asamk/signal/storage/protocol/JsonSignedPreKeyStore.java b/src/main/java/org/asamk/signal/storage/protocol/JsonSignedPreKeyStore.java
index a8c400ce75b237038a85f003f2b0548a559f8eff..defd7f93f093725d1583a221825b944096e7f3cf 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonSignedPreKeyStore.java
+++ b/src/main/java/org/asamk/signal/storage/protocol/JsonSignedPreKeyStore.java
@@ -73,7 +73,7 @@ class JsonSignedPreKeyStore implements SignedPreKeyStore {
     public static class JsonSignedPreKeyStoreDeserializer extends JsonDeserializer<JsonSignedPreKeyStore> {
 
         @Override
     public static class JsonSignedPreKeyStoreDeserializer extends JsonDeserializer<JsonSignedPreKeyStore> {
 
         @Override

-        public JsonSignedPreKeyStore deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+        public JsonSignedPreKeyStore deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {

             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
 
             Map<Integer, byte[]> preKeyMap = new HashMap<>();
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
 
             Map<Integer, byte[]> preKeyMap = new HashMap<>();


@@ -99,7 +99,7 @@ class JsonSignedPreKeyStore implements SignedPreKeyStore {
     public static class JsonSignedPreKeyStoreSerializer extends JsonSerializer<JsonSignedPreKeyStore> {
 
         @Override
     public static class JsonSignedPreKeyStoreSerializer extends JsonSerializer<JsonSignedPreKeyStore> {
 
         @Override

-        public void serialize(JsonSignedPreKeyStore jsonPreKeyStore, JsonGenerator json, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
+        public void serialize(JsonSignedPreKeyStore jsonPreKeyStore, JsonGenerator json, SerializerProvider serializerProvider) throws IOException {

             json.writeStartArray();
             for (Map.Entry<Integer, byte[]> signedPreKey : jsonPreKeyStore.store.entrySet()) {
                 json.writeStartObject();
             json.writeStartArray();
             for (Map.Entry<Integer, byte[]> signedPreKey : jsonPreKeyStore.store.entrySet()) {
                 json.writeStartObject();

diff --git a/src/main/java/org/asamk/signal/util/Hex.java b/src/main/java/org/asamk/signal/util/Hex.java
index 9f88579105fba9a60de19762554035d49f1d2afe..95b2d26ffa1405a7141f4de76b69bbac5e2d7b16 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Hex.java
+++ b/src/main/java/org/asamk/signal/util/Hex.java
@@ -11,8 +11,8 @@ public class Hex {
 
     public static String toStringCondensed(byte[] bytes) {
         StringBuffer buf = new StringBuffer();
 
     public static String toStringCondensed(byte[] bytes) {
         StringBuffer buf = new StringBuffer();

-        for (int i = 0; i < bytes.length; i++) {
-            appendHexChar(buf, bytes[i]);
+        for (final byte aByte : bytes) {
+            appendHexChar(buf, aByte);

         }
         return buf.toString();
     }
         }
         return buf.toString();
     }