Crash fix, Optimization, Smoothness

* Drag & Drop of Scenes and Outlets in ListViews (not Gridviews atm)
* Polished UI, more feedback, wifi state changes, Reachability
* Fix: 8th Outlet can be toggled in scenes now
* Plugins: Find by Broadcast

Author: davidgraeff

.idea/workspace.xml

@@ -13,6 +13,7 @@
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 
     <permission

app/src/main/AndroidManifest.xml

@@ -6,8 +6,13 @@
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
 import java.net.InetAddress;
+import java.net.InterfaceAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Enumeration;
 import java.util.Iterator;
 
 import oly.netpowerctrl.R;
@@ -31,25 +36,30 @@ public class DeviceQuery {
         public void run() {
             for (DeviceInfo di : devices_to_observe)
                 target.onDeviceTimeout(di);
-            freeSelf();
+            target.onDeviceQueryFinished(devices_to_observe.size());
+            NetpowerctrlApplication.instance.removeUpdateDeviceState(DeviceQuery.this);
         }
     };
 
-    public DeviceQuery(Context context, DeviceUpdateStateOrTimeout target, DeviceInfo device_to_observe) {
+    public DeviceQuery(Context context, DeviceUpdateStateOrTimeout target, DeviceInfo device_to_observe, boolean rangeCheck) {
         this.target = target;
         this.devices_to_observe = new ArrayList<DeviceInfo>();
         devices_to_observe.add(device_to_observe);
 
         // Register on main application object to receive device updates
         NetpowerctrlApplication.instance.addUpdateDeviceState(this);
 
-        timeoutHandler.postDelayed(timeoutRunnable, 1200);
+
         // Send out broadcast
-        sendQuery(context, device_to_observe.HostName, device_to_observe.SendPort);
+        if (!sendQuery(context, device_to_observe.HostName, device_to_observe.SendPort, rangeCheck)) {
+            // Device not in range, immediately timeout
+            timeoutHandler.postDelayed(timeoutRunnable, 0);
+        } else
+            timeoutHandler.postDelayed(timeoutRunnable, 1200);
     }
 
     public DeviceQuery(Context context, DeviceUpdateStateOrTimeout target,
-                       Collection<DeviceInfo> devices_to_observe, boolean queryForNewDevices) {
+                       Collection<DeviceInfo> devices_to_observe, boolean queryForNewDevices, boolean rangeCheck) {
         this.target = target;
         this.devices_to_observe = new ArrayList<DeviceInfo>(devices_to_observe);
 
@@ -63,10 +73,16 @@ public DeviceQuery(Context context, DeviceUpdateStateOrTimeout target,
             sendBroadcastQuery(context);
         else
             for (DeviceInfo di : devices_to_observe)
-                sendQuery(context, di.HostName, di.SendPort);
+                sendQuery(context, di.HostName, di.SendPort, rangeCheck);
     }
 
-    public void notifyAndRemove(DeviceInfo received_data) {
+    /**
+     * Return true if all devices responded and this DeviceQuery object
+     * have to be removed.
+     *
+     * @param received_data
+     */
+    public boolean notifyObservers(DeviceInfo received_data) {
         Iterator<DeviceInfo> it = devices_to_observe.iterator();
         while (it.hasNext()) {
             DeviceInfo device_to_observe = it.next();
@@ -77,13 +93,10 @@ public void notifyAndRemove(DeviceInfo received_data) {
         }
         if (devices_to_observe.isEmpty()) {
             timeoutHandler.removeCallbacks(timeoutRunnable);
-            freeSelf();
+            target.onDeviceQueryFinished(devices_to_observe.size());
+            return true;
         }
-    }
-
-    private void freeSelf() {
-        target.onDeviceQueryFinished(devices_to_observe.size());
-        NetpowerctrlApplication.instance.removeUpdateDeviceState(this);
+        return false;
     }
 
     /**
@@ -94,10 +107,21 @@ private void freeSelf() {
      * @param device_command
      */
     static void sendQuery(final Context context, DeviceCommand device_command) {
-        sendQuery(context, device_command.dest.getHostAddress(), device_command.port);
+        sendQuery(context, device_command.dest.getHostAddress(), device_command.port, false);
     }
 
-    private static void sendQuery(final Context context, final String hostname, final int port) {
+    private static 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;
+                }
+            } catch (final Exception e) {
+                ShowToast.FromOtherThread(context, context.getResources().getString(R.string.error_not_in_range) + ": " + hostname);
+                return false;
+            }
+        }
         new Thread(new Runnable() {
             public void run() {
                 try {
@@ -115,10 +139,35 @@ public void run() {
                 }
             }
         }).start();
+        return true;
     }
 
     private static void sendBroadcastQuery(final Context context) {
         for (int port : NetpowerctrlApplication.instance.getAllSendPorts())
-            sendQuery(context, "255.255.255.255", port);
+            sendQuery(context, "255.255.255.255", port, 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;
     }
 }

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

@@ -73,6 +73,7 @@ void parsePacket(final String message, int receive_port) {
         di.HostName = msg[2];
         di.MacAddress = msg[5];
         di.ReceivePort = receive_port;
+        di.reachable = true;
 
         int disabledOutlets = 0;
         int numOutlets = 8; // normally, the device sends info for 8 outlets no matter how many are actually equipped

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

@@ -43,7 +43,7 @@ public DeviceCommand(DeviceInfo di) {
     }
 
     public boolean getIsOn(int outletNumber) {
-        return ((data & ((byte) (1 << outletNumber - 1))) > 0);
+        return ((data & ((byte) (1 << (outletNumber - 1)))) != 0);
     }
 
     private void switchOn(int outletNumber) {
@@ -55,7 +55,7 @@ private void switchOff(int outletNumber) {
     }
 
     private void toggle(int outletNumber) {
-        if ((data & ((byte) (1 << outletNumber - 1))) > 0) {
+        if (getIsOn(outletNumber)) {
             switchOff(outletNumber);
         } else {
             switchOn(outletNumber);

app/src/main/java/oly/netpowerctrl/datastructure/DeviceCommand.java

@@ -0,0 +1,7 @@
+package oly.netpowerctrl.dragdrop;
+
+public interface DragDropEnabled {
+    void setDragDropEnabled(boolean d);
+
+    boolean isDragDropEnabled();
+}

app/src/main/java/oly/netpowerctrl/dragdrop/DragDropEnabled.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2010 Eric Harlow
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package oly.netpowerctrl.dragdrop;
+
+import android.view.View;
+
+/**
+ * Implement to handle an item being dragged.
+ *
+ * @author Eric Harlow
+ */
+public interface DragListener {
+    /**
+     * Called when a drag starts.
+     *
+     * @param itemView - the view of the item to be dragged i.e. the drag view
+     */
+    void onStartDrag(View itemView);
+
+    /**
+     * Called when a drag stops.
+     * Any changes in onStartDrag need to be undone here
+     * so that the view can be used in the list again.
+     *
+     * @param itemView - the view of the item to be dragged i.e. the drag view
+     */
+    void onStopDrag(View itemView);
+}