Replace Base64 class from libsignal with java.util.Base64

[signal-cli] / src / main / java / org / asamk / signal / commands / UpdateProfileCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
index a7b029376186f8a72216e96b346cf57e8b985d33..c2ff2e5e0e624d920097a1d0f4b65b089fdc18df 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
@@ -6,6 +6,7 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.manager.Manager;
+import org.whispersystems.libsignal.util.guava.Optional;
 
 import java.io.File;
 import java.io.IOException;
@@ -15,57 +16,28 @@ public class UpdateProfileCommand implements LocalCommand {
     @Override
     public void attachToSubparser(final Subparser subparser) {
         final MutuallyExclusiveGroup avatarOptions = subparser.addMutuallyExclusiveGroup();
-        avatarOptions.addArgument("--avatar")
-                .help("Path to new profile avatar");
-        avatarOptions.addArgument("--remove-avatar")
-                .action(Arguments.storeTrue());
+        avatarOptions.addArgument("--avatar").help("Path to new profile avatar");
+        avatarOptions.addArgument("--remove-avatar").action(Arguments.storeTrue());
 
-        subparser.addArgument("--name")
-                .help("New profile name");
+        subparser.addArgument("--name").required(true).help("New profile name");
 
-        subparser.help("Set a name and/or avatar image for the user profile");
+        subparser.help("Set a name and avatar image for the user profile");
     }
 
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {
-        if (!m.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
-        }
-
         String name = ns.getString("name");
-
-        if (name != null) {
-            try {
-                m.setProfileName(name);
-            } catch (IOException e) {
-                System.err.println("UpdateAccount error: " + e.getMessage());
-                return 3;
-            }
-        }
-
         String avatarPath = ns.getString("avatar");
-
-        if (avatarPath != null) {
-            File avatarFile = new File(avatarPath);
-
-            try {
-                m.setProfileAvatar(avatarFile);
-            } catch (IOException e) {
-                System.err.println("UpdateAccount error: " + e.getMessage());
-                return 3;
-            }
-        }
-
         boolean removeAvatar = ns.getBoolean("remove_avatar");
 
-        if (removeAvatar) {
-            try {
-                m.removeProfileAvatar();
-            } catch (IOException e) {
-                System.err.println("UpdateAccount error: " + e.getMessage());
-                return 3;
-            }
+        try {
+            Optional<File> avatarFile = removeAvatar
+                    ? Optional.absent()
+                    : avatarPath == null ? null : Optional.of(new File(avatarPath));
+            m.setProfile(name, avatarFile);
+        } catch (IOException e) {
+            System.err.println("UpdateAccount error: " + e.getMessage());
+            return 3;
         }
 
         return 0;