webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-09-02 20:40:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

more debug messages

Browse source
This commit is contained in:
John Freed 2021-08-17 06:52:31 +02:00
parent 49c21a522f
commit 26a3bc1481
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/src/main/java/org/asamk/signal/manager/ProvisioningManager.java
View file

@ -93,7 +93,7 @@ public class ProvisioningManager {
NewDeviceRegistrationReturn ret = null;
String number = null;
try {
logger.info("Waiting for link request from new device ...");
logger.info("Waiting for addDevice request from new device ...");
ret = accountManager.getNewDeviceRegistration(tempIdentityKey);
number = ret.getNumber();
logger.info("Received link information from {}, linking in progress ...", number);

16
src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
View file

@ -5,6 +5,8 @@ import org.asamk.signal.App;
import org.asamk.signal.BaseConfig;
import org.asamk.signal.DbusConfig;
import org.asamk.signal.commands.SignalCreator;
import org.asamk.signal.commands.exceptions.IOErrorException;
import org.asamk.signal.commands.exceptions.UserErrorException;
import org.asamk.signal.manager.Manager;
import org.asamk.signal.manager.PathConfig;
import org.asamk.signal.manager.ProvisioningManager;
@ -162,9 +164,17 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
Manager manager = provisioningManager.finishDeviceLink(newDeviceName);
logger.info("Linking of " + newDeviceName + " successful");
manager.close();
} catch (IOException | TimeoutException | UserAlreadyExists e) {
throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
}
} catch (TimeoutException e) {
throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + "Link request timed out, please try again.");
} catch (IOException e) {
throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + "Link request error: " + e.getMessage());
} catch (UserAlreadyExists e) {
throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + "The user "
+ e.getUsername()
+ " already exists\nDelete \""
+ e.getFileName()
+ "\" before trying again.");
}
}).start();
return deviceLinkUri.toString();
} catch (TimeoutException | IOException e) {