Update gradle

[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 1e332fb411fffa736356980ebfbf005210d81f7e..7a3281fe7f1878cbc90ed24f5cdc5ffc9b95c079 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
@@ -1,47 +1,71 @@
 package org.asamk.signal.commands;
 
 import net.sourceforge.argparse4j.impl.Arguments;
 package org.asamk.signal.commands;
 
 import net.sourceforge.argparse4j.impl.Arguments;

-import net.sourceforge.argparse4j.inf.MutuallyExclusiveGroup;

 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 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.manager.Manager;

+import org.asamk.signal.manager.api.UpdateProfile;
+import org.asamk.signal.output.OutputWriter;

 
 

-import java.io.File;

 import java.io.IOException;
 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) {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {

-        final MutuallyExclusiveGroup avatarOptions = subparser.addMutuallyExclusiveGroup().required(true);
+        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("--about-emoji").help("New profile about emoji");
+        subparser.addArgument("--mobile-coin-address", "--mobilecoin-address")
+                .help("New MobileCoin address (Base64 encoded public address)");
+
+        final var 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").required(true).help("New profile name");
-
-        subparser.help("Set a name and avatar image for the user profile");

     }
 
     @Override
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Manager m) {
-        if (!m.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
-        }
+    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 mobileCoinAddressString = ns.getString("mobile-coin-address");
+        var mobileCoinAddress = mobileCoinAddressString == null
+                ? null
+                : Base64.getDecoder().decode(mobileCoinAddressString);

 
 

-        String name = ns.getString("name");
-        String avatarPath = ns.getString("avatar");
-        boolean removeAvatar = ns.getBoolean("remove_avatar");
+        var avatarPath = ns.getString("avatar");
+        boolean removeAvatar = Boolean.TRUE.equals(ns.getBoolean("remove-avatar"));
+        String avatarFile = removeAvatar || avatarPath == null ? null : avatarPath;

 
         try {
 
         try {

-            File avatarFile = removeAvatar ? null : new File(avatarPath);
-            m.setProfile(name, avatarFile);
+            m.updateProfile(UpdateProfile.newBuilder()
+                    .withGivenName(givenName)
+                    .withFamilyName(familyName)
+                    .withAbout(about)
+                    .withAboutEmoji(aboutEmoji)
+                    .withMobileCoinAddress(mobileCoinAddress)
+                    .withAvatar(avatarFile)
+                    .withDeleteAvatar(removeAvatar)
+                    .build());

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

-            System.err.println("UpdateAccount error: " + e.getMessage());
-            return 3;
+            throw new IOErrorException("Update profile error: " + e.getMessage(), e);

         }
         }

-
-        return 0;

     }
 }
     }
 }