From: AsamK Date: Fri, 7 Aug 2015 11:22:15 +0000 (+0200) Subject: Fix coding issues X-Git-Tag: v0.0.3^0 X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/9e1cd7e3988aff9db1ac72ec5f597dc9a6c0579a Fix coding issues --- diff --git a/src/main/java/cli/JsonAxolotlStore.java b/src/main/java/cli/JsonAxolotlStore.java index d260b6b0..02b9cdf1 100644 --- a/src/main/java/cli/JsonAxolotlStore.java +++ b/src/main/java/cli/JsonAxolotlStore.java @@ -10,7 +10,7 @@ import org.whispersystems.libaxolotl.state.SignedPreKeyRecord; import java.io.IOException; import java.util.List; -public class JsonAxolotlStore implements AxolotlStore { +class JsonAxolotlStore implements AxolotlStore { private final JsonPreKeyStore preKeyStore; private final JsonSessionStore sessionStore; private final JsonSignedPreKeyStore signedPreKeyStore; diff --git a/src/main/java/cli/JsonIdentityKeyStore.java b/src/main/java/cli/JsonIdentityKeyStore.java index 75e6ba06..827bf055 100644 --- a/src/main/java/cli/JsonIdentityKeyStore.java +++ b/src/main/java/cli/JsonIdentityKeyStore.java @@ -11,7 +11,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -public class JsonIdentityKeyStore implements IdentityKeyStore { +class JsonIdentityKeyStore implements IdentityKeyStore { private final Map trustedKeys = new HashMap<>(); diff --git a/src/main/java/cli/JsonPreKeyStore.java b/src/main/java/cli/JsonPreKeyStore.java index 63e7ea77..a0133ec8 100644 --- a/src/main/java/cli/JsonPreKeyStore.java +++ b/src/main/java/cli/JsonPreKeyStore.java @@ -10,7 +10,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -public class JsonPreKeyStore implements PreKeyStore { +class JsonPreKeyStore implements PreKeyStore { private final Map store = new HashMap<>(); @@ -18,7 +18,7 @@ public class JsonPreKeyStore implements PreKeyStore { } - public JsonPreKeyStore(JSONArray list) throws IOException { + public JsonPreKeyStore(JSONArray list) { for (int i = 0; i < list.length(); i++) { JSONObject k = list.getJSONObject(i); try { diff --git a/src/main/java/cli/JsonSessionStore.java b/src/main/java/cli/JsonSessionStore.java index c034fc2c..d2fe0a4a 100644 --- a/src/main/java/cli/JsonSessionStore.java +++ b/src/main/java/cli/JsonSessionStore.java @@ -9,15 +9,15 @@ import org.whispersystems.libaxolotl.state.SessionStore; import java.io.IOException; import java.util.*; -public class JsonSessionStore implements SessionStore { +class JsonSessionStore implements SessionStore { - private Map sessions = new HashMap<>(); + private final Map sessions = new HashMap<>(); public JsonSessionStore() { } - public JsonSessionStore(JSONArray list) throws IOException { + public JsonSessionStore(JSONArray list) { for (int i = 0; i < list.length(); i++) { JSONObject k = list.getJSONObject(i); try { diff --git a/src/main/java/cli/JsonSignedPreKeyStore.java b/src/main/java/cli/JsonSignedPreKeyStore.java index 5b24c8dc..f992d2d6 100644 --- a/src/main/java/cli/JsonSignedPreKeyStore.java +++ b/src/main/java/cli/JsonSignedPreKeyStore.java @@ -12,7 +12,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -public class JsonSignedPreKeyStore implements SignedPreKeyStore { +class JsonSignedPreKeyStore implements SignedPreKeyStore { private final Map store = new HashMap<>(); @@ -20,7 +20,7 @@ public class JsonSignedPreKeyStore implements SignedPreKeyStore { } - public JsonSignedPreKeyStore(JSONArray list) throws IOException { + public JsonSignedPreKeyStore(JSONArray list) { for (int i = 0; i < list.length(); i++) { JSONObject k = list.getJSONObject(i); try { diff --git a/src/main/java/cli/Main.java b/src/main/java/cli/Main.java index cc749591..319ca42a 100644 --- a/src/main/java/cli/Main.java +++ b/src/main/java/cli/Main.java @@ -232,7 +232,7 @@ public class Main { } private static class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { - Manager m; + final Manager m; public ReceiveMessageHandler(Manager m) { this.m = m; diff --git a/src/main/java/cli/Manager.java b/src/main/java/cli/Manager.java index 49043832..5650921d 100644 --- a/src/main/java/cli/Manager.java +++ b/src/main/java/cli/Manager.java @@ -47,7 +47,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -public class Manager { +class Manager { private final static String URL = "https://textsecure-service.whispersystems.org"; private final static TrustStore TRUST_STORE = new WhisperTrustStore(); @@ -64,7 +64,7 @@ public class Manager { private boolean registered = false; private JsonAxolotlStore axolotlStore; - TextSecureAccountManager accountManager; + private TextSecureAccountManager accountManager; public Manager(String username) { this.username = username; @@ -77,10 +77,7 @@ public class Manager { public boolean userExists() { File f = new File(getFileName()); - if (!f.exists() || f.isDirectory()) { - return false; - } - return true; + return !(!f.exists() || f.isDirectory()); } public boolean userHasKeys() { @@ -124,7 +121,6 @@ public class Manager { writer.close(); } catch (Exception e) { System.out.println("Saving file error: " + e.getMessage()); - return; } } @@ -300,12 +296,12 @@ public class Manager { return outputFile; } - public String canonicalizeNumber(String number) throws InvalidNumberException { + private String canonicalizeNumber(String number) throws InvalidNumberException { String localNumber = username; return PhoneNumberFormatter.formatNumber(number, localNumber); } - protected TextSecureAddress getPushAddress(String number) throws InvalidNumberException { + TextSecureAddress getPushAddress(String number) throws InvalidNumberException { String e164number = canonicalizeNumber(number); return new TextSecureAddress(e164number); } diff --git a/src/main/java/cli/Util.java b/src/main/java/cli/Util.java index 36921de2..907c4ed1 100644 --- a/src/main/java/cli/Util.java +++ b/src/main/java/cli/Util.java @@ -3,19 +3,19 @@ package cli; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; -public class Util { +class Util { public static String getSecret(int size) { byte[] secret = getSecretBytes(size); return Base64.encodeBytes(secret); } - public static byte[] getSecretBytes(int size) { + private static byte[] getSecretBytes(int size) { byte[] secret = new byte[size]; getSecureRandom().nextBytes(secret); return secret; } - public static SecureRandom getSecureRandom() { + private static SecureRandom getSecureRandom() { try { return SecureRandom.getInstance("SHA1PRNG"); } catch (NoSuchAlgorithmException e) { diff --git a/src/main/java/cli/WhisperTrustStore.java b/src/main/java/cli/WhisperTrustStore.java index 621b43e9..08519653 100644 --- a/src/main/java/cli/WhisperTrustStore.java +++ b/src/main/java/cli/WhisperTrustStore.java @@ -4,7 +4,7 @@ import org.whispersystems.textsecure.api.push.TrustStore; import java.io.InputStream; -public class WhisperTrustStore implements TrustStore { +class WhisperTrustStore implements TrustStore { @Override public InputStream getKeyStoreInputStream() {