WolPlugin: Do not show entries if wol address is not in range (network host part differs).

Remove also unconfigured credentials and executables if a rescan is issued, not only connections.
SimpleUDP uses utf8 instead of latin1 codec.
AddToConfigured: Also update executables if a new/edited credential is saved.

Author: David Graeff

app/build.gradle

@@ -16,8 +16,8 @@ android {
     defaultConfig {
         minSdkVersion 17
         targetSdkVersion 22
-        versionCode 122
-        versionName "8.2"
+        versionCode 123
+        versionName "8.3"
         applicationId appID
         testApplicationId "oly.netpowerctrl.tests"
         testInstrumentationRunner "android.test.InstrumentationTestRunner"

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

@@ -334,8 +334,8 @@ public void clearDataStorage() {
     public void addToConfiguredDevices(Credentials credentials) {
         credentials.setConfigured(true);
         this.credentials.put(credentials);
-        connections.save(credentials.deviceUID);
-        executables.save(credentials.deviceUID);
+        ReachabilityStates r = connections.save(credentials.deviceUID);
+        executables.notifyReachability(credentials.deviceUID, r, true);
     }
 
     public void showNotificationForNextRefresh(boolean notificationAfterNextRefresh) {
@@ -381,6 +381,7 @@ public void onObserverJobFinished(DevicesObserver devicesObserver) {
     public void detectDevices() {
         if (observersStartStopRefresh.isRefreshing()) return;
         observersStartStopRefresh.onRefreshStateChanged(true);
+        credentials.clearNotConfigured();
         deviceQuery.addDeviceObserver(new DevicesObserver(new DevicesObserver.onDevicesObserverFinished() {
             @Override
             public void onObserverJobFinished(DevicesObserver devicesObserver) {
@@ -389,7 +390,6 @@ public void onObserverJobFinished(DevicesObserver devicesObserver) {
                 observersStartStopRefresh.onRefreshStateChanged(false);
             }
         }));
-        connections.clearNotConfigured();
         discoverExtensions();
         for (AbstractBasePlugin abstractBasePlugin : plugins) {
             abstractBasePlugin.requestData();
@@ -400,7 +400,7 @@ public void onObserverJobFinished(DevicesObserver devicesObserver) {
      * This is issued by the network observer if no network connection is active (no wlan, no mobile network)
      */
     public void makeAllOffline() {
-        connections.clearNotConfigured();
+        credentials.clearNotConfigured();
         connections.applyStateToAll(ReachabilityStates.NotReachable);
     }
 

app/src/main/java/oly/netpowerctrl/devices/CredentialsCollection.java

@@ -6,6 +6,7 @@
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import oly.netpowerctrl.data.AbstractBasePlugin;
@@ -65,8 +66,8 @@ public void put(Credentials credentials) {
     }
 
     public void remove(Credentials credentials) {
-        items.remove(credentials.getUid());
         storage.remove(credentials);
+        items.remove(credentials.getUid());
         notifyObservers(credentials, ObserverUpdateActions.RemoveAction);
     }
 
@@ -110,4 +111,18 @@ public int countConfigured() {
         return i;
     }
 
+    /**
+     * Clear all credentials where the object is in the non-configured state.
+     */
+    public void clearNotConfigured() {
+        for (Iterator<Credentials> iterator = items.values().iterator(); iterator.hasNext(); ) {
+            Credentials credentials = iterator.next();
+            if (!credentials.isConfigured()) {
+                dataService.connections.remove(credentials);
+                dataService.executables.remove(credentials);
+                iterator.remove();
+                notifyObservers(credentials, ObserverUpdateActions.RemoveAction);
+            }
+        }
+    }
 }

app/src/main/java/oly/netpowerctrl/executables/ExecutableCollection.java

@@ -131,13 +131,16 @@ public void removeOrphaned() {
      * Executables contain a member function for reachability we need to notify about reachability changes.
      *
      * @param deviceUID The device unique id
+     * @param save
      */
-    public void notifyReachability(String deviceUID, ReachabilityStates r) {
+    public void notifyReachability(String deviceUID, ReachabilityStates r, boolean save) {
         Log.w(TAG, "Reachability: " + r.name() + " " + deviceUID);
         for (Executable executable : items.values()) {
-            if (executable.needCredentials() &&
-                    executable.deviceUID.equals(deviceUID) && executable.updateCachedReachability(r))
+            if (!executable.deviceUID.equals(deviceUID)) continue;
+            if (executable.needCredentials() && executable.updateCachedReachability(r))
                 notifyObservers(executable, ObserverUpdateActions.UpdateReachableAction);
+            if (save)
+                storage.save(executable);
         }
     }
 
@@ -171,18 +174,6 @@ public List<Executable> filterExecutables(Credentials credentials) {
         return list;
     }
 
-    /**
-     * Save all connections that belong to the same device ID as the given credential object.
-     * This will not issue updated notifications even if the objects have changed since last save.
-     */
-    public void save(String deviceUID) {
-        for (Executable executable : items.values()) {
-            if (!executable.deviceUID.equals(deviceUID)) continue;
-            executable.setHasChanged();
-            put(executable);
-        }
-    }
-
     public interface PredicateExecutable {
         boolean accept(Executable e);
     }

app/src/main/java/oly/netpowerctrl/ioconnection/IOConnectionsCollection.java

@@ -107,7 +107,7 @@ private void putInternal(DeviceIOConnections deviceIOConnections, IOConnection i
             updateActions = ObserverUpdateActions.UpdateReachableAction;
             // Make executables aware of the change
             if (reachabilityChanged)
-                dataService.executables.notifyReachability(ioConnection.deviceUID, deviceIOConnections.reachableState());
+                dataService.executables.notifyReachability(ioConnection.deviceUID, deviceIOConnections.reachableState(), false);
         }
 
         if (ioConnection.hasChanged()) {
@@ -149,16 +149,17 @@ public void run() {
      * Save all connections that belong to the same device ID as the given credential object.
      * This will not issue updated notifications even if the objects have changed since last save.
      */
-    public void save(String deviceUID) {
+    public ReachabilityStates save(String deviceUID) {
         DeviceIOConnections deviceIOConnections = openDevice(deviceUID);
-        if (deviceIOConnections == null) return;
+        if (deviceIOConnections == null) return ReachabilityStates.NotReachable;
 
         for (Iterator<IOConnection> iterator = deviceIOConnections.iterator(); iterator.hasNext(); ) {
             IOConnection ioConnection = iterator.next();
             if (ioConnection.deviceUID.equals(deviceIOConnections.deviceUID)) {
                 storage.save(ioConnection);
             }
         }
+        return deviceIOConnections.reachableState();
     }
 
     public void remove(IOConnection ioConnection) {
@@ -201,21 +202,6 @@ public void remove(Credentials credentials) {
         items.remove(credentials.deviceUID);
     }
 
-    /**
-     * Clwar all connections where the credentials object is in the non-configured state.
-     * Connections are removed from disk, too if applicable.
-     */
-    public void clearNotConfigured() {
-        for (DeviceIOConnections deviceIOConnections : items.values())
-            for (Iterator<IOConnection> iterator = deviceIOConnections.iterator(); iterator.hasNext(); ) {
-                IOConnection ioConnection = iterator.next();
-                if (!ioConnection.credentials.isConfigured()) {
-                    iterator.remove();
-                    notifyObservers(ioConnection, ObserverUpdateActions.RemoveAction);
-                }
-            }
-    }
-
     @Nullable
     public DeviceIOConnections openDevice(String deviceUID) {
         return items.get(deviceUID);

app/src/main/java/oly/netpowerctrl/network/NetworkChangedBroadcastReceiver.java

@@ -42,6 +42,7 @@ public void onReceive(Context context, Intent intent) {
 
         Handler h = App.getMainThreadHandler();
         h.removeMessages(GuiThreadHandler.SERVICE_DELAYED_CHECK_REACHABILITY);
+        // Argument1: 0 if no network at all, !=0 if another network
         h.sendMessageDelayed(h.obtainMessage(GuiThreadHandler.SERVICE_DELAYED_CHECK_REACHABILITY, newNetInfo, 0), 2000);
     }
 

app/src/main/java/oly/netpowerctrl/network/UDPSend.java

@@ -24,7 +24,7 @@
  * For sending udp packets
  */
 public class UDPSend extends Thread {
-    private static UDPSend udpSend = new UDPSend();
+    private static UDPSend udpSend = null;
     private LinkedBlockingQueue<UDPCommand> q = new LinkedBlockingQueue<>();
 
     private UDPSend() {
@@ -33,6 +33,8 @@ private UDPSend() {
     }
 
     public static void killSendThread() {
+        if (udpSend == null || udpSend.q == null) return;
+        Log.w("UDPSEND", "killSendThread");
         UDPCommand command = new UDPCommand();
         udpSend.q.add(command);
     }
@@ -43,6 +45,7 @@ public static void sendBroadcast(Set<Integer> ports, byte[] message) {
         command.messages.add(message);
         command.errorID = UDPErrors.INQUERY_BROADCAST_REQUEST;
         command.ports = ports;
+        if (udpSend == null) udpSend = new UDPSend();
         udpSend.q.add(command);
     }
 
@@ -52,6 +55,7 @@ public static void sendMessage(@NonNull IOConnectionUDP ioConnection, byte[] mes
         command.errorID = UDPErrors.INQUERY_REQUEST;
         command.host = ioConnection.getDestinationHost();
         command.destPort = ioConnection.getDestinationPort();
+        if (udpSend == null) udpSend = new UDPSend();
         udpSend.q.add(command);
     }
 
@@ -141,14 +145,16 @@ public void run() {
                 j = q.take();
                 if (j.messages.isEmpty()) return;
             } catch (InterruptedException e) {
-                return;
+                break;
             }
 
             if (j.ports != null)
                 sendBroadcast(datagramSocket, j);
             else
                 send(datagramSocket, j);
         }
+
+        udpSend = null;
     }
 
     private static class UDPCommand {