X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/9e6a3534275d5bac8454792e05280f13fa5ef13c..03bf0439593dc1c5e02bdd49e18d649d1c24e721:/src/main/java/org/asamk/signal/util/ErrorUtils.java diff --git a/src/main/java/org/asamk/signal/util/ErrorUtils.java b/src/main/java/org/asamk/signal/util/ErrorUtils.java index e9553f98..f7115ea9 100644 --- a/src/main/java/org/asamk/signal/util/ErrorUtils.java +++ b/src/main/java/org/asamk/signal/util/ErrorUtils.java @@ -33,18 +33,26 @@ public class ErrorUtils { public static List getErrorMessagesFromSendMessageResults(List results) { List errors = new ArrayList<>(); for (SendMessageResult result : results) { - if (result.isNetworkFailure()) { - errors.add(String.format("Network failure for \"%s\"", result.getAddress().getLegacyIdentifier())); - } else if (result.isUnregisteredFailure()) { - errors.add(String.format("Unregistered user \"%s\"", result.getAddress().getLegacyIdentifier())); - } else if (result.getIdentityFailure() != null) { - errors.add(String.format("Untrusted Identity for \"%s\"", result.getAddress().getLegacyIdentifier())); + String error = getErrorMessageFromSendMessageResult(result); + if (error != null) { + errors.add(error); } } return errors; } + public static String getErrorMessageFromSendMessageResult(SendMessageResult result) { + if (result.isNetworkFailure()) { + return String.format("Network failure for \"%s\"", result.getAddress().getLegacyIdentifier()); + } else if (result.isUnregisteredFailure()) { + return String.format("Unregistered user \"%s\"", result.getAddress().getLegacyIdentifier()); + } else if (result.getIdentityFailure() != null) { + return String.format("Untrusted Identity for \"%s\"", result.getAddress().getLegacyIdentifier()); + } + return null; + } + private static int handleSendMessageResultErrors(List errors) { if (errors.size() == 0) { return 0;