X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/b8a0901fbd9071f54d97e8d61fdabdfc0d4f0a7d..7b0744ec758b1ccbe3c9ce5a1e6dea5d7e2313da:/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 d8b9c6c7..cea2da0d 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
@@ -7,12 +7,18 @@ 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.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.util.Base64;
 
-public class UpdateProfileCommand implements LocalCommand {
+public class UpdateProfileCommand implements JsonRpcLocalCommand {
+
+    @Override
+    public String getName() {
+        return "updateProfile";
+    }
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
@@ -21,6 +27,7 @@ public class UpdateProfileCommand implements LocalCommand {
         subparser.addArgument("--family-name").help("New profile family name (optional)");
         subparser.addArgument("--about").help("New profile about text");
         subparser.addArgument("--about-emoji").help("New profile about emoji");
+        subparser.addArgument("--mobile-coin-address").help("New MobileCoin address (Base64 encoded public address)");
 
         final var avatarOptions = subparser.addMutuallyExclusiveGroup();
         avatarOptions.addArgument("--avatar").help("Path to new profile avatar");
@@ -28,22 +35,34 @@ public class UpdateProfileCommand implements LocalCommand {
     }
 
     @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");
-        boolean removeAvatar = ns.getBoolean("remove-avatar");
+        var mobileCoinAddressString = ns.getString("mobile-coin-address");
+        var mobileCoinAddress = mobileCoinAddressString == null
+                ? null
+                : Base64.getDecoder().decode(mobileCoinAddressString);
 
-        Optional<File> avatarFile = removeAvatar
-                ? Optional.absent()
-                : avatarPath == null ? null : Optional.of(new File(avatarPath));
+        var avatarPath = ns.getString("avatar");
+        boolean removeAvatar = Boolean.TRUE.equals(ns.getBoolean("remove-avatar"));
+        String avatarFile = removeAvatar || avatarPath == null ? null : avatarPath;
 
         try {
-            m.setProfile(givenName, familyName, about, aboutEmoji, avatarFile);
+            m.updateProfile(UpdateProfile.newBuilder()
+                    .withGivenName(givenName)
+                    .withFamilyName(familyName)
+                    .withAbout(about)
+                    .withAboutEmoji(aboutEmoji)
+                    .withMobileCoinAddress(mobileCoinAddress)
+                    .withAvatar(avatarFile)
+                    .withDeleteAvatar(removeAvatar)
+                    .build());
         } catch (IOException e) {
-            throw new IOErrorException("Update profile error: " + e.getMessage());
+            throw new IOErrorException("Update profile error: " + e.getMessage(), e);
         }
     }
 }