Improve user status command

diff --git a/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java b/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java
index 363fc3043f71a94af65fcbe160f85dd8161ce7f8..eb135e13c64215a9c324c35f26c2ff8db5df709b 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java
@@ -3,7 +3,6 @@ package org.asamk.signal;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.core.JsonGenerator;

-import com.fasterxml.jackson.databind.DeserializationFeature;

 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 


@@ -23,8 +22,7 @@ public class JsonReceiveMessageHandler implements Manager.ReceiveMessageHandler
     public JsonReceiveMessageHandler(Manager m) {
         this.m = m;
         this.jsonProcessor = new ObjectMapper();
     public JsonReceiveMessageHandler(Manager m) {
         this.m = m;
         this.jsonProcessor = new ObjectMapper();

-        jsonProcessor.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); // disable autodetect
-        jsonProcessor.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+        jsonProcessor.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);

         jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
     }
 
         jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
     }
 

diff --git a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
index c4bdf3d9febc432f2493dfe5a462f5b82eade7c5..882f4a5c0131e1214e75618d2141462b64240f76 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
@@ -1,9 +1,6 @@
 package org.asamk.signal.commands;
 
 package org.asamk.signal.commands;
 

-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;

 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonGenerator;

-import com.fasterxml.jackson.databind.DeserializationFeature;

 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import net.sourceforge.argparse4j.impl.Arguments;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import net.sourceforge.argparse4j.impl.Arguments;


@@ -13,11 +10,10 @@ import net.sourceforge.argparse4j.inf.Subparser;
 import org.asamk.signal.manager.Manager;
 
 import java.io.IOException;
 import org.asamk.signal.manager.Manager;
 
 import java.io.IOException;

-import java.util.ArrayList;

 import java.util.HashSet;
 import java.util.HashSet;

-import java.util.Set;
-import java.util.Map;

 import java.util.List;
 import java.util.List;

+import java.util.Map;
+import java.util.stream.Collectors;

 
 public class GetUserStatusCommand implements LocalCommand {
 
 
 public class GetUserStatusCommand implements LocalCommand {
 


@@ -39,14 +35,12 @@ public class GetUserStatusCommand implements LocalCommand {
 
         // Setup the json object mapper
         ObjectMapper jsonProcessor = new ObjectMapper();
 
         // Setup the json object mapper
         ObjectMapper jsonProcessor = new ObjectMapper();

-        jsonProcessor.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); // disable autodetect
-        jsonProcessor.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);

         jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
 
         // Get a map of registration statuses
         Map<String, Boolean> registered;
         try {
         jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
 
         // Get a map of registration statuses
         Map<String, Boolean> registered;
         try {

-            registered = m.areUsersRegistered(new HashSet<>(ns.<String>getList("number")));
+            registered = m.areUsersRegistered(new HashSet<>(ns.getList("number")));

         } catch (IOException e) {
             System.err.println("Unable to check if users are registered");
             return 1;
         } catch (IOException e) {
             System.err.println("Unable to check if users are registered");
             return 1;


@@ -54,17 +48,17 @@ public class GetUserStatusCommand implements LocalCommand {
 
         // Output
         if (ns.getBoolean("json")) {
 
         // Output
         if (ns.getBoolean("json")) {

-            List<JsonIsRegistered> objects = new ArrayList<>();
-            for (Map.Entry<String, Boolean> entry : registered.entrySet()) {
-                objects.add(new JsonIsRegistered(entry.getKey(), entry.getValue()));
-            }
+            List<JsonIsRegistered> objects = registered.entrySet()
+                    .stream()
+                    .map(entry -> new JsonIsRegistered(entry.getKey(), entry.getValue()))
+                    .collect(Collectors.toList());

 
             try {
 
             try {

-                System.out.println(jsonProcessor.writeValueAsString(objects));
+                jsonProcessor.writeValue(System.out, objects);
+                System.out.println();

             } catch (IOException e) {
                 System.err.println(e.getMessage());
             }
             } catch (IOException e) {
                 System.err.println(e.getMessage());
             }

-

         } else {
             for (Map.Entry<String, Boolean> entry : registered.entrySet()) {
                 System.out.println(entry.getKey() + ": " + entry.getValue());
         } else {
             for (Map.Entry<String, Boolean> entry : registered.entrySet()) {
                 System.out.println(entry.getKey() + ": " + entry.getValue());


@@ -74,14 +68,15 @@ public class GetUserStatusCommand implements LocalCommand {
         return 0;
     }
 
         return 0;
     }
 

-    private class JsonIsRegistered {
-        String name;
-        boolean isRegistered;
+    private static final class JsonIsRegistered {
+
+        public String name;
+
+        public boolean isRegistered;

 
         public JsonIsRegistered(String name, boolean isRegistered) {
             this.name = name;
             this.isRegistered = isRegistered;
         }
     }
 
         public JsonIsRegistered(String name, boolean isRegistered) {
             this.name = name;
             this.isRegistered = isRegistered;
         }
     }

-

 }
 }

diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index bc68565ad09e2e84ab74fe972065d65da852c18e..84a918fbc021470eeca0a1560c600ddc643228b3 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -44,7 +44,7 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
         final ObjectMapper jsonProcessor;
         if (ns.getBoolean("json")) {
             jsonProcessor = new ObjectMapper();
         final ObjectMapper jsonProcessor;
         if (ns.getBoolean("json")) {
             jsonProcessor = new ObjectMapper();

-            jsonProcessor.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); // disable autodetect
+            jsonProcessor.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);

             jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
         } else {
             jsonProcessor = null;
             jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
         } else {
             jsonProcessor = null;

diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index e964d21830694efb7a8ee07d6a5db140bd6a5ad8..9a6afe700b9480093fe74d5bce11fb3e77c05d75 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -394,15 +394,11 @@ public class Manager implements Closeable {
         // Note "contactDetails" has no optionals. It only gives us info on users who are registered
         List<ContactTokenDetails> contactDetails = this.accountManager.getContacts(numbers);
 
         // Note "contactDetails" has no optionals. It only gives us info on users who are registered
         List<ContactTokenDetails> contactDetails = this.accountManager.getContacts(numbers);
 

-        // Make the initial map with all numbers set to false for now
-        Map<String, Boolean> usersRegistered = numbers.stream().collect(Collectors.toMap(x -> x, x -> false));
+        Set<String> registeredUsers = contactDetails.stream()
+                .map(ContactTokenDetails::getNumber)
+                .collect(Collectors.toSet());

 
 

-        // Override the contacts we did obtain
-        for (ContactTokenDetails contactDetail : contactDetails) {
-            usersRegistered.put(contactDetail.getNumber(), true);
-        }
-
-        return usersRegistered;
+        return numbers.stream().collect(Collectors.toMap(x -> x, registeredUsers::contains));

     }
 
     public void register(boolean voiceVerification, String captcha) throws IOException {
     }
 
     public void register(boolean voiceVerification, String captcha) throws IOException {


@@ -524,8 +520,7 @@ public class Manager implements Closeable {
     }
 
     public void verifyAccount(
     }
 
     public void verifyAccount(

-            String verificationCode,
-            String pin
+            String verificationCode, String pin

     ) throws IOException, KeyBackupSystemNoDataException, KeyBackupServicePinException {
         verificationCode = verificationCode.replace("-", "");
         account.setSignalingKey(KeyUtils.createSignalingKey());
     ) throws IOException, KeyBackupSystemNoDataException, KeyBackupServicePinException {
         verificationCode = verificationCode.replace("-", "");
         account.setSignalingKey(KeyUtils.createSignalingKey());