Add an enum for output types

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

diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index f7a491570722cf60dc63553f22e192533d409a1a..e1d1581e554e1883f1a46b6f7bbdadaeb5a129fb 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -12,19 +12,18 @@ import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;
 import org.asamk.signal.JsonReceiveMessageHandler;
 
 import org.asamk.Signal;
 import org.asamk.signal.JsonReceiveMessageHandler;

+import org.asamk.signal.OutputType;

 import org.asamk.signal.ReceiveMessageHandler;
 import org.asamk.signal.json.JsonMessageEnvelope;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.util.DateUtils;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.asamk.signal.ReceiveMessageHandler;
 import org.asamk.signal.json.JsonMessageEnvelope;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.util.DateUtils;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;

-import org.whispersystems.util.Base64;
-
-// TODO delete later when "json" variable is removed

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;

+import java.util.Base64;

 import java.util.concurrent.TimeUnit;
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
 import java.util.concurrent.TimeUnit;
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;


@@ -32,7 +31,7 @@ import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
 public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
 
     // TODO delete later when "json" variable is removed
 public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
 
     // TODO delete later when "json" variable is removed

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

 
     @Override
     public void attachToSubparser(final Subparser subparser) {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {


@@ -43,18 +42,18 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());
         subparser.addArgument("--json")
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());
         subparser.addArgument("--json")

-                .help("WARNING: This parameter is now deprecated! Please use the \"output\" option instead.\n\nOutput received messages in json format, one json object per line.")
+                .help("WARNING: This parameter is now deprecated! Please use the global \"--output=json\" option instead.\n\nOutput received messages in json format, one json object per line.")

                 .action(Arguments.storeTrue());
     }
 
     public int handleCommand(final Namespace ns, final Signal signal, DBusConnection dbusconnection) {
         final ObjectMapper jsonProcessor;
 
                 .action(Arguments.storeTrue());
     }
 
     public int handleCommand(final Namespace ns, final Signal signal, DBusConnection dbusconnection) {
         final ObjectMapper jsonProcessor;
 

-        boolean inJson = ns.getString("output").equals("json") || ns.getBoolean("json");
+        boolean inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");

 
         // TODO delete later when "json" variable is removed
         if (ns.getBoolean("json")) {
 
         // TODO delete later when "json" variable is removed
         if (ns.getBoolean("json")) {

-            logger.warn("\"--json\" option has been deprecated, please use \"output\" instead.");
+            logger.warn("\"--json\" option has been deprecated, please use the global \"--output=json\" instead.");

         }
 
         if (inJson) {
         }
 
         if (inJson) {


@@ -83,7 +82,7 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
                             messageReceived.getMessage()));
                     if (messageReceived.getGroupId().length > 0) {
                         System.out.println("Group info:");
                             messageReceived.getMessage()));
                     if (messageReceived.getGroupId().length > 0) {
                         System.out.println("Group info:");

-                        System.out.println("  Id: " + Base64.encodeBytes(messageReceived.getGroupId()));
+                        System.out.println("  Id: " + Base64.getEncoder().encodeToString(messageReceived.getGroupId()));

                     }
                     if (messageReceived.getAttachments().size() > 0) {
                         System.out.println("Attachments: ");
                     }
                     if (messageReceived.getAttachments().size() > 0) {
                         System.out.println("Attachments: ");


@@ -132,7 +131,7 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
                             syncReceived.getMessage()));
                     if (syncReceived.getGroupId().length > 0) {
                         System.out.println("Group info:");
                             syncReceived.getMessage()));
                     if (syncReceived.getGroupId().length > 0) {
                         System.out.println("Group info:");

-                        System.out.println("  Id: " + Base64.encodeBytes(syncReceived.getGroupId()));
+                        System.out.println("  Id: " + Base64.getEncoder().encodeToString(syncReceived.getGroupId()));

                     }
                     if (syncReceived.getAttachments().size() > 0) {
                         System.out.println("Attachments: ");
                     }
                     if (syncReceived.getAttachments().size() > 0) {
                         System.out.println("Attachments: ");


@@ -143,12 +142,9 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
                     System.out.println();
                 }
             });
                     System.out.println();
                 }
             });

-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Missing native library dependency for dbus service: " + e.getMessage());
-            return 1;

         } catch (DBusException e) {
             e.printStackTrace();
         } catch (DBusException e) {
             e.printStackTrace();

-            return 1;
+            return 2;

         }
         while (true) {
             try {
         }
         while (true) {
             try {


@@ -161,11 +157,11 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
 
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {
 
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {

-        boolean inJson = ns.getString("output").equals("json") || ns.getBoolean("json");
+        boolean inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");

 
         // TODO delete later when "json" variable is removed
         if (ns.getBoolean("json")) {
 
         // TODO delete later when "json" variable is removed
         if (ns.getBoolean("json")) {

-            logger.warn("\"--json\" option has been deprecated, please use \"output\" instead.");
+            logger.warn("\"--json\" option has been deprecated, please use the global \"--output=json\" instead.");

         }
 
         double timeout = 5;
         }
 
         double timeout = 5;