Add support for getters.

As example getters for wifi connection (boolean) and wifi SSID (string) were
added.

app/src/main/java/com/codigoparallevar/minicards/bridge/blocks/BridgeBlockListBuilder.java

@@ -1,6 +1,6 @@
 package com.codigoparallevar.minicards.bridge.blocks;
 
-import com.codigoparallevar.minicards.types.functional.Consumer;
+import com.codigoparallevar.minicards.types.functional.Function;
 import com.programaker.bridge.ProgramakerBridgeConfigurationBlock;
 
 import java.util.LinkedList;
@@ -20,10 +20,26 @@ public class BridgeBlockListBuilder {
 
     public BridgeBlockListBuilder addOperation(String id, String message,
                                                List<BlockArgumentDefinition> arguments,
-                                               Consumer<List<? extends Object>> operation) {
+                                               Function<List<?>, Void> operation) {
         return this.addOperation(new OperationBlockDefinition(id, message, arguments, operation));
     }
 
+    private BridgeBlockListBuilder addOperation(ProgramakerBridgeConfigurationBlock block) {
+        this.blockList.add(block);
+        return this;
+    }
+
+    public BridgeBlockListBuilder addGetter(String id, String message,
+                                            List<BlockArgumentDefinition> arguments,
+                                            Function<List<?>, ?> operation) {
+        return this.addGetter(new GetterBlockDefinition(id, message, arguments, operation));
+    }
+
+    private BridgeBlockListBuilder addGetter(ProgramakerBridgeConfigurationBlock block) {
+        this.blockList.add(block);
+        return this;
+    }
+
     public BridgeBlockListBuilder addTrigger(String id, String message,
                                              List<BlockArgumentDefinition> arguments,
                                              String key) {
@@ -35,10 +51,4 @@ public class BridgeBlockListBuilder {
 
         return this;
     }
-
-    private BridgeBlockListBuilder addOperation(ProgramakerBridgeConfigurationBlock block) {
-        this.blockList.add(block);
-
-        return this;
-    }
 }

app/src/main/java/com/codigoparallevar/minicards/bridge/blocks/DefaultAndroidBlocks.java

@@ -4,6 +4,9 @@ import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.content.Context;
+import android.net.wifi.SupplicantState;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.os.VibrationEffect;
 import android.os.Vibrator;
@@ -80,6 +83,8 @@ public class DefaultAndroidBlocks {
 
                             int notificationId = notificationRandom.nextInt();
                             notificationManager.notify(notificationId, notif);
+
+                            return null;
                         }
                 )
                 .addOperation(
@@ -88,6 +93,8 @@ public class DefaultAndroidBlocks {
                         Collections.emptyList(),
                         (List<?> params) -> {
                             notificationManager.cancelAll();
+
+                            return null;
                         }
                 )
                 .addOperation(
@@ -141,21 +148,59 @@ public class DefaultAndroidBlocks {
                                 // Remove notification
                                 notificationManager.cancel(notificationId);
                             }).start();
+
+                            return null;
                         }
                 )
                 ;
 
+        // GETTERS
+        builder.addGetter(
+                "wifi_is_connected",
+                "Is WIFI connected?",
+                Collections.emptyList(),
+                (List<?> params) -> {
+                    WifiManager wifiManager = (WifiManager) ctx.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+                    assert wifiManager != null;
+                    WifiInfo wifiInfo = wifiManager.getConnectionInfo();
+
+                    if (wifiInfo == null) {
+                        return false;
+                    }
+
+                    return wifiInfo.getSupplicantState() == SupplicantState.COMPLETED;
+                })
+        .addGetter(
+                "wifi_get_ssid",
+                "Get WIFI SSID",
+                Collections.emptyList(),
+                (List<?> params) -> {
+                    WifiManager wifiManager = (WifiManager) ctx.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+                    assert wifiManager != null;
+                    WifiInfo wifiInfo = wifiManager.getConnectionInfo();
+
+                    if (wifiInfo == null) {
+                        return null;
+                    }
+
+                    if (wifiInfo.getSupplicantState() != SupplicantState.COMPLETED) {
+                        return null;
+                    }
+
+                    return wifiInfo.getSSID();
+                });
+
         // Signal blocks
         builder
                 .addTrigger(
                         "on_wifi_connected",
-                        "When WIFI connects",
+                        "When WIFI connection is ESTABLISHED",
                         Collections.emptyList(),// TODO: Save content to variable
                         "on_wifi_connected"
                 )
                 .addTrigger(
                         "on_wifi_disconnected",
-                        "When WIFI connection is lost",
+                        "When WIFI connection is LOST",
                         Collections.emptyList(),
                         "on_wifi_disconnected"
                 );

app/src/main/java/com/codigoparallevar/minicards/bridge/blocks/GetterBlockDefinition.java

@@ -0,0 +1,65 @@
+package com.codigoparallevar.minicards.bridge.blocks;
+
+import android.util.Log;
+
+import com.codigoparallevar.minicards.types.functional.Function;
+import com.programaker.bridge.ProgramakerBridgeConfigurationBlock;
+
+import org.jetbrains.annotations.NotNull;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.List;
+
+class GetterBlockDefinition implements ProgramakerBridgeConfigurationBlock {
+    private final static String LogTag = "PM GetterBlockDef";
+
+    private final String id;
+    private final String message;
+    private final List<BlockArgumentDefinition> args;
+    private final Function<List<?>, ?> operation;
+
+    public GetterBlockDefinition(String id, String message, List<BlockArgumentDefinition> args, Function<List<?>, ?> operation) {
+        this.id = id;
+        this.message = message;
+        this.args = args;
+        this.operation = operation;
+    }
+
+    @NotNull
+    @Override
+    public JSONObject serialize() {
+        JSONObject obj = new JSONObject();
+
+        try {
+            JSONArray arguments = new JSONArray();
+            for (BlockArgumentDefinition arg : this.args) {
+                arguments.put(arg.serialize());
+            }
+
+            obj.put("id", this.id);
+            obj.put("function_name", this.id);
+            obj.put("message", this.message);
+            obj.put("block_type", "getter");
+            obj.put("block_result_type", JSONObject.NULL); // TODO: Properly declare type
+            obj.put("arguments", arguments);
+            obj.put("save_to",  JSONObject.NULL);
+        } catch (JSONException ex) {
+            Log.e(LogTag, "Error serializing block definition: " + ex, ex);
+        }
+
+        return obj;
+    }
+
+    @NotNull
+    @Override
+    public String getFunctionName() {
+        return this.id;
+    }
+
+    @Override
+    public Object call(@NotNull List<?> arguments) throws Exception {
+        return this.operation.apply(arguments);
+    }
+}

app/src/main/java/com/codigoparallevar/minicards/bridge/blocks/OperationBlockDefinition.java

@@ -2,7 +2,7 @@ package com.codigoparallevar.minicards.bridge.blocks;
 
 import android.util.Log;
 
-import com.codigoparallevar.minicards.types.functional.Consumer;
+import com.codigoparallevar.minicards.types.functional.Function;
 import com.programaker.bridge.ProgramakerBridgeConfigurationBlock;
 
 import org.jetbrains.annotations.NotNull;
@@ -18,9 +18,9 @@ class OperationBlockDefinition implements ProgramakerBridgeConfigurationBlock {
     private final String id;
     private final String message;
     private final List<BlockArgumentDefinition> args;
-    private final Consumer<List<?>> operation;
+    private final Function<List<?>, Void> operation;
 
-    public OperationBlockDefinition(String id, String message, List<BlockArgumentDefinition> args, Consumer<List<? extends Object>> operation) {
+    public OperationBlockDefinition(String id, String message, List<BlockArgumentDefinition> args, Function<List<?>, Void> operation) {
         this.id = id;
         this.message = message;
         this.args = args;
@@ -59,7 +59,7 @@ class OperationBlockDefinition implements ProgramakerBridgeConfigurationBlock {
     }
 
     @Override
-    public void call(@NotNull List<?> arguments) throws Exception {
+    public Object call(@NotNull List<?> arguments) throws Exception {
-        this.operation.apply(arguments);
+        return this.operation.apply(arguments);
     }
 }

app/src/main/java/com/codigoparallevar/minicards/bridge/blocks/TriggerBlockDefinition.java

@@ -61,7 +61,7 @@ class TriggerBlockDefinition implements ProgramakerBridgeConfigurationBlock {
     }
 
     @Override
-    public void call(@NotNull List<?> arguments) throws Exception {
+    public Object call(@NotNull List<?> arguments) throws Exception {
         throw new IllegalArgumentException("Non executable block");
     }
 }

app/src/main/java/com/codigoparallevar/minicards/types/functional/Function.java

@@ -0,0 +1,5 @@
+package com.codigoparallevar.minicards.types.functional;
+
+public interface Function<T, U> {
+    U apply(T param) throws Exception;
+}

app/src/main/java/com/codigoparallevar/minicards/utils/Serializations.java

@@ -1,6 +1,10 @@
 package com.codigoparallevar.minicards.utils;
 
+import android.util.Log;
+
+import org.jetbrains.annotations.NotNull;
 import org.json.JSONArray;
+import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.List;
@@ -8,6 +12,8 @@ import java.util.Map;
 
 public class Serializations {
 
+    private static final String LogTag = "Serialization";
+
     public static JSONArray serialize(List<Map<String,String>> data) {
         JSONArray array = new JSONArray();
         for (Map<String, String> dict : data) {
@@ -16,4 +22,54 @@ public class Serializations {
 
         return array;
     }
+
+    @NotNull
+    public static Object blindSerialize(Object obj) {
+        if (obj == null) {
+            return JSONObject.NULL;
+        }
+        // No serialization needed
+        else if (obj.getClass().isPrimitive() ||
+                obj instanceof String ||
+                obj instanceof JSONObject ||
+                obj instanceof JSONArray) {
+
+            return obj;
+        }
+
+        try {
+            return _blindSerialize(obj);
+        }
+        catch (Exception ex) {
+            Log.w(LogTag, "Error serialization: " + obj, ex);
+            return obj;
+        }
+    }
+
+    private static Object _blindSerialize(Object obj) throws JSONException {
+        if (obj instanceof Map) {
+            Map<?,?> objMap = (Map<?,?>) obj;
+
+            JSONObject map = new JSONObject();
+
+            for (Map.Entry<?,?> entry : objMap.entrySet()) {
+                map.put(entry.getKey().toString(), blindSerialize(entry.getValue()));
+            }
+
+            return map;
+        }
+        else if (obj instanceof Iterable) {
+            Iterable objIt = (Iterable) obj;
+
+            JSONArray arr = new JSONArray();
+            for (Object val : objIt) {
+                arr.put(blindSerialize(val));
+            }
+            return arr;
+        }
+        else {
+            // Unknown case
+            return obj;
+        }
+    }
 }

app/src/main/java/com/programaker/bridge/ProgramakerBridge.kt

@@ -1,6 +1,7 @@
 package com.programaker.bridge
 
 import android.util.Log
+import com.codigoparallevar.minicards.utils.Serializations
 import com.google.gson.Gson
 import okhttp3.*
 import okio.ByteString
@@ -113,9 +114,9 @@ class ProgramakerBridge(
         val arguments = value.get("arguments") as List<*>
 
         try {
-            config.callFunction(functionName, arguments)
+            var result = config.callFunction(functionName, arguments)
+            result = Serializations.blindSerialize(result)
 
-            val result = JSONObject.NULL
             webSocket.send(
                     JSONObject(
                             hashMapOf(

app/src/main/java/com/programaker/bridge/ProgramakerBridgeConfiguration.kt

@@ -36,9 +36,10 @@ class ProgramakerBridgeConfiguration(
         return wrapper.toString()
     }
 
-    fun callFunction(functionName: String, arguments: List<*>) {
+    fun callFunction(functionName: String, arguments: List<*>): Any {
         for (block in blocks) {
-            if (block.getFunctionName() == functionName) {
+            val blockFunction = block.getFunctionName()
+            if (blockFunction != null && blockFunction == functionName) {
                 return block.call(arguments)
             }
         }

app/src/main/java/com/programaker/bridge/ProgramakerBridgeConfigurationBlock.kt

@@ -3,9 +3,9 @@ package com.programaker.bridge
 import org.json.JSONObject
 
 interface ProgramakerBridgeConfigurationBlock {
-    fun serialize() : JSONObject;
+    fun serialize() : JSONObject
-    fun getFunctionName(): String;
+    fun getFunctionName(): String
 
     @Throws(Exception::class)
-    fun call(arguments: List<*>)
+    fun call(arguments: List<*>): Any
 }

app/src/main/res/values/strings.xml

@@ -19,9 +19,9 @@
     <string name="back_to_deck">Back to card Deck</string>
     <string name="go_back">Go back</string>
     <string name="bridge_service_not_started">Programaker bridge not started</string>
-    <string name="bridge_service_starting">Programaker bridge starting</string>
+    <string name="bridge_service_starting">Programaker bridge connecting...</string>
     <string name="bridge_service_online">Programaker bridge online</string>
-    <string name="bridge_service_failed_restarting">Programaker bridge failed, restarting...</string>
+    <string name="bridge_service_failed_restarting">Programaker bridge reconnecting...</string>
     <string name="bridge_service_failed_stopping">Programaker bridge stopped</string>
     <string name="stop_bridge">Stop bridge</string>
     <string name="start_bridge">Start bridge</string>