Update libsignal-service-java

[signal-cli] / lib / src / main / java / org / asamk / signal / manager / actions / SendRetryMessageRequestAction.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java
index 3ecd9a1e1d04d5ead4c5c3697d49a07e3f540dce..4ebbe99ee7e8c802899c2274ec85cb3de415c72b 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java
+++ b/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java
@@ -1,15 +1,16 @@
 package org.asamk.signal.manager.actions;
 
 import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.jobs.Context;
+import org.asamk.signal.manager.helper.Context;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.signal.libsignal.metadata.ProtocolException;
-import org.whispersystems.libsignal.protocol.CiphertextMessage;
-import org.whispersystems.libsignal.protocol.DecryptionErrorMessage;
-import org.whispersystems.libsignal.util.guava.Optional;
+import org.signal.libsignal.protocol.message.CiphertextMessage;
+import org.signal.libsignal.protocol.message.DecryptionErrorMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
 
+import java.util.Optional;
+
 public class SendRetryMessageRequestAction implements HandleAction {
 
     private final RecipientId recipientId;
@@ -32,7 +33,7 @@ public class SendRetryMessageRequestAction implements HandleAction {
 
         int senderDevice = protocolException.getSenderDevice();
         Optional<GroupId> groupId = protocolException.getGroupId().isPresent() ? Optional.of(GroupId.unknownVersion(
-                protocolException.getGroupId().get())) : Optional.absent();
+                protocolException.getGroupId().get())) : Optional.empty();
 
         byte[] originalContent;
         int envelopeType;