Version 1.9c

* Fix crashes caused by PluginController
* Only load PluginController if enabled
* PluginController works reliable now
* Support unloaded/vanished plugins
* Do not restore Activity with Feedback Dialog
* Fix problem with InetAddress.getByName in gui thread
* Send broadcast packets to all network interfaces
* Show better error messages if network is not reachable
* Query existing devices only, if network does not support broadcasts (2G, 3G)

Author: davidgraeff

.idea/workspace.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="oly.netpowerctrl"
-    android:versionCode="16"
-    android:versionName="1.9b">
+    android:versionCode="17"
+    android:versionName="1.9c">
 
 <!-- Api level 14: Android 4.0 15. Dezember 2011 -->
     <!-- Api level 16: Android 4.1 27. Juni 2012 -->

app/src/main/AndroidManifest.xml

@@ -3,8 +3,9 @@ package oly.netpowerctrl.plugins;
 import oly.netpowerctrl.plugins.INetPwrCtrlPluginResult;
 
 interface INetPwrCtrlPlugin {
-	void requestValues(INetPwrCtrlPluginResult cb);
-	void updateIntValue(int id, int value, INetPwrCtrlPluginResult cb);
-	void updateBooleanValue(int id, boolean value, INetPwrCtrlPluginResult cb);
-	void executeAction(int id, INetPwrCtrlPluginResult cb);
+	void init(INetPwrCtrlPluginResult cb);
+    void requestValues();
+    void updateIntValue(int id, int value);
+    void updateBooleanValue(int id, boolean value);
+    void executeAction(int id);
 }

app/src/main/aidl/oly/netpowerctrl/plugins/INetPwrCtrlPlugin.aidl

@@ -1,6 +1,7 @@
 package oly.netpowerctrl.plugins;
 
 interface INetPwrCtrlPluginResult {
+    void ready();
 	void intValue(int id, String name, int min, int max, int value);
 	void booleanValue(int id, String name, boolean value);
 	void action(int id, String name);

app/src/main/aidl/oly/netpowerctrl/plugins/INetPwrCtrlPluginResult.aidl

@@ -7,7 +7,6 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-import oly.netpowerctrl.datastructure.DeviceCommand;
 import oly.netpowerctrl.datastructure.DeviceInfo;
 import oly.netpowerctrl.main.NetpowerctrlApplication;
 
@@ -39,9 +38,7 @@ public DeviceQuery(Context context, DeviceUpdateStateOrTimeout target, DeviceInf
         // Register on main application object to receive device updates
         NetpowerctrlApplication.instance.addUpdateDeviceState(this);
 
-
-        // Send out broadcast
-        if (!DeviceSend.instance().sendQuery(context, device_to_observe.HostName, device_to_observe.SendPort, rangeCheck)) {
+        if (!DeviceSend.instance().sendQuery(device_to_observe.HostName, device_to_observe.SendPort, rangeCheck)) {
             // Device not in range, immediately timeout
             timeoutHandler.postDelayed(timeoutRunnable, 0);
         } else
@@ -60,10 +57,10 @@ public DeviceQuery(Context context, DeviceUpdateStateOrTimeout target,
 
         // Send out broadcast
         if (queryForNewDevices)
-            sendBroadcastQuery(context);
+            DeviceSend.instance().sendBroadcastQuery();
         else
             for (DeviceInfo di : devices_to_observe)
-                DeviceSend.instance().sendQuery(context, di.HostName, di.SendPort, rangeCheck);
+                DeviceSend.instance().sendQuery(di.HostName, di.SendPort, rangeCheck);
     }
 
     /**
@@ -88,20 +85,4 @@ public boolean notifyObservers(DeviceInfo received_data) {
         }
         return false;
     }
-
-    /**
-     * Used to be used only from the DeviceSend class for requesting an update
-     * after a command has been send
-     *
-     * @param context        Context
-     * @param device_command A DeviceCommand object containing destination IP, Port and commands
-     */
-    static void sendQuery(final Context context, DeviceCommand device_command) {
-        DeviceSend.instance().sendQuery(context, device_command.dest.getHostAddress(), device_command.port, false);
-    }
-
-    private static void sendBroadcastQuery(final Context context) {
-        for (int port : NetpowerctrlApplication.instance.getAllSendPorts())
-            DeviceSend.instance().sendQuery(context, "255.255.255.255", port, false);
-    }
 }

app/src/main/java/oly/netpowerctrl/anelservice/DeviceQuery.java

@@ -1,6 +1,8 @@
 package oly.netpowerctrl.anelservice;
 
 import android.content.Context;
+import android.util.Log;
+import android.widget.Toast;
 
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
@@ -9,14 +11,17 @@
 import java.net.NetworkInterface;
 import java.net.SocketException;
 import java.net.UnknownHostException;
-import java.nio.ByteBuffer;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Enumeration;
+import java.util.Iterator;
 import java.util.Locale;
+import java.util.Set;
 import java.util.concurrent.LinkedBlockingQueue;
 
 import oly.netpowerctrl.R;
 import oly.netpowerctrl.datastructure.DeviceCommand;
+import oly.netpowerctrl.datastructure.DeviceInfo;
 import oly.netpowerctrl.datastructure.OutletInfo;
 import oly.netpowerctrl.main.NetpowerctrlApplication;
 import oly.netpowerctrl.utils.ShowToast;
@@ -27,6 +32,9 @@
  */
 public class DeviceSend {
     private static final int INQUERY_REQUEST = 0;
+    private static final int INQUERY_BROADCAST_REQUEST = 1;
+    private static final int NETWORK_UNREACHABLE = 2;
+
     // Singleton
     static DeviceSend mInstance = new DeviceSend();
 
@@ -45,7 +53,7 @@ public void interrupt() {
     public void addSendJob(String hostname, int port, byte[] message, boolean broadcast, int errorID) throws UnknownHostException {
         if (!sendThread.isAlive())
             sendThread.start();
-        q.add(new SendJob(InetAddress.getByName(hostname), port, message, broadcast, errorID));
+        q.add(new SendJob(hostname, port, message, broadcast, errorID));
     }
 
     public void addSendJob(InetAddress ip, int port, byte[] message, boolean broadcast, int errorID) {
@@ -111,7 +119,8 @@ void process() {
     }
 
     class SendJob extends Job {
-        InetAddress ip;
+        InetAddress ip = null;
+        String hostname;
         int port;
         byte[] message;
         boolean broadcast;
@@ -125,23 +134,51 @@ class SendJob extends Job {
             this.errorID = errorID;
         }
 
+        SendJob(String hostname, int port, byte[] message, boolean broadcast, int errorID) {
+            this.hostname = hostname;
+            this.message = message;
+            this.port = port;
+            this.broadcast = broadcast;
+            this.errorID = errorID;
+        }
+
         @Override
         void process() {
             try {
+                if (hostname != null && hostname.length() > 0) {
+                    ip = InetAddress.getByName(hostname);
+                    hostname = "";
+                }
                 datagramSocket.setBroadcast(broadcast);
                 datagramSocket.send(new DatagramPacket(message, message.length, ip, port));
+            } catch (final SocketException e) {
+                if (e.getMessage().contains("ENETUNREACH"))
+                    onError(NETWORK_UNREACHABLE, ip, port, e);
+                else {
+                    e.printStackTrace();
+                    onError(errorID, ip, port, e);
+                }
             } catch (final Exception e) {
-                onError(errorID, e);
+                e.printStackTrace();
+                onError(errorID, ip, port, e);
             }
         }
     }
 
-    private void onError(int errorID, Exception e) {
+    private void onError(int errorID, InetAddress ip, int port, Exception e) {
         Context context = NetpowerctrlApplication.instance;
         switch (errorID) {
             case INQUERY_REQUEST:
                 ShowToast.FromOtherThread(context,
-                        context.getResources().getString(R.string.error_sending_inquiry) + ": " + e.getMessage());
+                        context.getResources().getString(R.string.error_sending_inquiry, ip.getHostAddress()) + ": " + e.getMessage());
+                break;
+            case INQUERY_BROADCAST_REQUEST:
+                ShowToast.FromOtherThread(context,
+                        context.getResources().getString(R.string.error_sending_broadcast_inquiry, port) + ": " + e.getMessage());
+                break;
+            case NETWORK_UNREACHABLE:
+                ShowToast.FromOtherThread(context,
+                        context.getResources().getString(R.string.error_not_in_range, ip.getHostAddress()));
                 break;
         }
     }
@@ -155,18 +192,65 @@ private byte[] generateAllOutletsDatagramBytes(final DeviceCommand device) {
         return data;
     }
 
-    boolean sendQuery(final Context context, final String hostname, final int port, boolean rangeCheck) {
-        if (rangeCheck) {
-            try {
-                if (!isIPinNetworkAddressPool(InetAddress.getByName(hostname))) {
-                    ShowToast.FromOtherThread(context, context.getResources().getString(R.string.error_not_in_range) + ": " + hostname);
-                    return false;
+    void sendBroadcastQuery() {
+        Set<Integer> ports = NetpowerctrlApplication.instance.getAllSendPorts();
+        boolean foundBroadcastAddresses = false;
+
+        Enumeration list;
+        try {
+            list = NetworkInterface.getNetworkInterfaces();
+
+            while (list.hasMoreElements()) {
+                NetworkInterface iface = (NetworkInterface) list.nextElement();
+
+                if (iface == null) continue;
+
+                if (!iface.isLoopback() && iface.isUp()) {
+
+                    Iterator it = iface.getInterfaceAddresses().iterator();
+                    while (it.hasNext()) {
+                        InterfaceAddress address = (InterfaceAddress) it.next();
+                        //System.out.println("Found address: " + address);
+                        if (address == null) continue;
+                        InetAddress broadcast = address.getBroadcast();
+                        if (broadcast == null) continue;
+                        for (int port : ports)
+                            addSendJob(broadcast, port, "wer da?\r\n".getBytes(), true, INQUERY_BROADCAST_REQUEST);
+                        foundBroadcastAddresses = true;
+                    }
                 }
-            } catch (final Exception e) {
-                ShowToast.FromOtherThread(context, context.getResources().getString(R.string.error_not_in_range) + ": " + hostname);
-                return false;
+            }
+        } catch (SocketException ex) {
+            Log.w("sendBroadcastQuery", "Error while getting network interfaces");
+            ex.printStackTrace();
+        }
+
+        if (!foundBroadcastAddresses) {
+            // Broadcast not allowed on this network. Show hint to user
+            Toast.makeText(NetpowerctrlApplication.instance,
+                    NetpowerctrlApplication.instance.getString(R.string.devices_no_new_on_network),
+                    Toast.LENGTH_SHORT).show();
+
+            // Query all existing devices directly
+            ArrayList<DeviceInfo> devices = NetpowerctrlApplication.instance.configuredDevices;
+            for (DeviceInfo di : devices) {
+                sendQuery(di.HostName, di.SendPort, false);
             }
         }
+    }
+
+    boolean sendQuery(final String hostname, final int port, boolean rangeCheck) {
+        if (rangeCheck) {
+//            try {
+//                if (!isIPinNetworkAddressPool(InetAddress.getByName(hostname))) {
+//                    ShowToast.FromOtherThread(context, context.getResources().getString(R.string.error_not_in_range) + ": " + hostname);
+//                    return false;
+//                }
+//            } catch (final SocketException e) {
+//                ShowToast.FromOtherThread(context, context.getResources().getString(R.string.error_not_in_range) + ": " + hostname+" "+e.getMessage());
+//                return false;
+//            }
+        }
         try {
             addSendJob(hostname, port, "wer da?\r\n".getBytes(), true, INQUERY_REQUEST);
         } catch (UnknownHostException e) {
@@ -218,28 +302,28 @@ public void sendOutlets(final Collection<DeviceCommand> device_commands, final b
             }
         }
     }
-
-    static private boolean isIPinNetworkAddressPool(InetAddress ip) throws SocketException {
-        byte[] ipAddressBytes = ip.getAddress();
-        // Iterate all NICs (network interface cards)...
-        for (Enumeration networkInterfaceEnumerator = NetworkInterface.getNetworkInterfaces(); networkInterfaceEnumerator.hasMoreElements(); ) {
-            NetworkInterface networkInterface = (NetworkInterface) networkInterfaceEnumerator.nextElement();
-            for (InterfaceAddress interfaceAddress : networkInterface.getInterfaceAddresses()) {
-                InetAddress interfaceIPAddress = interfaceAddress.getAddress();
-                byte[] interfaceIPBytes = interfaceIPAddress.getAddress();
-                if (ipAddressBytes.length != interfaceIPBytes.length)
-                    continue; // different ip versions
-
-                byte[] subNetMaskBytes = ByteBuffer.allocate(4).putInt(interfaceAddress.getNetworkPrefixLength()).array();
-                // check each byte of both addresses while applying the subNet mask
-                for (int i = 0; i < interfaceIPBytes.length; ++i) {
-                    if ((ipAddressBytes[i] & subNetMaskBytes[i]) !=
-                            (interfaceIPBytes[i] & subNetMaskBytes[i]))
-                        continue; // byte not identical, the ip is not for this network interface
-                }
-                return true;
-            }
-        }
-        return false;
-    }
+//
+//    static private boolean isIPinNetworkAddressPool(InetAddress ip) throws SocketException {
+//        byte[] ipAddressBytes = ip.getAddress();
+//        // Iterate all NICs (network interface cards)...
+//        for (Enumeration networkInterfaceEnumerator = NetworkInterface.getNetworkInterfaces(); networkInterfaceEnumerator.hasMoreElements(); ) {
+//            NetworkInterface networkInterface = (NetworkInterface) networkInterfaceEnumerator.nextElement();
+//            for (InterfaceAddress interfaceAddress : networkInterface.getInterfaceAddresses()) {
+//                InetAddress interfaceIPAddress = interfaceAddress.getAddress();
+//                byte[] interfaceIPBytes = interfaceIPAddress.getAddress();
+//                if (ipAddressBytes.length != interfaceIPBytes.length)
+//                    continue; // different ip versions
+//
+//                byte[] subNetMaskBytes = ByteBuffer.allocate(4).putInt(interfaceAddress.getNetworkPrefixLength()).array();
+//                // check each byte of both addresses while applying the subNet mask
+//                for (int i = 0; i < interfaceIPBytes.length; ++i) {
+//                    if ((ipAddressBytes[i] & subNetMaskBytes[i]) !=
+//                            (interfaceIPBytes[i] & subNetMaskBytes[i]))
+//                        continue; // byte not identical, the ip is not for this network interface
+//                }
+//                return true;
+//            }
+//        }
+//        return false;
+//    }
 }