Clean old prekeys only after server message queue is empty

[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 b4040d4831eddda54f669368ced46aa8fe7348fb..cea2da0dfe0a449eeae0aa231e67fc0effd2f29d 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
@@ -1,72 +1,68 @@
 package org.asamk.signal.commands;
 
 package org.asamk.signal.commands;
 

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

 import net.sourceforge.argparse4j.impl.Arguments;
 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.manager.Manager;

 
 

-public class UpdateProfileCommand implements LocalCommand {
+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.api.UpdateProfile;
+import org.asamk.signal.output.OutputWriter;

 
 

-    @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());
+import java.io.IOException;
+import java.util.Base64;

 
 

-        subparser.addArgument("--name")
-                .help("New profile name");
+public class UpdateProfileCommand implements JsonRpcLocalCommand {

 
 

-        subparser.help("Set a name and/or avatar image for the user profile");
+    @Override
+    public String getName() {
+        return "updateProfile";

     }
 
     @Override
     }
 
     @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");
+    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("--about-emoji").help("New profile about emoji");
+        subparser.addArgument("--mobile-coin-address").help("New MobileCoin address (Base64 encoded public address)");

 
 

-        if (avatarPath != null) {
-            File avatarFile = new File(avatarPath);
+        final var avatarOptions = subparser.addMutuallyExclusiveGroup();
+        avatarOptions.addArgument("--avatar").help("Path to new profile avatar");
+        avatarOptions.addArgument("--remove-avatar").action(Arguments.storeTrue());
+    }

 
 

-            try {
-                m.setProfileAvatar(avatarFile);
-            } catch (IOException e) {
-                System.err.println("UpdateAccount error: " + e.getMessage());
-                return 3;
-            }
-        }
+    @Override
+    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);

 
 

-        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;

 
 

-        if (removeAvatar) {
-            try {
-                m.removeProfileAvatar();
-            } catch (IOException e) {
-                System.err.println("UpdateAccount error: " + e.getMessage());
-                return 3;
-            }
+        try {
+            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(), e);

         }
         }

-
-        return 0;

     }
 }
     }
 }