X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/9e6a3534275d5bac8454792e05280f13fa5ef13c..de273586b4106171a3940ce5ec2c2b3712430c8c:/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..65e41cc8 100644 --- a/src/main/java/org/asamk/signal/util/ErrorUtils.java +++ b/src/main/java/org/asamk/signal/util/ErrorUtils.java @@ -26,31 +26,39 @@ public class ErrorUtils { if (timestamp != 0) { System.out.println(timestamp); } - List errors = getErrorMessagesFromSendMessageResults(results); + var errors = getErrorMessagesFromSendMessageResults(results); return handleSendMessageResultErrors(errors); } 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())); + var errors = new ArrayList(); + for (var result : results) { + var 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; } System.err.println("Failed to send (some) messages:"); - for (String error : errors) { + for (var error : errors) { System.err.println(error); } return 3;