From: AsamK <asamk@gmx.de>
Date: Tue, 24 Aug 2021 10:37:40 +0000 (+0200)
Subject: Accept single values for jsonrpc requests where a list is expected
X-Git-Tag: v0.9.0~49
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/8c661c23be6e2232af902f0d20cd7e747077ab9d?ds=inline

Accept single values for jsonrpc requests where a list is expected
---

diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
index 06124ffd..24b45ee8 100644
--- a/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
@@ -40,6 +40,7 @@ public interface JsonRpcLocalCommand extends JsonRpcCommand<Map<String, Object>>
             super(attrs);
         }
 
+        @Override
         public <T> T get(String dest) {
             final T value = super.get(dest);
             if (value != null) {
@@ -52,9 +53,13 @@ public interface JsonRpcLocalCommand extends JsonRpcCommand<Map<String, Object>>
 
         @Override
         public <E> List<E> getList(final String dest) {
-            final List<E> value = super.getList(dest);
-            if (value != null) {
-                return value;
+            try {
+                final List<E> value = super.getList(dest);
+                if (value != null) {
+                    return value;
+                }
+            } catch (ClassCastException e) {
+                return List.of(this.<E>get(dest));
             }
 
             return super.getList(dest + "s");