X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/fc8b6d0fcbedd6a4c9ae394a0640e79690e28337..2e4d346bc826da5c35a17841772cf81ba4f98101:/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 e60edf23..d8e87430 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java @@ -7,11 +7,12 @@ 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.api.UpdateProfile; import org.asamk.signal.output.OutputWriter; import java.io.File; import java.io.IOException; -import java.util.Optional; +import java.util.Base64; public class UpdateProfileCommand implements JsonRpcLocalCommand { @@ -27,6 +28,7 @@ public class UpdateProfileCommand implements JsonRpcLocalCommand { 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"); @@ -41,15 +43,25 @@ public class UpdateProfileCommand implements JsonRpcLocalCommand { 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); + var avatarPath = ns.getString("avatar"); boolean removeAvatar = Boolean.TRUE.equals(ns.getBoolean("remove-avatar")); - - Optional avatarFile = removeAvatar - ? Optional.empty() - : avatarPath == null ? null : Optional.of(new File(avatarPath)); + File avatarFile = removeAvatar || avatarPath == null ? null : new File(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(), e); }