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

Improve handling of unregistered account

Browse source
This commit is contained in:
AsamK 2021-12-05 12:00:31 +01:00
parent 861f47d734
commit c8b9ab1911
1 changed files with 32 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

36
lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
View file

@ -77,9 +77,11 @@ import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage
import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage; import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage;
import org.whispersystems.signalservice.api.push.ACI; import org.whispersystems.signalservice.api.push.ACI;
import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
import org.whispersystems.signalservice.api.util.DeviceNameUtil; import org.whispersystems.signalservice.api.util.DeviceNameUtil;
import org.whispersystems.signalservice.api.util.InvalidNumberException; import org.whispersystems.signalservice.api.util.InvalidNumberException;
import org.whispersystems.signalservice.api.util.PhoneNumberFormatter; import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState;
import org.whispersystems.signalservice.api.websocket.WebSocketUnavailableException; import org.whispersystems.signalservice.api.websocket.WebSocketUnavailableException;
import org.whispersystems.signalservice.internal.contacts.crypto.Quote; import org.whispersystems.signalservice.internal.contacts.crypto.Quote;
import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedQuoteException; import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedQuoteException;
@ -111,6 +113,9 @@ import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.schedulers.Schedulers;
import static org.asamk.signal.manager.config.ServiceConfig.capabilities; import static org.asamk.signal.manager.config.ServiceConfig.capabilities;
public class ManagerImpl implements Manager { public class ManagerImpl implements Manager {
@ -267,11 +272,16 @@ public class ManagerImpl implements Manager {
days); days);
} }
} }
preKeyHelper.refreshPreKeysIfNecessary(); try {
if (account.getAci() == null) { preKeyHelper.refreshPreKeysIfNecessary();
account.setAci(dependencies.getAccountManager().getOwnAci()); if (account.getAci() == null) {
account.setAci(dependencies.getAccountManager().getOwnAci());
}
updateAccountAttributes(null);
} catch (AuthorizationFailedException e) {
account.setRegistered(false);
throw e;
} }
updateAccountAttributes(null);
} }
/** /**
@ -1096,6 +1106,12 @@ public class ManagerImpl implements Manager {
Map<HandleAction, HandleAction> queuedActions = new HashMap<>(); Map<HandleAction, HandleAction> queuedActions = new HashMap<>();
final var signalWebSocket = dependencies.getSignalWebSocket(); final var signalWebSocket = dependencies.getSignalWebSocket();
final var webSocketStateDisposable = Observable.merge(signalWebSocket.getUnidentifiedWebSocketState(),
signalWebSocket.getWebSocketState())
.subscribeOn(Schedulers.computation())
.observeOn(Schedulers.computation())
.distinctUntilChanged()
.subscribe(this::onWebSocketStateChange);
signalWebSocket.connect(); signalWebSocket.connect();
hasCaughtUpWithOldMessages = false; hasCaughtUpWithOldMessages = false;
@ -1201,6 +1217,18 @@ public class ManagerImpl implements Manager {
handleQueuedActions(queuedActions.keySet()); handleQueuedActions(queuedActions.keySet());
queuedActions.clear(); queuedActions.clear();
dependencies.getSignalWebSocket().disconnect(); dependencies.getSignalWebSocket().disconnect();
webSocketStateDisposable.dispose();
}
private void onWebSocketStateChange(final WebSocketConnectionState s) {
if (s.equals(WebSocketConnectionState.AUTHENTICATION_FAILED)) {
account.setRegistered(false);
try {
close();
} catch (IOException e) {
e.printStackTrace();
}
}
} }
@Override @Override