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

Return a Manager from ProvisioningManager and RegistrationManager when finished

Browse source
This commit is contained in:
AsamK 2021-03-07 14:48:02 +01:00
parent a7b414a870
commit 2935b96070
4 changed files with 49 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/org/asamk/signal/commands/LinkCommand.java
View file

@ -38,8 +38,9 @@ public class LinkCommand implements ProvisioningCommand {
}
try {
writer.println("{}", m.getDeviceLinkUri());
var username = m.finishDeviceLink(deviceName);
writer.println("Associated with: {}", username);
try (var manager = m.finishDeviceLink(deviceName)) {
writer.println("Associated with: {}", manager.getUsername());
}
} catch (TimeoutException e) {
throw new UserErrorException("Link request timed out, please try again.");
} catch (IOException e) {

3
src/main/java/org/asamk/signal/commands/VerifyCommand.java
View file

@ -28,7 +28,8 @@ public class VerifyCommand implements RegistrationCommand {
var pin = ns.getString("pin");
try {
m.verifyAccount(verificationCode, pin);
final var manager = m.verifyAccount(verificationCode, pin);
manager.close();
} catch (LockedException e) {
throw new UserErrorException(
"Verification failed! This number is locked with a pin. Hours remaining until reset: "