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

Add RecipientIdCreator for creating recipientIds from the database

Browse source
This commit is contained in:
AsamK 2022-06-09 21:36:28 +02:00
parent 7da2e1b262
commit 46adc1af98
3 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
View file

@ -32,6 +32,7 @@ import org.asamk.signal.manager.storage.recipients.LegacyRecipientStore2;
import org.asamk.signal.manager.storage.recipients.Profile; import org.asamk.signal.manager.storage.recipients.Profile;
import org.asamk.signal.manager.storage.recipients.RecipientAddress; import org.asamk.signal.manager.storage.recipients.RecipientAddress;
import org.asamk.signal.manager.storage.recipients.RecipientId; import org.asamk.signal.manager.storage.recipients.RecipientId;
import org.asamk.signal.manager.storage.recipients.RecipientIdCreator;
import org.asamk.signal.manager.storage.recipients.RecipientResolver; import org.asamk.signal.manager.storage.recipients.RecipientResolver;
import org.asamk.signal.manager.storage.recipients.RecipientStore; import org.asamk.signal.manager.storage.recipients.RecipientStore;
import org.asamk.signal.manager.storage.recipients.RecipientTrustedResolver; import org.asamk.signal.manager.storage.recipients.RecipientTrustedResolver;
@ -1117,6 +1118,10 @@ public class SignalAccount implements Closeable {
return getRecipientStore(); return getRecipientStore();
} }
private RecipientIdCreator getRecipientIdCreator() {
return recipientId -> getRecipientStore().create(recipientId);
}
public RecipientResolver getRecipientResolver() { public RecipientResolver getRecipientResolver() {
return new RecipientResolver() { return new RecipientResolver() {
@Override @Override

6
lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientIdCreator.java Normal file
View file

@ -0,0 +1,6 @@
package org.asamk.signal.manager.storage.recipients;
public interface RecipientIdCreator {
RecipientId create(long recipientId);
}

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

@ -31,7 +31,7 @@ import java.util.UUID;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class RecipientStore implements RecipientResolver, RecipientTrustedResolver, ContactsStore, ProfileStore { public class RecipientStore implements RecipientIdCreator, RecipientResolver, RecipientTrustedResolver, ContactsStore, ProfileStore {
private final static Logger logger = LoggerFactory.getLogger(RecipientStore.class); private final static Logger logger = LoggerFactory.getLogger(RecipientStore.class);
private static final String TABLE_RECIPIENT = "recipient"; private static final String TABLE_RECIPIENT = "recipient";
@ -144,6 +144,15 @@ public class RecipientStore implements RecipientResolver, RecipientTrustedResolv
} }
} }
/**
* Should only be used for recipientIds from the database.
* Where the foreign key relations ensure a valid recipientId.
*/
@Override
public RecipientId create(final long recipientId) {
return new RecipientId(recipientId, this);
}
public RecipientId resolveRecipient( public RecipientId resolveRecipient(
final String number, Supplier<ACI> aciSupplier final String number, Supplier<ACI> aciSupplier
) throws UnregisteredRecipientException { ) throws UnregisteredRecipientException {