Use java.util.Optional in Manager interface

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 2cb68d206eaba52efbcbd188dcd28b4d50fd0dc3..34f639ba2d2e90bec5d93efa5a9f5917b84de278 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -24,7 +24,6 @@ import org.asamk.signal.manager.storage.recipients.Profile;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.libsignal.util.Pair;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.libsignal.util.Pair;

-import org.whispersystems.libsignal.util.guava.Optional;

 import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId;
 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
 import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId;
 import org.whispersystems.signalservice.api.messages.SignalServiceContent;


@@ -41,6 +40,7 @@ import java.net.URI;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;

+import java.util.Optional;

 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;

diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index fe26e9b4d340a7c1115371961bf0d7ea1da64e30..7712b01bc06971f561f3b5c53a25ef3c3d40a845 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -358,9 +358,13 @@ public class ManagerImpl implements Manager {
      */
     @Override
     public void setProfile(
      */
     @Override
     public void setProfile(

-            String givenName, final String familyName, String about, String aboutEmoji, Optional<File> avatar
+            String givenName, final String familyName, String about, String aboutEmoji, java.util.Optional<File> avatar

     ) throws IOException {
     ) throws IOException {

-        profileHelper.setProfile(givenName, familyName, about, aboutEmoji, avatar);
+        profileHelper.setProfile(givenName,
+                familyName,
+                about,
+                aboutEmoji,
+                avatar == null ? null : Optional.fromNullable(avatar.orElse(null)));

         syncHelper.sendSyncFetchProfileMessage();
     }
 
         syncHelper.sendSyncFetchProfileMessage();
     }
 


@@ -443,7 +447,7 @@ public class ManagerImpl implements Manager {
     }
 
     @Override
     }
 
     @Override

-    public void setRegistrationLockPin(Optional<String> pin) throws IOException, UnauthenticatedResponseException {
+    public void setRegistrationLockPin(java.util.Optional<String> pin) throws IOException, UnauthenticatedResponseException {

         if (!account.isMasterDevice()) {
             throw new RuntimeException("Only master device can set a PIN");
         }
         if (!account.isMasterDevice()) {
             throw new RuntimeException("Only master device can set a PIN");
         }

diff --git a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
index d1ad276ab516d5861eaec633b0ba93a3ea186a5a..aea5e3be2967c9195b320f5c13f3857aa6a60a42 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
@@ -8,10 +8,10 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.manager.Manager;

-import org.whispersystems.libsignal.util.guava.Optional;

 import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
 
 import java.io.IOException;
 import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
 
 import java.io.IOException;

+import java.util.Optional;

 
 public class RemovePinCommand implements JsonRpcLocalCommand {
 
 
 public class RemovePinCommand implements JsonRpcLocalCommand {
 


@@ -30,7 +30,7 @@ public class RemovePinCommand implements JsonRpcLocalCommand {
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
         try {
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
         try {

-            m.setRegistrationLockPin(Optional.absent());
+            m.setRegistrationLockPin(Optional.empty());

         } catch (UnauthenticatedResponseException e) {
             throw new UnexpectedErrorException("Remove pin failed with unauthenticated response: " + e.getMessage(), e);
         } catch (IOException e) {
         } catch (UnauthenticatedResponseException e) {
             throw new UnexpectedErrorException("Remove pin failed with unauthenticated response: " + e.getMessage(), e);
         } catch (IOException e) {

diff --git a/src/main/java/org/asamk/signal/commands/SetPinCommand.java b/src/main/java/org/asamk/signal/commands/SetPinCommand.java
index ec4a0e3b13f07a9f875b7ffa1347639928c9b362..db900d6d6cbcac9feba8265d94cc2a703b59363c 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SetPinCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SetPinCommand.java
@@ -8,10 +8,10 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.manager.Manager;

-import org.whispersystems.libsignal.util.guava.Optional;

 import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
 
 import java.io.IOException;
 import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
 
 import java.io.IOException;

+import java.util.Optional;

 
 public class SetPinCommand implements JsonRpcLocalCommand {
 
 
 public class SetPinCommand implements JsonRpcLocalCommand {
 

diff --git a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
index 9890a597c573fd8a23e0a950497f12c03eb1a410..bd3d59bd2f6bbf2dd8ac9a08d69d80f5c5072752 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
@@ -8,10 +8,10 @@ import org.asamk.signal.OutputWriter;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.manager.Manager;

-import org.whispersystems.libsignal.util.guava.Optional;

 
 import java.io.File;
 import java.io.IOException;
 
 import java.io.File;
 import java.io.IOException;

+import java.util.Optional;

 
 public class UpdateProfileCommand implements JsonRpcLocalCommand {
 
 
 public class UpdateProfileCommand implements JsonRpcLocalCommand {
 


@@ -45,7 +45,7 @@ public class UpdateProfileCommand implements JsonRpcLocalCommand {
         boolean removeAvatar = Boolean.TRUE.equals(ns.getBoolean("remove-avatar"));
 
         Optional<File> avatarFile = removeAvatar
         boolean removeAvatar = Boolean.TRUE.equals(ns.getBoolean("remove-avatar"));
 
         Optional<File> avatarFile = removeAvatar

-                ? Optional.absent()
+                ? Optional.empty()

                 : avatarPath == null ? null : Optional.of(new File(avatarPath));
 
         try {
                 : avatarPath == null ? null : Optional.of(new File(avatarPath));
 
         try {

diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 9ae58122fc752e73ae6877ad0089dcfee8b4456b..1028392ce1b4b0c4ba1ec7b7157fbdea0656e057 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -32,7 +32,6 @@ import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.interfaces.DBusInterface;
 import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.libsignal.util.Pair;
 import org.freedesktop.dbus.interfaces.DBusInterface;
 import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.libsignal.util.Pair;

-import org.whispersystems.libsignal.util.guava.Optional;

 import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;


@@ -48,6 +47,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

+import java.util.Optional;

 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;


@@ -122,7 +122,7 @@ public class DbusManagerImpl implements Manager {
                 emptyIfNull(familyName),
                 emptyIfNull(about),
                 emptyIfNull(aboutEmoji),
                 emptyIfNull(familyName),
                 emptyIfNull(about),
                 emptyIfNull(aboutEmoji),

-                avatar == null ? "" : avatar.transform(File::getPath).or(""),
+                avatar == null ? "" : avatar.map(File::getPath).orElse(""),

                 avatar != null && !avatar.isPresent());
     }
 
                 avatar != null && !avatar.isPresent());
     }
 

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 977dfa758cc2ec98c8a3bcf3c72c84d36a942adc..25c80ffbfb926ae2e907d49691293e854b6eee80 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -31,7 +31,6 @@ import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.freedesktop.dbus.types.Variant;
 import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.libsignal.util.Pair;
 import org.freedesktop.dbus.types.Variant;
 import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.libsignal.util.Pair;

-import org.whispersystems.libsignal.util.guava.Optional;

 import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;
 import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;


@@ -50,6 +49,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;

+import java.util.Optional;

 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;


@@ -561,7 +561,7 @@ public class DbusSignalImpl implements Signal {
             aboutEmoji = nullIfEmpty(aboutEmoji);
             avatarPath = nullIfEmpty(avatarPath);
             Optional<File> avatarFile = removeAvatar
             aboutEmoji = nullIfEmpty(aboutEmoji);
             avatarPath = nullIfEmpty(avatarPath);
             Optional<File> avatarFile = removeAvatar

-                    ? Optional.absent()
+                    ? Optional.empty()

                     : avatarPath == null ? null : Optional.of(new File(avatarPath));
             m.setProfile(givenName, familyName, about, aboutEmoji, avatarFile);
         } catch (IOException e) {
                     : avatarPath == null ? null : Optional.of(new File(avatarPath));
             m.setProfile(givenName, familyName, about, aboutEmoji, avatarFile);
         } catch (IOException e) {


@@ -583,7 +583,7 @@ public class DbusSignalImpl implements Signal {
     @Override
     public void removePin() {
         try {
     @Override
     public void removePin() {
         try {

-            m.setRegistrationLockPin(Optional.absent());
+            m.setRegistrationLockPin(Optional.empty());

         } catch (UnauthenticatedResponseException e) {
             throw new Error.Failure("Remove pin failed with unauthenticated response: " + e.getMessage());
         } catch (IOException e) {
         } catch (UnauthenticatedResponseException e) {
             throw new Error.Failure("Remove pin failed with unauthenticated response: " + e.getMessage());
         } catch (IOException e) {

diff --git a/src/main/java/org/asamk/signal/util/Util.java b/src/main/java/org/asamk/signal/util/Util.java
index b4954bf3226d6075b907d9696f0df157d1b855bf..5ded399eaf887a765a7edd30fb458ae9af8af5d8 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.ObjectMapper;
 

-import org.whispersystems.libsignal.util.guava.Optional;

 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 import java.util.Arrays;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 import java.util.Arrays;


@@ -18,7 +17,7 @@ public class Util {
     private Util() {
     }
 
     private Util() {
     }
 

-    public static String getStringIfNotBlank(Optional<String> value) {
+    public static String getStringIfNotBlank(org.whispersystems.libsignal.util.guava.Optional<String> value) {

         var string = value.orNull();
         if (string == null || string.isBlank()) {
             return null;
         var string = value.orNull();
         if (string == null || string.isBlank()) {
             return null;