{
"pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT\\E"
},
+ {
+ "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ\\E"
+ },
{
"pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB\\E"
},
boolean trustIdentityAllKeys(RecipientIdentifier.Single recipient);
+ void addClosedListener(Runnable listener);
+
@Override
void close() throws IOException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.security.SignatureException;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
private Thread receiveThread;
private final Set<ReceiveMessageHandler> weakHandlers = new HashSet<>();
private final Set<ReceiveMessageHandler> messageHandlers = new HashSet<>();
+ private final List<Runnable> closedListeners = new ArrayList<>();
private boolean isReceivingSynchronous;
ManagerImpl(
dependencies.getAccountManager().setGcmId(Optional.absent());
account.setRegistered(false);
+ close();
}
@Override
dependencies.getAccountManager().deleteAccount();
account.setRegistered(false);
+ close();
}
@Override
return identityHelper.trustIdentityAllKeys(recipientId);
}
+ @Override
+ public void addClosedListener(final Runnable listener) {
+ synchronized (closedListeners) {
+ closedListeners.add(listener);
+ }
+ }
+
private void handleIdentityFailure(
final RecipientId recipientId,
final org.whispersystems.signalservice.api.messages.SendMessageResult.IdentityFailure identityFailure
@Override
public void close() throws IOException {
- close(true);
- }
-
- private void close(boolean closeAccount) throws IOException {
Thread thread;
synchronized (messageHandlers) {
weakHandlers.clear();
dependencies.getSignalWebSocket().disconnect();
- if (closeAccount && account != null) {
+ synchronized (closedListeners) {
+ closedListeners.forEach(Runnable::run);
+ closedListeners.clear();
+ }
+
+ if (account != null) {
account.close();
}
account = null;
final String userAgent
) {
this.managers.addAll(managers);
+ managers.forEach(m -> m.addClosedListener(() -> this.removeManager(m)));
this.dataPath = dataPath;
this.serviceEnvironment = serviceEnvironment;
this.userAgent = userAgent;
return;
}
managers.add(m);
+ m.addClosedListener(() -> this.removeManager(m));
}
synchronized (onManagerAddedHandlers) {
for (final var handler : onManagerAddedHandlers) {
}
}
+ void removeManager(final Manager m) {
+ synchronized (managers) {
+ if (!managers.remove(m)) {
+ return;
+ }
+ }
+ synchronized (onManagerRemovedHandlers) {
+ for (final var handler : onManagerRemovedHandlers) {
+ handler.accept(m);
+ }
+ }
+ }
+
@Override
public void addOnManagerRemovedHandler(final Consumer<Manager> handler) {
synchronized (onManagerRemovedHandlers) {
void submitRateLimitChallenge(String challenge, String captchaString) throws Error.Failure;
+ void unregister() throws Error.Failure;
+
+ void deleteAccount() throws Error.Failure;
+
class MessageReceivedV2 extends DBusSignal {
private final long timestamp;
}
SLF4JBridgeHandler.removeHandlersForRootLogger();
SLF4JBridgeHandler.install();
- java.util.logging.Logger.getLogger("").setLevel(java.util.logging.Level.FINEST);
+ // java.util.logging.Logger.getLogger("").setLevel(java.util.logging.Level.FINEST);
}
private static int getStatusForError(final CommandException e) {
runDbusSingleAccount(m, false, receiveMode != ReceiveMode.ON_START);
}
+ m.addClosedListener(() -> {
+ synchronized (this) {
+ notifyAll();
+ }
+ });
+
synchronized (this) {
try {
wait();
}
private void runSocket(final ServerSocketChannel serverChannel, Consumer<SocketChannel> socketHandler) {
- final var mainThread = Thread.currentThread();
new Thread(() -> {
while (true) {
final SocketChannel channel;
logger.info("Accepted new client: " + clientString);
} catch (IOException e) {
logger.error("Failed to accept new socket connection", e);
- mainThread.notifyAll();
+ synchronized (this) {
+ notifyAll();
+ }
break;
}
new Thread(() -> {
}
}
});
+ c.addOnManagerRemovedHandler(m -> {
+ final var path = DbusConfig.getObjectPath(m.getSelfNumber());
+ try {
+ final var object = connection.getExportedObject(null, path);
+ if (object instanceof DbusSignalImpl dbusSignal) {
+ dbusSignal.close();
+ }
+ } catch (DBusException ignored) {
+ }
+ connection.unExportObject(path);
+ });
final var initThreads = c.getAccountNumbers()
.stream()
import java.io.IOException;
-public class UnregisterCommand implements LocalCommand {
+public class UnregisterCommand implements JsonRpcLocalCommand {
@Override
public String getName() {
private final Set<ReceiveMessageHandler> weakHandlers = new HashSet<>();
private final Set<ReceiveMessageHandler> messageHandlers = new HashSet<>();
+ private final List<Runnable> closedListeners = new ArrayList<>();
private DBusSigHandler<Signal.MessageReceivedV2> dbusMsgHandler;
private DBusSigHandler<Signal.ReceiptReceivedV2> dbusRcptHandler;
private DBusSigHandler<Signal.SyncMessageReceivedV2> dbusSyncHandler;
throw new UnsupportedOperationException();
}
+ @Override
+ public void addClosedListener(final Runnable listener) {
+ synchronized (closedListeners) {
+ closedListeners.add(listener);
+ }
+ }
+
@Override
public void close() throws IOException {
synchronized (this) {
weakHandlers.clear();
messageHandlers.clear();
}
+ synchronized (closedListeners) {
+ closedListeners.forEach(Runnable::run);
+ closedListeners.clear();
+ }
}
private SendMessageResults handleMessage(
}
+ @Override
+ public void unregister() throws Error.Failure {
+ try {
+ m.unregister();
+ } catch (IOException e) {
+ throw new Error.Failure("Failed to unregister: " + e.getMessage());
+ }
+ }
+
+ @Override
+ public void deleteAccount() throws Error.Failure {
+ try {
+ m.deleteAccount();
+ } catch (IOException e) {
+ throw new Error.Failure("Failed to delete account: " + e.getMessage());
+ }
+ }
+
@Override
public void addDevice(String uri) {
try {
if (!noReceiveOnStart) {
c.getAccountNumbers().stream().map(c::getManager).filter(Objects::nonNull).forEach(this::subscribeReceive);
+ c.addOnManagerAddedHandler(this::subscribeReceive);
+ c.addOnManagerRemovedHandler(this::unsubscribeReceive);
}
handleConnection();
subscribeReceive(m);
}
+ final var currentThread = Thread.currentThread();
+ m.addClosedListener(currentThread::interrupt);
+
handleConnection();
}
git.nmode.ca / signal-cli / commitdiff
