Decrypt and verify the profile payment address

[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 c2712adba5f939058458c3d93e2a6328fb574564..1edb6df985ced69758327e8f19042d5b3ac0da65 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
@@ -7,15 +7,22 @@ import net.sourceforge.argparse4j.inf.Subparser;
 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 org.asamk.signal.manager.api.UpdateProfile;
+import org.asamk.signal.output.OutputWriter;

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

-public class UpdateProfileCommand implements LocalCommand {
+public class UpdateProfileCommand implements JsonRpcLocalCommand {
+
+    @Override
+    public String getName() {
+        return "updateProfile";
+    }

 
     @Override
     public void attachToSubparser(final Subparser subparser) {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {

+        subparser.help("Set a name, about and avatar image for the user profile");

         subparser.addArgument("--given-name", "--name").help("New profile (given) name");
         subparser.addArgument("--family-name").help("New profile family name (optional)");
         subparser.addArgument("--about").help("New profile about text");
         subparser.addArgument("--given-name", "--name").help("New profile (given) name");
         subparser.addArgument("--family-name").help("New profile family name (optional)");
         subparser.addArgument("--about").help("New profile about text");


@@ -24,27 +31,32 @@ public class UpdateProfileCommand implements LocalCommand {
         final var avatarOptions = subparser.addMutuallyExclusiveGroup();
         avatarOptions.addArgument("--avatar").help("Path to new profile avatar");
         avatarOptions.addArgument("--remove-avatar").action(Arguments.storeTrue());
         final var avatarOptions = subparser.addMutuallyExclusiveGroup();
         avatarOptions.addArgument("--avatar").help("Path to new profile avatar");
         avatarOptions.addArgument("--remove-avatar").action(Arguments.storeTrue());

-
-        subparser.help("Set a name, about and avatar image for the user profile");

     }
 
     @Override
     }
 
     @Override

-    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {

         var givenName = ns.getString("given-name");
         var familyName = ns.getString("family-name");
         var about = ns.getString("about");
         var aboutEmoji = ns.getString("about-emoji");
         var avatarPath = ns.getString("avatar");
         var givenName = ns.getString("given-name");
         var familyName = ns.getString("family-name");
         var about = ns.getString("about");
         var aboutEmoji = ns.getString("about-emoji");
         var avatarPath = ns.getString("avatar");

-        boolean removeAvatar = ns.getBoolean("remove-avatar");
+        boolean removeAvatar = Boolean.TRUE.equals(ns.getBoolean("remove-avatar"));

 
 

-        Optional<File> avatarFile = removeAvatar
-                ? Optional.absent()
-                : avatarPath == null ? null : Optional.of(new File(avatarPath));
+        File avatarFile = removeAvatar || avatarPath == null ? null : new File(avatarPath);

 
         try {
 
         try {

-            m.setProfile(givenName, familyName, about, aboutEmoji, avatarFile);
+            m.updateProfile(UpdateProfile.newBuilder()
+                    .withGivenName(givenName)
+                    .withFamilyName(familyName)
+                    .withAbout(about)
+                    .withAboutEmoji(aboutEmoji)
+                    .withAvatar(avatarFile)
+                    .withDeleteAvatar(removeAvatar)
+                    .build());

         } catch (IOException e) {
         } catch (IOException e) {

-            throw new IOErrorException("Update profile error: " + e.getMessage());
+            throw new IOErrorException("Update profile error: " + e.getMessage(), e);

         }
     }
 }
         }
     }
 }