From: AsamK <asamk@gmx.de>
Date: Tue, 20 Nov 2018 22:27:36 +0000 (+0100)
Subject: Fix inspections
X-Git-Tag: v0.6.1~7
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/7e897fa6d0aaa87646b51efa3ee1a5ecfaa3865e?hp=f60a10eb6e40921c32045c1e38843d6b87f3d274

Fix inspections
---

diff --git a/src/main/java/org/asamk/signal/GroupNotFoundException.java b/src/main/java/org/asamk/signal/GroupNotFoundException.java
index 9f8c681a..5fee6233 100644
--- a/src/main/java/org/asamk/signal/GroupNotFoundException.java
+++ b/src/main/java/org/asamk/signal/GroupNotFoundException.java
@@ -5,10 +5,6 @@ import org.whispersystems.signalservice.internal.util.Base64;
 
 public class GroupNotFoundException extends DBusExecutionException {
 
-    public GroupNotFoundException(String message) {
-        super(message);
-    }
-
     public GroupNotFoundException(byte[] groupId) {
         super("Group not found: " + Base64.encodeBytes(groupId));
     }
diff --git a/src/main/java/org/asamk/signal/NotAGroupMemberException.java b/src/main/java/org/asamk/signal/NotAGroupMemberException.java
index 42e021ec..84e2f90f 100644
--- a/src/main/java/org/asamk/signal/NotAGroupMemberException.java
+++ b/src/main/java/org/asamk/signal/NotAGroupMemberException.java
@@ -5,10 +5,6 @@ import org.whispersystems.signalservice.internal.util.Base64;
 
 public class NotAGroupMemberException extends DBusExecutionException {
 
-    public NotAGroupMemberException(String message) {
-        super(message);
-    }
-
     public NotAGroupMemberException(byte[] groupId, String groupName) {
         super("User is not a member in group: " + groupName + " (" + Base64.encodeBytes(groupId) + ")");
     }
diff --git a/src/main/java/org/asamk/signal/UserAlreadyExists.java b/src/main/java/org/asamk/signal/UserAlreadyExists.java
index 047b5fc7..28836f28 100644
--- a/src/main/java/org/asamk/signal/UserAlreadyExists.java
+++ b/src/main/java/org/asamk/signal/UserAlreadyExists.java
@@ -2,8 +2,8 @@ package org.asamk.signal;
 
 public class UserAlreadyExists extends Exception {
 
-    private String username;
-    private String fileName;
+    private final String username;
+    private final String fileName;
 
     public UserAlreadyExists(String username, String fileName) {
         this.username = username;
diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index 1b703e42..f8870a72 100644
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -73,16 +73,14 @@ public class Manager implements Signal {
     private final String dataPath;
     private final String attachmentsPath;
     private final String avatarsPath;
+    private final SleepTimer timer = new UptimeSleepTimer();
 
     private SignalAccount account;
-
     private String username;
     private SignalServiceAccountManager accountManager;
     private SignalServiceMessagePipe messagePipe = null;
     private SignalServiceMessagePipe unidentifiedMessagePipe = null;
 
-    private SleepTimer timer = new UptimeSleepTimer();
-
     public Manager(String username, String settingsPath) {
         this.username = username;
         this.settingsPath = settingsPath;
diff --git a/src/main/java/org/asamk/signal/manager/Utils.java b/src/main/java/org/asamk/signal/manager/Utils.java
index f47dc1ce..dbcd7e42 100644
--- a/src/main/java/org/asamk/signal/manager/Utils.java
+++ b/src/main/java/org/asamk/signal/manager/Utils.java
@@ -223,8 +223,8 @@ class Utils {
 
     static class DeviceLinkInfo {
 
-        String deviceIdentifier;
-        ECPublicKey deviceKey;
+        final String deviceIdentifier;
+        final ECPublicKey deviceKey;
 
         DeviceLinkInfo(final String deviceIdentifier, final ECPublicKey deviceKey) {
             this.deviceIdentifier = deviceIdentifier;
diff --git a/src/main/java/org/asamk/signal/storage/contacts/JsonContactsStore.java b/src/main/java/org/asamk/signal/storage/contacts/JsonContactsStore.java
index 45e35e99..8d22550b 100644
--- a/src/main/java/org/asamk/signal/storage/contacts/JsonContactsStore.java
+++ b/src/main/java/org/asamk/signal/storage/contacts/JsonContactsStore.java
@@ -40,7 +40,7 @@ public class JsonContactsStore {
         contacts.clear();
     }
 
-    public static class MapToListSerializer extends JsonSerializer<Map<?, ?>> {
+    private static class MapToListSerializer extends JsonSerializer<Map<?, ?>> {
 
         @Override
         public void serialize(final Map<?, ?> value, final JsonGenerator jgen, final SerializerProvider provider) throws IOException {
@@ -48,7 +48,7 @@ public class JsonContactsStore {
         }
     }
 
-    public static class ContactsDeserializer extends JsonDeserializer<Map<String, ContactInfo>> {
+    private static class ContactsDeserializer extends JsonDeserializer<Map<String, ContactInfo>> {
 
         @Override
         public Map<String, ContactInfo> deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
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 6a3cdedb..4c5677a6 100644
--- a/src/main/java/org/asamk/signal/storage/groups/JsonGroupStore.java
+++ b/src/main/java/org/asamk/signal/storage/groups/JsonGroupStore.java
@@ -37,7 +37,7 @@ public class JsonGroupStore {
         return new ArrayList<>(groups.values());
     }
 
-    public static class MapToListSerializer extends JsonSerializer<Map<?, ?>> {
+    private static class MapToListSerializer extends JsonSerializer<Map<?, ?>> {
 
         @Override
         public void serialize(final Map<?, ?> value, final JsonGenerator jgen, final SerializerProvider provider) throws IOException {
@@ -45,7 +45,7 @@ public class JsonGroupStore {
         }
     }
 
-    public static class GroupsDeserializer extends JsonDeserializer<Map<String, GroupInfo>> {
+    private static class GroupsDeserializer extends JsonDeserializer<Map<String, GroupInfo>> {
 
         @Override
         public Map<String, GroupInfo> deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
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 a343ad4e..d7049e4a 100644
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java
+++ b/src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java
@@ -2,7 +2,6 @@ package org.asamk.signal.storage.protocol;
 
 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.asamk.signal.TrustLevel;
 import org.whispersystems.libsignal.IdentityKey;
@@ -189,13 +188,13 @@ public class JsonIdentityKeyStore implements IdentityKeyStore {
             this.added = new Date();
         }
 
-        public Identity(IdentityKey identityKey, TrustLevel trustLevel, Date added) {
+        Identity(IdentityKey identityKey, TrustLevel trustLevel, Date added) {
             this.identityKey = identityKey;
             this.trustLevel = trustLevel;
             this.added = added;
         }
 
-        public boolean isTrusted() {
+        boolean isTrusted() {
             return trustLevel == TrustLevel.TRUSTED_UNVERIFIED ||
                     trustLevel == TrustLevel.TRUSTED_VERIFIED;
         }
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 3d4e21a3..3065bfde 100644
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonPreKeyStore.java
+++ b/src/main/java/org/asamk/signal/storage/protocol/JsonPreKeyStore.java
@@ -2,7 +2,6 @@ package org.asamk.signal.storage.protocol;
 
 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.libsignal.InvalidKeyIdException;
 import org.whispersystems.libsignal.state.PreKeyRecord;
@@ -21,7 +20,7 @@ class JsonPreKeyStore implements PreKeyStore {
 
     }
 
-    public void addPreKeys(Map<Integer, byte[]> preKeys) {
+    private void addPreKeys(Map<Integer, byte[]> preKeys) {
         store.putAll(preKeys);
     }
 
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 87007d35..7f5c6b06 100644
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonSessionStore.java
+++ b/src/main/java/org/asamk/signal/storage/protocol/JsonSessionStore.java
@@ -2,7 +2,6 @@ package org.asamk.signal.storage.protocol;
 
 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.libsignal.SignalProtocolAddress;
 import org.whispersystems.libsignal.state.SessionRecord;
@@ -20,7 +19,7 @@ class JsonSessionStore implements SessionStore {
 
     }
 
-    public void addSessions(Map<SignalProtocolAddress, byte[]> sessions) {
+    private void addSessions(Map<SignalProtocolAddress, byte[]> sessions) {
         this.sessions.putAll(sessions);
     }
 
diff --git a/src/main/java/org/asamk/signal/storage/protocol/JsonSignalProtocolStore.java b/src/main/java/org/asamk/signal/storage/protocol/JsonSignalProtocolStore.java
index 12522432..6fcb052b 100644
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonSignalProtocolStore.java
+++ b/src/main/java/org/asamk/signal/storage/protocol/JsonSignalProtocolStore.java
@@ -21,22 +21,22 @@ public class JsonSignalProtocolStore implements SignalProtocolStore {
     @JsonProperty("preKeys")
     @JsonDeserialize(using = JsonPreKeyStore.JsonPreKeyStoreDeserializer.class)
     @JsonSerialize(using = JsonPreKeyStore.JsonPreKeyStoreSerializer.class)
-    protected JsonPreKeyStore preKeyStore;
+    private JsonPreKeyStore preKeyStore;
 
     @JsonProperty("sessionStore")
     @JsonDeserialize(using = JsonSessionStore.JsonSessionStoreDeserializer.class)
     @JsonSerialize(using = JsonSessionStore.JsonPreKeyStoreSerializer.class)
-    protected JsonSessionStore sessionStore;
+    private JsonSessionStore sessionStore;
 
     @JsonProperty("signedPreKeyStore")
     @JsonDeserialize(using = JsonSignedPreKeyStore.JsonSignedPreKeyStoreDeserializer.class)
     @JsonSerialize(using = JsonSignedPreKeyStore.JsonSignedPreKeyStoreSerializer.class)
-    protected JsonSignedPreKeyStore signedPreKeyStore;
+    private JsonSignedPreKeyStore signedPreKeyStore;
 
     @JsonProperty("identityKeyStore")
     @JsonDeserialize(using = JsonIdentityKeyStore.JsonIdentityKeyStoreDeserializer.class)
     @JsonSerialize(using = JsonIdentityKeyStore.JsonIdentityKeyStoreSerializer.class)
-    protected JsonIdentityKeyStore identityKeyStore;
+    private JsonIdentityKeyStore identityKeyStore;
 
     public JsonSignalProtocolStore() {
     }
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 defd7f93..c8f4c3cc 100644
--- a/src/main/java/org/asamk/signal/storage/protocol/JsonSignedPreKeyStore.java
+++ b/src/main/java/org/asamk/signal/storage/protocol/JsonSignedPreKeyStore.java
@@ -2,7 +2,6 @@ package org.asamk.signal.storage.protocol;
 
 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.libsignal.InvalidKeyIdException;
 import org.whispersystems.libsignal.state.SignedPreKeyRecord;
@@ -23,7 +22,7 @@ class JsonSignedPreKeyStore implements SignedPreKeyStore {
 
     }
 
-    public void addSignedPreKeys(Map<Integer, byte[]> preKeys) {
+    private void addSignedPreKeys(Map<Integer, byte[]> preKeys) {
         store.putAll(preKeys);
     }
 
diff --git a/src/main/java/org/asamk/signal/storage/threads/JsonThreadStore.java b/src/main/java/org/asamk/signal/storage/threads/JsonThreadStore.java
index a9ce6fb6..9ee613b8 100644
--- a/src/main/java/org/asamk/signal/storage/threads/JsonThreadStore.java
+++ b/src/main/java/org/asamk/signal/storage/threads/JsonThreadStore.java
@@ -34,7 +34,7 @@ public class JsonThreadStore {
         return new ArrayList<>(threads.values());
     }
 
-    public static class MapToListSerializer extends JsonSerializer<Map<?, ?>> {
+    private static class MapToListSerializer extends JsonSerializer<Map<?, ?>> {
 
         @Override
         public void serialize(final Map<?, ?> value, final JsonGenerator jgen, final SerializerProvider provider) throws IOException {
@@ -42,7 +42,7 @@ public class JsonThreadStore {
         }
     }
 
-    public static class ThreadsDeserializer extends JsonDeserializer<Map<String, ThreadInfo>> {
+    private static class ThreadsDeserializer extends JsonDeserializer<Map<String, ThreadInfo>> {
 
         @Override
         public Map<String, ThreadInfo> deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {