X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/4f2261e86f493a9c8954c02c52ddaa9a46490d20..591c0fe8a3744608575a6dcb1f6f4f9f818948d2:/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java diff --git a/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java b/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java index f775cc1c..ba1980d4 100644 --- a/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java +++ b/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java @@ -46,8 +46,7 @@ public final class ProfileHelper { } public ProfileAndCredential retrieveProfileSync( - SignalServiceAddress recipient, - SignalServiceProfile.RequestType requestType + SignalServiceAddress recipient, SignalServiceProfile.RequestType requestType ) throws IOException { try { return retrieveProfile(recipient, requestType).get(10, TimeUnit.SECONDS); @@ -65,28 +64,31 @@ public final class ProfileHelper { } public ListenableFuture retrieveProfile( - SignalServiceAddress address, - SignalServiceProfile.RequestType requestType + SignalServiceAddress address, SignalServiceProfile.RequestType requestType ) { Optional unidentifiedAccess = getUnidentifiedAccess(address); Optional profileKey = Optional.fromNullable(profileKeyProvider.getProfileKey(address)); if (unidentifiedAccess.isPresent()) { - return new CascadingFuture<>(Arrays.asList(() -> getPipeRetrievalFuture(address, profileKey, unidentifiedAccess, requestType), + return new CascadingFuture<>(Arrays.asList(() -> getPipeRetrievalFuture(address, + profileKey, + unidentifiedAccess, + requestType), () -> getSocketRetrievalFuture(address, profileKey, unidentifiedAccess, requestType), () -> getPipeRetrievalFuture(address, profileKey, Optional.absent(), requestType), () -> getSocketRetrievalFuture(address, profileKey, Optional.absent(), requestType)), e -> !(e instanceof NotFoundException)); } else { - return new CascadingFuture<>(Arrays.asList(() -> getPipeRetrievalFuture(address, profileKey, Optional.absent(), requestType), - () -> getSocketRetrievalFuture(address, profileKey, Optional.absent(), requestType)), + return new CascadingFuture<>(Arrays.asList(() -> getPipeRetrievalFuture(address, + profileKey, + Optional.absent(), + requestType), () -> getSocketRetrievalFuture(address, profileKey, Optional.absent(), requestType)), e -> !(e instanceof NotFoundException)); } } public String decryptName( - ProfileKey profileKey, - String encryptedName + ProfileKey profileKey, String encryptedName ) throws InvalidCiphertextException, IOException { if (encryptedName == null) { return null;