From: AsamK <asamk@gmx.de>
Date: Tue, 6 Oct 2015 19:45:39 +0000 (+0200)
Subject: Fix formatting
X-Git-Tag: v0.0.5~6
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/1781984221365b75d859e9feb81dcf79e7475e7d

Fix formatting
---

diff --git a/src/main/java/cli/JsonAxolotlStore.java b/src/main/java/cli/JsonAxolotlStore.java
index cfed0cd8..e7eb054c 100644
--- a/src/main/java/cli/JsonAxolotlStore.java
+++ b/src/main/java/cli/JsonAxolotlStore.java
@@ -3,13 +3,15 @@ package cli;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import org.whispersystems.libaxolotl.*;
+import org.whispersystems.libaxolotl.AxolotlAddress;
+import org.whispersystems.libaxolotl.IdentityKey;
+import org.whispersystems.libaxolotl.IdentityKeyPair;
+import org.whispersystems.libaxolotl.InvalidKeyIdException;
 import org.whispersystems.libaxolotl.state.AxolotlStore;
 import org.whispersystems.libaxolotl.state.PreKeyRecord;
 import org.whispersystems.libaxolotl.state.SessionRecord;
 import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
 
-import java.io.IOException;
 import java.util.List;
 
 class JsonAxolotlStore implements AxolotlStore {
diff --git a/src/main/java/cli/JsonIdentityKeyStore.java b/src/main/java/cli/JsonIdentityKeyStore.java
index 8577526d..e4d18b8f 100644
--- a/src/main/java/cli/JsonIdentityKeyStore.java
+++ b/src/main/java/cli/JsonIdentityKeyStore.java
@@ -69,7 +69,7 @@ class JsonIdentityKeyStore implements IdentityKeyStore {
                         String trustedKeyName = trustedKey.get("name").asText();
                         try {
                             trustedKeyMap.put(trustedKeyName, new IdentityKey(Base64.decode(trustedKey.get("identityKey").asText()), 0));
-                        }  catch (InvalidKeyException | IOException e) {
+                        } catch (InvalidKeyException | IOException e) {
                             System.out.println(String.format("Error while decoding key for: %s", trustedKeyName));
                         }
                     }
diff --git a/src/main/java/cli/JsonPreKeyStore.java b/src/main/java/cli/JsonPreKeyStore.java
index 1ae297ec..393f1805 100644
--- a/src/main/java/cli/JsonPreKeyStore.java
+++ b/src/main/java/cli/JsonPreKeyStore.java
@@ -66,7 +66,7 @@ class JsonPreKeyStore implements PreKeyStore {
                     Integer preKeyId = preKey.get("id").asInt();
                     try {
                         preKeyMap.put(preKeyId, Base64.decode(preKey.get("record").asText()));
-                    }  catch (IOException e) {
+                    } catch (IOException e) {
                         System.out.println(String.format("Error while decoding prekey for: %s", preKeyId));
                     }
                 }
diff --git a/src/main/java/cli/JsonSessionStore.java b/src/main/java/cli/JsonSessionStore.java
index c70fa5cf..3cb78945 100644
--- a/src/main/java/cli/JsonSessionStore.java
+++ b/src/main/java/cli/JsonSessionStore.java
@@ -87,7 +87,7 @@ class JsonSessionStore implements SessionStore {
                     String sessionName = session.get("name").asText();
                     try {
                         sessionMap.put(new AxolotlAddress(sessionName, session.get("deviceId").asInt()), Base64.decode(session.get("record").asText()));
-                    }  catch (IOException e) {
+                    } catch (IOException e) {
                         System.out.println(String.format("Error while decoding session for: %s", sessionName));
                     }
                 }
diff --git a/src/main/java/cli/JsonSignedPreKeyStore.java b/src/main/java/cli/JsonSignedPreKeyStore.java
index 9b48fa97..4dc0cad3 100644
--- a/src/main/java/cli/JsonSignedPreKeyStore.java
+++ b/src/main/java/cli/JsonSignedPreKeyStore.java
@@ -83,7 +83,7 @@ class JsonSignedPreKeyStore implements SignedPreKeyStore {
                     Integer preKeyId = preKey.get("id").asInt();
                     try {
                         preKeyMap.put(preKeyId, Base64.decode(preKey.get("record").asText()));
-                    }  catch (IOException e) {
+                    } catch (IOException e) {
                         System.out.println(String.format("Error while decoding prekey for: %s", preKeyId));
                     }
                 }
diff --git a/src/main/java/cli/Manager.java b/src/main/java/cli/Manager.java
index 4d8c733f..7ca2c123 100644
--- a/src/main/java/cli/Manager.java
+++ b/src/main/java/cli/Manager.java
@@ -56,8 +56,8 @@ class Manager {
     private final static String URL = "https://textsecure-service.whispersystems.org";
     private final static TrustStore TRUST_STORE = new WhisperTrustStore();
 
-    public final static String PROJECT_NAME =  Manager.class.getPackage().getImplementationTitle();
-    public final static String PROJECT_VERSION =  Manager.class.getPackage().getImplementationVersion();
+    public final static String PROJECT_NAME = Manager.class.getPackage().getImplementationTitle();
+    public final static String PROJECT_VERSION = Manager.class.getPackage().getImplementationVersion();
     private final static String USER_AGENT = PROJECT_NAME + " " + PROJECT_VERSION;
 
     private final static String settingsPath = System.getProperty("user.home") + "/.config/textsecure";