webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 10:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Workaround issue with invalid address in recipient store

Browse source
This commit is contained in:
AsamK 2024-11-23 23:20:45 +01:00
parent ff6cb5262a
commit 6a5ea5fc01
3 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/src/main/java/org/asamk/signal/manager/storage/recipients/InvalidAddress.java Normal file
View file

@ -0,0 +1,8 @@
package org.asamk.signal.manager.storage.recipients;
public class InvalidAddress extends AssertionError {
InvalidAddress(String message) {
super(message);
}
}

2
lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientAddress.java
View file

@ -27,7 +27,7 @@ public record RecipientAddress(
pni = Optional.empty();
}
if (aci.isEmpty() && pni.isEmpty() && number.isEmpty() && username.isEmpty()) {
throw new AssertionError("Must have either a ServiceId, username or E164 number!");
throw new InvalidAddress("Must have either a ServiceId, username or E164 number!");
}
}

17
lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
View file

@ -339,7 +339,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
"""
SELECT r._id, r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.expiration_time_version, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp
FROM %s r
WHERE (r.number IS NOT NULL OR r.aci IS NOT NULL) AND %s AND r.hidden = FALSE
WHERE (r.number IS NOT NULL OR r.pni IS NOT NULL OR r.aci IS NOT NULL) AND %s AND r.hidden = FALSE
"""
).formatted(TABLE_RECIPIENT, SQL_IS_CONTACT);
try (final var connection = database.getConnection()) {
@ -392,6 +392,15 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
try (final var statement = connection.prepareStatement(sql)) {
statement.setBytes(1, storageId.getRaw());
return Utils.executeQuerySingleRow(statement, this::getRecipientFromResultSet);
} catch (InvalidAddress e) {
try (final var statement = connection.prepareStatement("""
UPDATE %s SET aci=NULL, pni=NULL, username=NULL, number=NULL, storage_id=NULL WHERE storage_id = ?
""".formatted(TABLE_RECIPIENT))) {
statement.setBytes(1, storageId.getRaw());
statement.executeUpdate();
}
connection.commit();
throw e;
}
}
@ -426,7 +435,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
r.discoverable,
r.storage_record
FROM %s r
WHERE (r.number IS NOT NULL OR r.aci IS NOT NULL) AND %s
WHERE (r.number IS NOT NULL OR r.pni IS NOT NULL OR r.aci IS NOT NULL) AND %s
"""
).formatted(TABLE_RECIPIENT, sqlWhere.isEmpty() ? "TRUE" : String.join(" AND ", sqlWhere));
final var selfAddress = selfAddressProvider.getSelfAddress();
@ -512,7 +521,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
"""
SELECT r._id
FROM %s r
WHERE (r.number IS NOT NULL OR r.aci IS NOT NULL)
WHERE (r.aci IS NOT NULL OR r.pni IS NOT NULL)
"""
).formatted(TABLE_RECIPIENT);
try (final var statement = connection.prepareStatement(sql)) {
@ -525,7 +534,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
"""
SELECT r._id
FROM %s r
WHERE r.storage_id IS NULL AND r.unregistered_timestamp IS NULL
WHERE r.storage_id IS NULL AND r.unregistered_timestamp IS NULL AND (r.aci IS NOT NULL OR r.pni IS NOT NULL)
"""
).formatted(TABLE_RECIPIENT);
final var updateSql = (