Executable+IOConnection: missing writer.close(), so write didn't work. Add check and exception to capture this for the future.

Hidding/Showing of executables work.
Cache reachability state in executable instead of looking up ioconnections each time.

Author: David Graeff

app/src/main/java/oly/netpowerctrl/anel/AnelPlugin.java

@@ -3,7 +3,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.Log;
@@ -25,7 +24,6 @@
 import oly.netpowerctrl.data.AbstractBasePlugin;
 import oly.netpowerctrl.data.DataService;
 import oly.netpowerctrl.devices.Credentials;
-import oly.netpowerctrl.devices.DevicesObserver;
 import oly.netpowerctrl.executables.Executable;
 import oly.netpowerctrl.executables.ExecutableAndCommand;
 import oly.netpowerctrl.executables.ExecutableType;
@@ -105,10 +103,10 @@ public static String extractIDFromExecutableUID_s(String uid) {
 
     void fillExecutable(Executable executable, Credentials credentials, String uid, int value) {
         executable.ui_type = ExecutableType.TypeToggle;
-        executable.credentials = credentials;
         executable.deviceUID = credentials.getUid();
         executable.setUid(uid);
         executable.current_value = value;
+        executable.setCredentials(credentials);
     }
 
     Credentials createDefaultCredentials(String MacAddress) {
@@ -140,7 +138,7 @@ private int executeDeviceBatch(@NonNull IOConnection ioConnection,
             int success = 0;
             // Use Http instead of UDP for sending. For each batch command we will send a single http request
             for (ExecutableAndCommand c : command_list) {
-                boolean ok = executeViaHTTP(ioConnection, c.port, c.command);
+                boolean ok = executeViaHTTP(ioConnection, c.executable, c.command);
                 if (ok) ++success;
             }
             return success;
@@ -175,9 +173,9 @@ private int executeDeviceBatch(@NonNull IOConnection ioConnection,
 
         // Second step: Apply commands
         for (ExecutableAndCommand c : command_list) {
-            c.port.last_command_timecode = System.currentTimeMillis();
+            c.executable.setExecutionInProgress(true);
 
-            int id = extractIDFromExecutableUID(c.port.getUid());
+            int id = extractIDFromExecutableUID(c.executable.getUid());
             if (id >= 10 && id < 20) {
                 containsIO = true;
             } else if (id >= 0) {
@@ -217,13 +215,13 @@ private int executeDeviceBatch(@NonNull IOConnection ioConnection,
             data[0] = 'S';
             data[1] = 'w';
             data[2] = data_outlet;
-            new UDPSend(dataService, ioConnection, data, requestMessage, UDPErrors.INQUERY_REQUEST);
+            new UDPSend(ioConnection, data, requestMessage, UDPErrors.INQUERY_REQUEST);
         }
         if (containsIO) {
             data[0] = 'I';
             data[1] = 'O';
             data[2] = data_io;
-            new UDPSend(dataService, ioConnection, data, requestMessage, UDPErrors.INQUERY_REQUEST);
+            new UDPSend(ioConnection, data, requestMessage, UDPErrors.INQUERY_REQUEST);
         }
 
         return command_list.size();
@@ -325,7 +323,7 @@ public boolean executeViaHTTP(IOConnection ioConnection, Executable port, int co
      */
     @Override
     public boolean execute(@NonNull Executable executable, int command, onExecutionFinished callback) {
-        executable.last_command_timecode = System.currentTimeMillis();
+        executable.setExecutionInProgress(true);
 
         boolean bValue = false;
         if (command == Executable.ON)
@@ -359,14 +357,14 @@ else if (command == Executable.TOGGLE)
                 // IOS
                 data = String.format(Locale.US, "%s%d%s%s", bValue ? "IO_on" : "IO_off",
                         id - 10, credentials.userName, credentials.password).getBytes();
-                new UDPSend(dataService, ioConnection, data, requestMessage, UDPErrors.INQUERY_REQUEST);
+                new UDPSend(ioConnection, data, requestMessage, UDPErrors.INQUERY_REQUEST);
                 if (callback != null) callback.addSuccess();
                 return true;
             } else if (id >= 0) {
                 // Outlets
                 data = String.format(Locale.US, "%s%d%s%s", bValue ? "Sw_on" : "Sw_off",
                         id, credentials.userName, credentials.password).getBytes();
-                new UDPSend(dataService, ioConnection, data, requestMessage, UDPErrors.INQUERY_REQUEST);
+                new UDPSend(ioConnection, data, requestMessage, UDPErrors.INQUERY_REQUEST);
                 if (callback != null) callback.addSuccess();
                 return true;
             } else {
@@ -408,7 +406,7 @@ public void requestData(@NonNull IOConnection ioConnection) {
             HttpThreadPool.execute(new HttpThreadPool.HTTPRunner<>((IOConnectionHTTP) ioConnection,
                     "strg.cfg", "", ioConnection, false, AnelReceiveSendHTTP.receiveCtrlHtml));
         } else {
-            new UDPSend(dataService, ioConnection, requestMessage, UDPErrors.INQUERY_REQUEST);
+            new UDPSend(ioConnection, requestMessage, UDPErrors.INQUERY_REQUEST);
         }
     }
 
@@ -417,22 +415,6 @@ public Credentials createNewDefaultCredentials() {
         return createDefaultCredentials(UUID.randomUUID().toString());
     }
 
-    @Override
-    public long getUpdatedTime(Executable executable) {
-        DeviceIOConnections deviceIOConnections = dataService.connections.openDevice(executable.deviceUID);
-        if (deviceIOConnections == null) return 0;
-        IOConnection ioConnection = deviceIOConnections.findReachable();
-        if (ioConnection == null) return 0;
-        return ioConnection.getLastUsed();
-    }
-
-    @Override
-    public String getDeviceName(Executable executable) {
-        Credentials credentials = dataService.credentials.findByUID(executable.deviceUID);
-        if (credentials == null) throw new RuntimeException();
-        return credentials.deviceName;
-    }
-
     @Override
     public ReachabilityStates getReachableState(Executable executable) {
         DeviceIOConnections deviceIOConnections = dataService.connections.openDevice(executable.deviceUID);
@@ -531,7 +513,7 @@ public void executeTransaction(onExecutionFinished callback) {
 
         // add to tree
         for (ExecutableAndCommand executableAndCommand : command_list) {
-            DeviceIOConnections deviceIOConnections = dataService.connections.openDevice(executableAndCommand.port.deviceUID);
+            DeviceIOConnections deviceIOConnections = dataService.connections.openDevice(executableAndCommand.executable.deviceUID);
             if (deviceIOConnections == null) continue;
             IOConnection connection = deviceIOConnections.findReachable();
             if (connection == null) continue;
@@ -567,22 +549,22 @@ public String getLocalizedName() {
     public void checkDevicesReachabilityAfterNetworkChange() {
         Logging.getInstance().logEnergy("Anel: check availability");
 
-        startNetworkReceivers(false);
-
-        dataService.addDeviceObserver(new DevicesObserver(dataService.credentials.findByPlugin(this), new DevicesObserver.onDevicesObserverFinished() {
-            @Override
-            public void onObserverJobFinished(DevicesObserver devicesObserver) {
-                if (!devicesObserver.isAllTimedOut()) return;
-                //TODO
-                new AsyncTask<AnelPlugin, Void, Void>() {
-                    @Override
-                    protected Void doInBackground(AnelPlugin... plugin) {
-                        plugin[0].stopNetwork();
-                        return null;
-                    }
-                }.execute(AnelPlugin.this);
-            }
-        }));
+//        startNetworkReceivers(false);
+//
+//        dataService.addDeviceObserver(new DevicesObserver(dataService.credentials.findByPlugin(this), new DevicesObserver.onDevicesObserverFinished() {
+//            @Override
+//            public void onObserverJobFinished(DevicesObserver devicesObserver) {
+//                if (!devicesObserver.isAllTimedOut()) return;
+//                //TODO
+//                new AsyncTask<AnelPlugin, Void, Void>() {
+//                    @Override
+//                    protected Void doInBackground(AnelPlugin... plugin) {
+//                        plugin[0].stopNetwork();
+//                        return null;
+//                    }
+//                }.execute(AnelPlugin.this);
+//            }
+//        }));
     }
 
     @Override

app/src/main/java/oly/netpowerctrl/anel/AnelReceiveUDP.java

@@ -60,6 +60,7 @@ public void parsePacket(final byte[] message, int length, int receive_port, Inet
 
         Logging.getInstance().logDetect("UDP Device detected\n" + DeviceName);
 
+        // Create or get the credentials (device) object. It consists of a unique id, device name, username, password.
         DataService dataService = anelPlugin.getDataService();
         Credentials credentials = dataService.credentials.findByUID(MacAddress);
         if (credentials == null) {
@@ -70,9 +71,6 @@ public void parsePacket(final byte[] message, int length, int receive_port, Inet
         // We will filter out any disabled outlets
         int disabledOutlets = 0;
         int numOutlets = 8;
-
-        credentials.setDeviceName(DeviceName);
-
         int httpPort = 80;
 
         // For old firmwares
@@ -97,8 +95,47 @@ public void parsePacket(final byte[] message, int length, int receive_port, Inet
         if (msg.length > 25)
             credentials.version = msg[25].trim();
 
+        // Only update device name if it is empty, we do not want to overwrite the name given by the user.
+        if (credentials.deviceName.isEmpty())
+            credentials.setDeviceName(DeviceName);
+
+        // The order is important: First save the credentials, then save the connections, then save the executables.
+        // Because: connections need the credentials object. Executables need the reachability information of the connections.
+
         dataService.credentials.put(credentials);
 
+        // IO Connections
+        DeviceIOConnections deviceIOConnections = dataService.connections.openCreateDevice(MacAddress);
+
+        {
+            String ioConnection_uid = MacAddress + "UDP";
+            IOConnectionUDP ioConnection = (IOConnectionUDP) deviceIOConnections.findByUID(ioConnection_uid);
+            if (ioConnection == null)
+                ioConnection = new IOConnectionUDP(credentials);
+            ioConnection.setReceiveAddress(peer);
+            ioConnection.connectionUID = ioConnection_uid;
+            ioConnection.hostName = HostName;
+            ioConnection.PortUDPSend = SharedPrefs.getInstance().getDefaultSendPort();
+            ioConnection.PortUDPReceive = receive_port;
+            ioConnection.setStatusMessage(null);
+            ioConnection.incReceivedPackets();
+            dataService.connections.put(ioConnection);
+        }
+
+        {
+            String ioConnection_uid = MacAddress + "HTTP";
+            IOConnectionHTTP ioConnection = (IOConnectionHTTP) deviceIOConnections.findByUID(ioConnection_uid);
+            if (ioConnection == null)
+                ioConnection = new IOConnectionHTTP(credentials);
+            ioConnection.setReceiveAddress(peer);
+            ioConnection.connectionUID = ioConnection_uid;
+            ioConnection.hostName = HostName;
+            ioConnection.PortHttp = httpPort;
+            ioConnection.setStatusMessage(null);
+            dataService.connections.put(ioConnection);
+        }
+
+
         // IO ports
         if (msg.length > 25) {
             // 1-based id. IO output range: 11..19, IO input range is 21..29
@@ -119,6 +156,7 @@ public void parsePacket(final byte[] message, int length, int receive_port, Inet
             }
         }
 
+        // Executables
         for (int i = 0; i < numOutlets; i++) {
             String outlet[] = msg[6 + i].split(",");
             if (outlet.length < 1)
@@ -136,33 +174,5 @@ public void parsePacket(final byte[] message, int length, int receive_port, Inet
             dataService.executables.put(executable);
         }
 
-        DeviceIOConnections deviceIOConnections = dataService.connections.openCreateDevice(MacAddress);
-
-        {
-            String ioConnection_uid = MacAddress + "UDP";
-            IOConnectionUDP ioConnection = (IOConnectionUDP) deviceIOConnections.findByUID(ioConnection_uid);
-            if (ioConnection == null)
-                ioConnection = new IOConnectionUDP(credentials);
-            ioConnection.setReceiveAddress(peer);
-            ioConnection.connectionUID = ioConnection_uid;
-            ioConnection.hostName = HostName;
-            ioConnection.PortUDPSend = SharedPrefs.getInstance().getDefaultSendPort();
-            ioConnection.PortUDPReceive = receive_port;
-            ioConnection.setStatusMessage(null);
-            ioConnection.incReceivedPackets();
-            dataService.connections.put(ioConnection);
-        }
-
-        {
-            String ioConnection_uid = MacAddress + "HTTP";
-            IOConnectionHTTP ioConnection = (IOConnectionHTTP) deviceIOConnections.findByUID(ioConnection_uid);
-            if (ioConnection == null)
-                ioConnection = new IOConnectionHTTP(credentials);
-            ioConnection.setReceiveAddress(peer);
-            ioConnection.connectionUID = ioConnection_uid;
-            ioConnection.hostName = HostName;
-            ioConnection.PortHttp = httpPort;
-            dataService.connections.put(ioConnection);
-        }
     }
 }

app/src/main/java/oly/netpowerctrl/anel/AnelSendUDPBroadcastJob.java

@@ -2,7 +2,6 @@
 
 import android.util.Log;
 
-import java.net.DatagramSocket;
 import java.net.InetAddress;
 import java.net.InterfaceAddress;
 import java.net.NetworkInterface;
@@ -11,8 +10,8 @@
 import java.util.Set;
 
 import oly.netpowerctrl.data.DataService;
-import oly.netpowerctrl.main.App;
 import oly.netpowerctrl.network.UDPErrors;
+import oly.netpowerctrl.network.UDPSend;
 import oly.netpowerctrl.utils.Logging;
 
 /**
@@ -22,14 +21,14 @@ public class AnelSendUDPBroadcastJob {
     public static void run(DataService dataService) {
         Set<Integer> ports = dataService.connections.getAllSendPorts();
 
-        DatagramSocket datagramSocket;
-        try {
-            datagramSocket = new DatagramSocket();
-            datagramSocket.setBroadcast(true);
-        } catch (SocketException e) {
-            e.printStackTrace();
-            return;
-        }
+//        DatagramSocket datagramSocket;
+//        try {
+//            datagramSocket = new DatagramSocket();
+//            datagramSocket.setBroadcast(true);
+//        } catch (SocketException e) {
+//            e.printStackTrace();
+//            return;
+//        }
 
         boolean logDetect = Logging.getInstance().mLogDetect;
 
@@ -55,11 +54,12 @@ public static void run(DataService dataService) {
                             Logging.getInstance().logDetect("UDP Broadcast on " + broadcast.toString() + " Ports: " + portsString);
                         }
 
+                        Log.w("SendUDPBroadcastJob", "Broadcast Query");
+
                         //String portString = "";
                         for (int port : ports) {
+                            new UDPSend(broadcast, port, "wer da?\r\n".getBytes(), UDPErrors.INQUERY_BROADCAST_REQUEST);
                             //portString += " " + String.valueOf(port);
-                            UDPErrors.sendPacketHandleErrors(App.instance,
-                                    datagramSocket, broadcast, port, "wer da?\r\n".getBytes());
                         }
 
                         //Log.w("AnelSendUDPBroadcastJob", "Query " + portString);

app/src/main/java/oly/netpowerctrl/data/AbstractBasePlugin.java

@@ -101,9 +101,5 @@ public DataService getDataService() {
      */
     abstract public void addNewIOConnection(@NonNull Credentials credentials, @NonNull onNewIOConnection callback);
 
-    public abstract long getUpdatedTime(Executable executable);
-
-    public abstract String getDeviceName(Executable executable);
-
     public abstract ReachabilityStates getReachableState(Executable executable);
 }

app/src/main/java/oly/netpowerctrl/data/DataService.java

@@ -351,7 +351,7 @@ public boolean onPluginsReady(DataService dataService, List<AbstractBasePlugin>
         }
 
         observersServiceReady.onServiceReady(dataService);
-        refreshDevices();
+        refreshExistingDevices();
         return true;
     }
 
@@ -413,8 +413,8 @@ public void clear() {
      */
     public void addToConfiguredDevices(Credentials credentials) {
         credentials.setConfigured(true);
-        connections.save(credentials.deviceUID);
         this.credentials.put(credentials);
+        connections.save(credentials.deviceUID);
     }
 
     public void showNotificationForNextRefresh(boolean notificationAfterNextRefresh) {
@@ -431,10 +431,26 @@ public boolean onDataQueryFinished(DataService dataService) {
         return true;
     }
 
+    /**
+     * Refreshes all configured devices.
+     */
+    public void refreshExistingDevices() {
+        observersStartStopRefresh.onRefreshStateChanged(true);
+        addDeviceObserver(new DevicesObserver(credentials.getItems().values(), new DevicesObserver.onDevicesObserverFinished() {
+            @Override
+            public void onObserverJobFinished(DevicesObserver devicesObserver) {
+                //timers.checkAlarm(DataService.getService().alarmStartedTime());
+                Logging.getInstance().logEnergy("...fertig\n" + " Timeout: " + String.valueOf(devicesObserver.timedOutDevices().size()));
+                observersDataQueryCompleted.onDataQueryFinished(DataService.this);
+                observersStartStopRefresh.onRefreshStateChanged(false);
+            }
+        }));
+    }
+
     /**
      * Refreshes all configured devices (detect unreachable devices) and detect new un-configured devices.
      */
-    public void refreshDevices() {
+    public void detectDevices() {
         observersStartStopRefresh.onRefreshStateChanged(true);
         addDeviceObserver(new DevicesObserver(new DevicesObserver.onDevicesObserverFinished() {
             @Override