From: AsamK <asamk@gmx.de>
Date: Mon, 23 May 2022 14:24:36 +0000 (+0200)
Subject: Update code style for text blocks
X-Git-Tag: v0.10.7~17
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/69e952738bd6300940ac3845792f052fe57eb58d

Update code style for text blocks
---

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 9cbd20b7..bb65b3e9 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -4,6 +4,7 @@
     <JavaCodeStyleSettings>
       <option name="GENERATE_FINAL_LOCALS" value="true" />
       <option name="GENERATE_FINAL_PARAMETERS" value="true" />
+      <option name="ALIGN_MULTILINE_TEXT_BLOCKS" value="true" />
       <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="50" />
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="50" />
       <option name="IMPORT_LAYOUT_TABLE">
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
index bb313c70..79fc28f0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
@@ -70,23 +70,23 @@ public class MessageSendLogStore implements AutoCloseable {
     public static void createSql(Connection connection) throws SQLException {
         try (final var statement = connection.createStatement()) {
             statement.executeUpdate("""
-                    CREATE TABLE message_send_log (
-                      _id INTEGER PRIMARY KEY,
-                      content_id INTEGER NOT NULL REFERENCES message_send_log_content (_id) ON DELETE CASCADE,
-                      recipient_id INTEGER NOT NULL,
-                      device_id INTEGER NOT NULL
-                    );
-                    CREATE TABLE message_send_log_content (
-                      _id INTEGER PRIMARY KEY,
-                      group_id BLOB,
-                      timestamp INTEGER NOT NULL,
-                      content BLOB NOT NULL,
-                      content_hint INTEGER NOT NULL
-                    );
-                    CREATE INDEX mslc_timestamp_index ON message_send_log_content (timestamp);
-                    CREATE INDEX msl_recipient_index ON message_send_log (recipient_id, device_id, content_id);
-                    CREATE INDEX msl_content_index ON message_send_log (content_id);
-                    """);
+                                    CREATE TABLE message_send_log (
+                                      _id INTEGER PRIMARY KEY,
+                                      content_id INTEGER NOT NULL REFERENCES message_send_log_content (_id) ON DELETE CASCADE,
+                                      recipient_id INTEGER NOT NULL,
+                                      device_id INTEGER NOT NULL
+                                    );
+                                    CREATE TABLE message_send_log_content (
+                                      _id INTEGER PRIMARY KEY,
+                                      group_id BLOB,
+                                      timestamp INTEGER NOT NULL,
+                                      content BLOB NOT NULL,
+                                      content_hint INTEGER NOT NULL
+                                    );
+                                    CREATE INDEX mslc_timestamp_index ON message_send_log_content (timestamp);
+                                    CREATE INDEX msl_recipient_index ON message_send_log (recipient_id, device_id, content_id);
+                                    CREATE INDEX msl_content_index ON message_send_log (content_id);
+                                    """);
         }
     }
 
diff --git a/src/main/java/org/asamk/signal/commands/RegisterCommand.java b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
index b2d3581e..4415bb18 100644
--- a/src/main/java/org/asamk/signal/commands/RegisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
@@ -69,10 +69,10 @@ public class RegisterCommand implements RegistrationCommand, JsonRpcRegistration
             String message;
             if (captcha == null) {
                 message = """
-                        Captcha required for verification, use --captcha CAPTCHA
-                        To get the token, go to https://signalcaptchas.org/registration/generate.html
-                        Check the developer tools (F12) console for a failed redirect to signalcaptcha://
-                        Everything after signalcaptcha:// is the captcha token.""";
+                          Captcha required for verification, use --captcha CAPTCHA
+                          To get the token, go to https://signalcaptchas.org/registration/generate.html
+                          Check the developer tools (F12) console for a failed redirect to signalcaptcha://
+                          Everything after signalcaptcha:// is the captcha token.""";
             } else {
                 message = "Invalid captcha given.";
             }
diff --git a/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java b/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
index a7739c23..cf2b282f 100644
--- a/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
+++ b/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
@@ -84,11 +84,11 @@ public class SendMessageResultUtils {
                             + (
                             failure.getOptions().contains(ProofRequiredException.Option.RECAPTCHA)
                                     ? """
-                                    To get the captcha token, go to https://signalcaptchas.org/challenge/generate.html
-                                    Check the developer tools (F12) console for a failed redirect to signalcaptcha://
-                                    Everything after signalcaptcha:// is the captcha token.
-                                    Use the following command to submit the captcha token:
-                                    signal-cli submitRateLimitChallenge --challenge CHALLENGE_TOKEN --captcha CAPTCHA_TOKEN"""
+                                      To get the captcha token, go to https://signalcaptchas.org/challenge/generate.html
+                                      Check the developer tools (F12) console for a failed redirect to signalcaptcha://
+                                      Everything after signalcaptcha:// is the captcha token.
+                                      Use the following command to submit the captcha token:
+                                      signal-cli submitRateLimitChallenge --challenge CHALLENGE_TOKEN --captcha CAPTCHA_TOKEN"""
                                     : ""
                     ),
                     identifier,