Store device name in account file and prevent it from becoming null on the server

[signal-cli] / src / main / java / org / asamk / signal / commands / UploadStickerPackCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
index d4c9e155dbe7b92cdf800ff9398dc43c2039038a..1ed14e213e1d0eb383874d1778931842d950e105 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
@@ -3,13 +3,22 @@ package org.asamk.signal.commands;
 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.StickerPackInvalidException;
+import org.asamk.signal.PlainTextWriterImpl;
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

+import org.asamk.signal.manager.StickerPackInvalidException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 
 

+import java.io.File;

 import java.io.IOException;
 
 public class UploadStickerPackCommand implements LocalCommand {
 
 import java.io.IOException;
 
 public class UploadStickerPackCommand implements LocalCommand {
 

+    private final static Logger logger = LoggerFactory.getLogger(UploadStickerPackCommand.class);
+

     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("path")
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("path")


@@ -17,20 +26,17 @@ public class UploadStickerPackCommand implements LocalCommand {
     }
 
     @Override
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Manager m) {
+    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
+        final var writer = new PlainTextWriterImpl(System.out);
+        var path = new File(ns.getString("path"));
+

         try {
         try {

-            String path = ns.getString("path");
-            String url = m.uploadStickerPack(path);
-            System.out.println("");
-            System.out.println("Upload complete! Sticker pack URL:");
-            System.out.println(url);
-            return 0;
+            var url = m.uploadStickerPack(path);
+            writer.println("{}", url);

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

-            System.err.println("Upload error: " + e.getMessage());
-            return 3;
+            throw new IOErrorException("Upload error: " + e.getMessage());

         } catch (StickerPackInvalidException e) {
         } catch (StickerPackInvalidException e) {

-            System.err.println("Invalid sticker pack: " + e.getMessage());
-            return 3;
+            throw new UserErrorException("Invalid sticker pack: " + e.getMessage());

         }
     }
 }
         }
     }
 }