From 7ade7667d05f239eff6c40c80b85308e1cb6c87e Mon Sep 17 00:00:00 2001
From: vanitasvitae <vanitasvitae@fsfe.org>
Date: Thu, 17 Aug 2017 22:48:51 +0200
Subject: [PATCH] Update help texts

---
 .../java/de/vanitasvitae/sync_client/Client.java     |  2 +-
 src/main/java/de/vanitasvitae/sync_client/Main.java  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/de/vanitasvitae/sync_client/Client.java b/src/main/java/de/vanitasvitae/sync_client/Client.java
index b6778a8..9c7d3a3 100644
--- a/src/main/java/de/vanitasvitae/sync_client/Client.java
+++ b/src/main/java/de/vanitasvitae/sync_client/Client.java
@@ -72,9 +72,9 @@ public class Client {
 
     public void login() throws InterruptedException, IOException, SmackException, XMPPException, CorruptedOmemoKeyException {
         ((XMPPTCPConnection) connection).connect().login();
+        connection.setReplyTimeout(30000);
         OmemoManager omemoManager = OmemoManager.getInstanceFor(connection);
         omemoManager.initialize();
-        connection.setReplyTimeout(10000);
         JetManager.getInstanceFor(connection).registerEncryptionMethod(OmemoManager.getInstanceFor(connection));
         JetManager.registerEncryptionMethodProvider(OmemoConstants.OMEMO_NAMESPACE_V_AXOLOTL, new OmemoVAxolotlProvider());
     }
diff --git a/src/main/java/de/vanitasvitae/sync_client/Main.java b/src/main/java/de/vanitasvitae/sync_client/Main.java
index 492382f..6e2f28e 100644
--- a/src/main/java/de/vanitasvitae/sync_client/Main.java
+++ b/src/main/java/de/vanitasvitae/sync_client/Main.java
@@ -41,12 +41,12 @@ public class Main {
 
     private static Options prepareOptions() {
         Options options = new Options();
-        Option username = Option.builder("u").longOpt("username").required().argName("user@server.tld").hasArg().desc("Barejid of the XMPP account").build();
-        Option password = Option.builder("p").longOpt("password").required().argName("swordfish").hasArg().desc("Password of the XMPP account").build();
-        Option debug = Option.builder("d").longOpt("debug").desc("Start in debug mode").build();
-        Option directory = Option.builder("D").longOpt("directory").hasArg().required().desc("Directory to sync").build();
-        Option master = Option.builder("m").longOpt("master").desc("Start in master mode").build();
-        Option help = Option.builder("h").longOpt("help").desc("Display this help text").build();
+        Option username = Option.builder("u").longOpt("username").required().argName("user@server.tld").hasArg().desc("Barejid of the XMPP account.").build();
+        Option password = Option.builder("p").longOpt("password").required().argName("swordfish").hasArg().desc("Password of the XMPP account.").build();
+        Option debug = Option.builder("d").longOpt("debug").desc("Print debug messages to the console.").build();
+        Option directory = Option.builder("D").longOpt("directory").hasArg().required().desc("Directory which will be synced.").build();
+        Option master = Option.builder("m").longOpt("master").desc("Start in master mode. When this flag is missing, the client will be started in slave mode.").build();
+        Option help = Option.builder("h").longOpt("help").desc("Display this help text.").build();
         options.addOption(username);
         options.addOption(password);
         options.addOption(debug);