Skip to content

Commit

Permalink
Reformat files
Browse files Browse the repository at this point in the history
  • Loading branch information
@AsamK
AsamK committed Oct 26, 2024
1 parent 5a4f4ba commit 0a287b0
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 36 deletions.
34 changes: 17 additions & 17 deletions lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,16 @@ CREATE TABLE recipient (
uuid BLOB UNIQUE,
profile_key BLOB,
profile_key_credential BLOB,
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,
profile_last_update_timestamp INTEGER NOT NULL DEFAULT 0,
profile_given_name TEXT,
profile_family_name TEXT,
Expand Down Expand Up @@ -244,7 +244,7 @@ INSERT INTO identity2 (_id, uuid, identity_key, added_timestamp, trust_level)
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
Expand All @@ -254,7 +254,7 @@ INSERT INTO identity2 (_id, uuid, identity_key, added_timestamp, trust_level)
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,
Expand All @@ -270,7 +270,7 @@ INSERT INTO sender_key2 (_id, uuid, device_id, distribution_id, record, created_
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,
Expand All @@ -285,7 +285,7 @@ INSERT INTO sender_key_shared2 (_id, uuid, device_id, distribution_id, timestamp
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,
Expand Down Expand Up @@ -378,7 +378,7 @@ INSERT INTO identity2 (_id, address, identity_key, added_timestamp, trust_level)
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,
Expand All @@ -395,7 +395,7 @@ INSERT INTO message_send_log2 (_id, content_id, address, device_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,
Expand All @@ -411,7 +411,7 @@ INSERT INTO sender_key2 (_id, address, device_id, distribution_id, record, creat
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,
Expand All @@ -426,7 +426,7 @@ INSERT INTO sender_key_shared2 (_id, address, device_id, distribution_id, timest
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,
Expand All @@ -441,7 +441,7 @@ INSERT INTO session2 (_id, account_id_type, address, device_id, record)
WHERE address IS NOT NULL;
DROP TABLE session;
ALTER TABLE session2 RENAME TO session;
DROP TABLE tmp_mapping_table;
""");
}
Expand Down Expand Up @@ -531,20 +531,20 @@ CREATE TABLE recipient2 (
unregistered_timestamp INTEGER,
profile_key BLOB,
profile_key_credential BLOB,
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,
archived 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,
Expand All @@ -560,7 +560,7 @@ INSERT INTO recipient2 (_id, aci, pni, storage_id, storage_record, number, usern
FROM recipient r;
DROP TABLE recipient;
ALTER TABLE recipient2 RENAME TO recipient;
DROP TABLE tmp_mapping_table;
""");
}
Expand Down Expand Up @@ -592,7 +592,7 @@ INSERT INTO recipient2 (_id, aci, pni, storage_id, storage_record, number, usern
}
}
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;
Expand Down
6 changes: 3 additions & 3 deletions lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@ CREATE TABLE recipient (
profile_key BLOB,
profile_key_credential BLOB,
needs_pni_signature INTEGER NOT NULL DEFAULT FALSE,
given_name TEXT,
family_name TEXT,
nick_name TEXT,
nick_name_given_name 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,
Expand All @@ -86,7 +86,7 @@ CREATE TABLE recipient (
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,
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/asamk/signal/json/JsonEditMessage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
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));
}
}
12 changes: 3 additions & 9 deletions src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,10 @@ public static JsonMessageEnvelope from(
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 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,
Expand Down
8 changes: 2 additions & 6 deletions src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,7 @@ static JsonSyncDataMessage from(MessageEnvelope.Sync.Sent transcriptMessage, Man
.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));
}
}

0 comments on commit 0a287b0

Please sign in to comment.