Reformat files

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index be9e7af183a225ea877cf24b77928f5c0ea8032a..63ba5a373acc20df7c7a89d9efe5b0c329b7ecbd 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -73,16 +73,16 @@ public class AccountDatabase extends Database {
                                           uuid BLOB UNIQUE,
                                           profile_key BLOB,
                                           profile_key_credential BLOB,
                                           uuid BLOB UNIQUE,
                                           profile_key BLOB,
                                           profile_key_credential BLOB,

-
+                                        

                                           given_name TEXT,
                                           family_name TEXT,
                                           color TEXT,
                                           given_name TEXT,
                                           family_name TEXT,
                                           color TEXT,

-
+                                        

                                           expiration_time INTEGER NOT NULL DEFAULT 0,
                                           blocked INTEGER NOT NULL DEFAULT FALSE,
                                           archived INTEGER NOT NULL DEFAULT FALSE,
                                           profile_sharing INTEGER NOT NULL DEFAULT FALSE,
                                           expiration_time INTEGER NOT NULL DEFAULT 0,
                                           blocked INTEGER NOT NULL DEFAULT FALSE,
                                           archived INTEGER NOT NULL DEFAULT FALSE,
                                           profile_sharing INTEGER NOT NULL DEFAULT FALSE,

-
+                                        

                                           profile_last_update_timestamp INTEGER NOT NULL DEFAULT 0,
                                           profile_given_name TEXT,
                                           profile_family_name TEXT,
                                           profile_last_update_timestamp INTEGER NOT NULL DEFAULT 0,
                                           profile_given_name TEXT,
                                           profile_family_name TEXT,


@@ -244,7 +244,7 @@ public class AccountDatabase extends Database {
                                           WHERE uuid IS NOT NULL;
                                         DROP TABLE identity;
                                         ALTER TABLE identity2 RENAME TO identity;
                                           WHERE uuid IS NOT NULL;
                                         DROP TABLE identity;
                                         ALTER TABLE identity2 RENAME TO identity;

-
+                                        

                                         DROP INDEX msl_recipient_index;
                                         ALTER TABLE message_send_log ADD COLUMN uuid BLOB;
                                         UPDATE message_send_log
                                         DROP INDEX msl_recipient_index;
                                         ALTER TABLE message_send_log ADD COLUMN uuid BLOB;
                                         UPDATE message_send_log


@@ -254,7 +254,7 @@ public class AccountDatabase extends Database {
                                         DELETE FROM message_send_log WHERE uuid IS NULL;
                                         ALTER TABLE message_send_log DROP COLUMN recipient_id;
                                         CREATE INDEX msl_recipient_index ON message_send_log (uuid, device_id, content_id);
                                         DELETE FROM message_send_log WHERE uuid IS NULL;
                                         ALTER TABLE message_send_log DROP COLUMN recipient_id;
                                         CREATE INDEX msl_recipient_index ON message_send_log (uuid, device_id, content_id);

-
+                                        

                                         CREATE TABLE sender_key2 (
                                           _id INTEGER PRIMARY KEY,
                                           uuid BLOB NOT NULL,
                                         CREATE TABLE sender_key2 (
                                           _id INTEGER PRIMARY KEY,
                                           uuid BLOB NOT NULL,


@@ -270,7 +270,7 @@ public class AccountDatabase extends Database {
                                           WHERE uuid IS NOT NULL;
                                         DROP TABLE sender_key;
                                         ALTER TABLE sender_key2 RENAME TO sender_key;
                                           WHERE uuid IS NOT NULL;
                                         DROP TABLE sender_key;
                                         ALTER TABLE sender_key2 RENAME TO sender_key;

-
+                                        

                                         CREATE TABLE sender_key_shared2 (
                                           _id INTEGER PRIMARY KEY,
                                           uuid BLOB NOT NULL,
                                         CREATE TABLE sender_key_shared2 (
                                           _id INTEGER PRIMARY KEY,
                                           uuid BLOB NOT NULL,


@@ -285,7 +285,7 @@ public class AccountDatabase extends Database {
                                           WHERE uuid IS NOT NULL;
                                         DROP TABLE sender_key_shared;
                                         ALTER TABLE sender_key_shared2 RENAME TO sender_key_shared;
                                           WHERE uuid IS NOT NULL;
                                         DROP TABLE sender_key_shared;
                                         ALTER TABLE sender_key_shared2 RENAME TO sender_key_shared;

-
+                                        

                                         CREATE TABLE session2 (
                                           _id INTEGER PRIMARY KEY,
                                           account_id_type INTEGER NOT NULL,
                                         CREATE TABLE session2 (
                                           _id INTEGER PRIMARY KEY,
                                           account_id_type INTEGER NOT NULL,


@@ -378,7 +378,7 @@ public class AccountDatabase extends Database {
                                           WHERE address IS NOT NULL;
                                         DROP TABLE identity;
                                         ALTER TABLE identity2 RENAME TO identity;
                                           WHERE address IS NOT NULL;
                                         DROP TABLE identity;
                                         ALTER TABLE identity2 RENAME TO identity;

-
+                                        

                                         CREATE TABLE message_send_log2 (
                                           _id INTEGER PRIMARY KEY,
                                           content_id INTEGER NOT NULL REFERENCES message_send_log_content (_id) ON DELETE CASCADE,
                                         CREATE TABLE message_send_log2 (
                                           _id INTEGER PRIMARY KEY,
                                           content_id INTEGER NOT NULL REFERENCES message_send_log_content (_id) ON DELETE CASCADE,


@@ -395,7 +395,7 @@ public class AccountDatabase extends Database {
                                         ALTER TABLE message_send_log2 RENAME TO message_send_log;
                                         CREATE INDEX msl_recipient_index ON message_send_log (address, device_id, content_id);
                                         CREATE INDEX msl_content_index ON message_send_log (content_id);
                                         ALTER TABLE message_send_log2 RENAME TO message_send_log;
                                         CREATE INDEX msl_recipient_index ON message_send_log (address, device_id, content_id);
                                         CREATE INDEX msl_content_index ON message_send_log (content_id);

-
+                                        

                                         CREATE TABLE sender_key2 (
                                           _id INTEGER PRIMARY KEY,
                                           address TEXT NOT NULL,
                                         CREATE TABLE sender_key2 (
                                           _id INTEGER PRIMARY KEY,
                                           address TEXT NOT NULL,


@@ -411,7 +411,7 @@ public class AccountDatabase extends Database {
                                           WHERE address IS NOT NULL;
                                         DROP TABLE sender_key;
                                         ALTER TABLE sender_key2 RENAME TO sender_key;
                                           WHERE address IS NOT NULL;
                                         DROP TABLE sender_key;
                                         ALTER TABLE sender_key2 RENAME TO sender_key;

-
+                                        

                                         CREATE TABLE sender_key_shared2 (
                                           _id INTEGER PRIMARY KEY,
                                           address TEXT NOT NULL,
                                         CREATE TABLE sender_key_shared2 (
                                           _id INTEGER PRIMARY KEY,
                                           address TEXT NOT NULL,


@@ -426,7 +426,7 @@ public class AccountDatabase extends Database {
                                           WHERE address IS NOT NULL;
                                         DROP TABLE sender_key_shared;
                                         ALTER TABLE sender_key_shared2 RENAME TO sender_key_shared;
                                           WHERE address IS NOT NULL;
                                         DROP TABLE sender_key_shared;
                                         ALTER TABLE sender_key_shared2 RENAME TO sender_key_shared;

-
+                                        

                                         CREATE TABLE session2 (
                                           _id INTEGER PRIMARY KEY,
                                           account_id_type INTEGER NOT NULL,
                                         CREATE TABLE session2 (
                                           _id INTEGER PRIMARY KEY,
                                           account_id_type INTEGER NOT NULL,


@@ -441,7 +441,7 @@ public class AccountDatabase extends Database {
                                           WHERE address IS NOT NULL;
                                         DROP TABLE session;
                                         ALTER TABLE session2 RENAME TO session;
                                           WHERE address IS NOT NULL;
                                         DROP TABLE session;
                                         ALTER TABLE session2 RENAME TO session;

-
+                                        

                                         DROP TABLE tmp_mapping_table;
                                         """);
             }
                                         DROP TABLE tmp_mapping_table;
                                         """);
             }


@@ -531,12 +531,12 @@ public class AccountDatabase extends Database {
                                           unregistered_timestamp INTEGER,
                                           profile_key BLOB,
                                           profile_key_credential BLOB,
                                           unregistered_timestamp INTEGER,
                                           profile_key BLOB,
                                           profile_key_credential BLOB,

-
+                                        

                                           given_name TEXT,
                                           family_name TEXT,
                                           nick_name TEXT,
                                           color TEXT,
                                           given_name TEXT,
                                           family_name TEXT,
                                           nick_name TEXT,
                                           color TEXT,

-
+                                        

                                           expiration_time INTEGER NOT NULL DEFAULT 0,
                                           mute_until INTEGER NOT NULL DEFAULT 0,
                                           blocked INTEGER NOT NULL DEFAULT FALSE,
                                           expiration_time INTEGER NOT NULL DEFAULT 0,
                                           mute_until INTEGER NOT NULL DEFAULT 0,
                                           blocked INTEGER NOT NULL DEFAULT FALSE,


@@ -544,7 +544,7 @@ public class AccountDatabase extends Database {
                                           profile_sharing INTEGER NOT NULL DEFAULT FALSE,
                                           hide_story INTEGER NOT NULL DEFAULT FALSE,
                                           hidden INTEGER NOT NULL DEFAULT FALSE,
                                           profile_sharing INTEGER NOT NULL DEFAULT FALSE,
                                           hide_story INTEGER NOT NULL DEFAULT FALSE,
                                           hidden INTEGER NOT NULL DEFAULT FALSE,

-
+                                        

                                           profile_last_update_timestamp INTEGER NOT NULL DEFAULT 0,
                                           profile_given_name TEXT,
                                           profile_family_name TEXT,
                                           profile_last_update_timestamp INTEGER NOT NULL DEFAULT 0,
                                           profile_given_name TEXT,
                                           profile_family_name TEXT,


@@ -560,7 +560,7 @@ public class AccountDatabase extends Database {
                                           FROM recipient r;
                                         DROP TABLE recipient;
                                         ALTER TABLE recipient2 RENAME TO recipient;
                                           FROM recipient r;
                                         DROP TABLE recipient;
                                         ALTER TABLE recipient2 RENAME TO recipient;

-
+                                        

                                         DROP TABLE tmp_mapping_table;
                                         """);
             }
                                         DROP TABLE tmp_mapping_table;
                                         """);
             }


@@ -592,7 +592,7 @@ public class AccountDatabase extends Database {
             }
         }
         if (oldVersion < 26) {
             }
         }
         if (oldVersion < 26) {

-            logger.debug("Updating database: Create discoverabel and profile_phone_number_sharing columns");
+            logger.debug("Updating database: Create discoverable and profile_phone_number_sharing columns");

             try (final var statement = connection.createStatement()) {
                 statement.executeUpdate("""
                                         ALTER TABLE recipient ADD discoverable INTEGER;
             try (final var statement = connection.createStatement()) {
                 statement.executeUpdate("""
                                         ALTER TABLE recipient ADD discoverable INTEGER;

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 54383eb0b92e042d74ad9645e57f2bd210489805..2aad97d6447c77b60fbca8201185a458628201d4 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -69,7 +69,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                                       profile_key BLOB,
                                       profile_key_credential BLOB,
                                       needs_pni_signature INTEGER NOT NULL DEFAULT FALSE,
                                       profile_key BLOB,
                                       profile_key_credential BLOB,
                                       needs_pni_signature INTEGER NOT NULL DEFAULT FALSE,

-
+                                    

                                       given_name TEXT,
                                       family_name TEXT,
                                       nick_name TEXT,
                                       given_name TEXT,
                                       family_name TEXT,
                                       nick_name TEXT,


@@ -77,7 +77,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                                       nick_name_family_name TEXT,
                                       note TEXT,
                                       color TEXT,
                                       nick_name_family_name TEXT,
                                       note TEXT,
                                       color TEXT,

-
+                                    

                                       expiration_time INTEGER NOT NULL DEFAULT 0,
                                       expiration_time_version INTEGER DEFAULT 1 NOT NULL,
                                       mute_until INTEGER NOT NULL DEFAULT 0,
                                       expiration_time INTEGER NOT NULL DEFAULT 0,
                                       expiration_time_version INTEGER DEFAULT 1 NOT NULL,
                                       mute_until INTEGER NOT NULL DEFAULT 0,


@@ -86,7 +86,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                                       profile_sharing INTEGER NOT NULL DEFAULT FALSE,
                                       hide_story INTEGER NOT NULL DEFAULT FALSE,
                                       hidden INTEGER NOT NULL DEFAULT FALSE,
                                       profile_sharing INTEGER NOT NULL DEFAULT FALSE,
                                       hide_story INTEGER NOT NULL DEFAULT FALSE,
                                       hidden INTEGER NOT NULL DEFAULT FALSE,

-
+                                    

                                       profile_last_update_timestamp INTEGER NOT NULL DEFAULT 0,
                                       profile_given_name TEXT,
                                       profile_family_name TEXT,
                                       profile_last_update_timestamp INTEGER NOT NULL DEFAULT 0,
                                       profile_given_name TEXT,
                                       profile_family_name TEXT,

diff --git a/src/main/java/org/asamk/signal/json/JsonEditMessage.java b/src/main/java/org/asamk/signal/json/JsonEditMessage.java
index 6b17344b86296a1ef57cc73c3cde3b014c095346..ef61e3435524945acf2fcd5b78cec63d87379b70 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonEditMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonEditMessage.java
@@ -6,6 +6,7 @@ import org.asamk.signal.manager.api.MessageEnvelope;
 record JsonEditMessage(long targetSentTimestamp, JsonDataMessage dataMessage) {
 
     static JsonEditMessage from(MessageEnvelope.Edit editMessage, Manager m) {
 record JsonEditMessage(long targetSentTimestamp, JsonDataMessage dataMessage) {
 
     static JsonEditMessage from(MessageEnvelope.Edit editMessage, Manager m) {

-        return new JsonEditMessage(editMessage.targetSentTimestamp(), JsonDataMessage.from(editMessage.dataMessage(), m));
+        return new JsonEditMessage(editMessage.targetSentTimestamp(),
+                JsonDataMessage.from(editMessage.dataMessage(), m));

     }
 }
     }
 }

diff --git a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
index f4f06927b62eaca4fc3cee6c8b9dc8813a37ae22..7ba4b307cf3ef999d04aa9a62f7ca346745c97aa 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
@@ -65,16 +65,10 @@ public record JsonMessageEnvelope(
         final var receiptMessage = envelope.receipt().map(JsonReceiptMessage::from).orElse(null);
         final var typingMessage = envelope.typing().map(JsonTypingMessage::from).orElse(null);
 
         final var receiptMessage = envelope.receipt().map(JsonReceiptMessage::from).orElse(null);
         final var typingMessage = envelope.typing().map(JsonTypingMessage::from).orElse(null);
 

-        final var dataMessage = envelope.data()
-            .map(data -> JsonDataMessage.from(data, m))
-            .orElse(null);
-        final var editMessage = envelope.edit()
-            .map(data -> JsonEditMessage.from(data, m))
-            .orElse(null);
+        final var dataMessage = envelope.data().map(data -> JsonDataMessage.from(data, m)).orElse(null);
+        final var editMessage = envelope.edit().map(data -> JsonEditMessage.from(data, m)).orElse(null);

         final var storyMessage = envelope.story().map(JsonStoryMessage::from).orElse(null);
         final var storyMessage = envelope.story().map(JsonStoryMessage::from).orElse(null);

-        final var syncMessage = envelope.sync()
-            .map(data -> JsonSyncMessage.from(data, m))
-            .orElse(null);
+        final var syncMessage = envelope.sync().map(data -> JsonSyncMessage.from(data, m)).orElse(null);

         final var callMessage = envelope.call().map(JsonCallMessage::from).orElse(null);
 
         return new JsonMessageEnvelope(source,
         final var callMessage = envelope.call().map(JsonCallMessage::from).orElse(null);
 
         return new JsonMessageEnvelope(source,

diff --git a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
index 391181b03aac4bee7789193598ced55191a08271..4c2cd6abe1ce4194f1ea7d13349a3afa876805ea 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
@@ -23,11 +23,7 @@ record JsonSyncDataMessage(
                 .orElse(null),
                 transcriptMessage.destination().flatMap(RecipientAddress::number).orElse(null),
                 transcriptMessage.destination().flatMap(address -> address.uuid().map(UUID::toString)).orElse(null),
                 .orElse(null),
                 transcriptMessage.destination().flatMap(RecipientAddress::number).orElse(null),
                 transcriptMessage.destination().flatMap(address -> address.uuid().map(UUID::toString)).orElse(null),

-                transcriptMessage.editMessage()
-                    .map(data -> JsonEditMessage.from(data, m))
-                    .orElse(null),
-                transcriptMessage.message()
-                    .map(data -> JsonDataMessage.from(data, m))
-                    .orElse(null));
+                transcriptMessage.editMessage().map(data -> JsonEditMessage.from(data, m)).orElse(null),
+                transcriptMessage.message().map(data -> JsonDataMessage.from(data, m)).orElse(null));

     }
 }
     }
 }