aljaz/signal-cli
1
0
Fork 0
mirror of https://github.com/aljazceru/signal-cli.git synced 2025-12-25 18:14:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Show better error message when using addDevice on a linked device

Browse Source
This commit is contained in:
AsamK
2023-08-21 17:14:04 +02:00
parent 3d13c69e41
commit 6d23eb3bf6
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
View File

@@ -9,6 +9,7 @@ import org.asamk.signal.commands.exceptions.UserErrorException;
import org.asamk.signal.manager.Manager;
import org.asamk.signal.manager.api.DeviceLinkUrl;
import org.asamk.signal.manager.api.InvalidDeviceLinkException;
import org.asamk.signal.manager.api.NotPrimaryDeviceException;
import org.asamk.signal.output.OutputWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,11 +50,13 @@ public class AddDeviceCommand implements JsonRpcLocalCommand {
var deviceLinkUrl = DeviceLinkUrl.parseDeviceLinkUri(linkUri);
m.addDeviceLink(deviceLinkUrl);
} catch (IOException e) {
logger.error("Add device link failed", e);
logger.error("Add device link failed: {}", e.getMessage());
throw new IOErrorException("Add device link failed", e);
} catch (InvalidDeviceLinkException e) {
logger.error("Add device link failed", e);
throw new UserErrorException("Add device link failed.", e);
logger.error("Invalid device link");
throw new UserErrorException("Invalid device link", e);
} catch (NotPrimaryDeviceException e) {
throw new UserErrorException("This command doesn't work on linked devices.");
}
}
}

4
src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java
View File

@@ -51,10 +51,10 @@ public class AddStickerPackCommand implements JsonRpcLocalCommand {
var stickerPackUrl = StickerPackUrl.fromUri(stickerUri);
m.installStickerPack(stickerPackUrl);
} catch (IOException e) {
logger.error("Install sticker pack failed", e);
logger.error("Install sticker pack failed: {}", e.getMessage());
throw new IOErrorException("Install sticker pack failed", e);
} catch (StickerPackUrl.InvalidStickerPackLinkException e) {
logger.error("Invalid sticker pack link", e);
logger.error("Invalid sticker pack link");
throw new UserErrorException("Invalid sticker pack link", e);
}
}