Improve reaction to network connected/disconnected states. Resend handler.

* Widgets work now as expected when network state changes.
* AfterSendHandler removed, SendJobRepeater introduced. Works for single outlets, scenes and widgets.

Author: David Gräff

.idea/workspace.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="oly.netpowerctrl"
-    android:versionCode="22"
-    android:versionName="2.2b">
+    android:versionCode="25"
+    android:versionName="2.3b">
 
-<!-- Api level 14: Android 4.0 15. Dezember 2011 -->
+    <!-- Api level 14: Android 4.0 15. Dezember 2011 -->
     <!-- Api level 16: Android 4.1 27. Juni 2012 -->
     <!--<uses-sdk
         android:minSdkVersion="14"
@@ -32,6 +32,7 @@
             android:name="oly.netpowerctrl.main.NetpowerctrlActivity"
             android:label="@string/app_name"
             android:launchMode="singleTask"
+            android:theme="@style/Theme.StartTheme"
             android:configChanges="orientation|screenSize|keyboardHidden|layoutDirection">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -70,11 +71,12 @@
         </activity>
 
         <activity
+            android:name="oly.netpowerctrl.shortcut.ShortcutCreatorActivity"
             android:icon="@drawable/netpowerctrl"
             android:label="@string/app_name_shortcut"
             android:description="@string/app_name_shortcut_desc"
-            android:configChanges="orientation|screenSize|keyboardHidden|layoutDirection"
-            android:name="oly.netpowerctrl.shortcut.ShortcutCreatorActivity">
+            android:theme="@style/Theme.StartTheme"
+            android:configChanges="orientation|screenSize|keyboardHidden|layoutDirection">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT" />
                 <category android:name="android.intent.category.DEFAULT" />

app/src/main/AndroidManifest.xml

@@ -5,6 +5,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
 
 import oly.netpowerctrl.datastructure.DeviceInfo;
 import oly.netpowerctrl.main.NetpowerctrlApplication;
@@ -16,10 +17,9 @@
  * all scenes to query.
  */
 public class DeviceQuery {
-    private Collection<DeviceInfo> devices_to_observe;
+    private List<DeviceInfo> devices_to_observe;
     private DeviceUpdateStateOrTimeout target;
     private Handler timeoutHandler = new Handler();
-    private boolean foundBroudcastQueries = false;
 
     private Runnable timeoutRunnable = new Runnable() {
         @Override
@@ -29,26 +29,17 @@ public void run() {
                 return;
 
             if (devices_to_observe.isEmpty()) {
-                target.onDeviceQueryFinished(devices_to_observe.size());
+                target.onDeviceQueryFinished(devices_to_observe);
+                NetpowerctrlApplication.instance.removeUpdateDeviceState(DeviceQuery.this);
                 return;
             }
 
-            // Special case: We are able to send broadcasts, but nevertheless not all
-            // configured devices responded, we will send specific queries now
-            if (foundBroudcastQueries) {
-                foundBroudcastQueries = false;
-                for (DeviceInfo di : devices_to_observe) {
-                    DeviceSend.instance().sendQuery(di.HostName, di.SendPort);
-                }
-                // New timeout
-                timeoutHandler.postDelayed(timeoutRunnable, 1200);
-            } else {
-                for (DeviceInfo di : devices_to_observe) {
-                    di.reachable = false;
-                    target.onDeviceTimeout(di);
-                }
-                target.onDeviceQueryFinished(devices_to_observe.size());
+            for (DeviceInfo di : devices_to_observe) {
+                di.reachable = false;
+                target.onDeviceTimeout(di);
             }
+            NetpowerctrlApplication.instance.removeUpdateDeviceState(DeviceQuery.this);
+            target.onDeviceQueryFinished(devices_to_observe);
         }
     };
 
@@ -60,7 +51,7 @@ public DeviceQuery(DeviceUpdateStateOrTimeout target, DeviceInfo device_to_obser
         // Register on main application object to receive device updates
         NetpowerctrlApplication.instance.addUpdateDeviceState(this);
 
-        DeviceSend.instance().sendQuery(device_to_observe.HostName, device_to_observe.SendPort);
+        DeviceSend.instance().sendQuery(device_to_observe);
         timeoutHandler.postDelayed(timeoutRunnable, 1200);
     }
 
@@ -75,7 +66,7 @@ public DeviceQuery(DeviceUpdateStateOrTimeout target, Collection<DeviceInfo> dev
 
         // Send out broadcast
         for (DeviceInfo di : devices_to_observe)
-            DeviceSend.instance().sendQuery(di.HostName, di.SendPort);
+            DeviceSend.instance().sendQuery(di);
     }
 
     /**
@@ -92,7 +83,7 @@ public DeviceQuery(DeviceUpdateStateOrTimeout target) {
         NetpowerctrlApplication.instance.addUpdateDeviceState(this);
 
         timeoutHandler.postDelayed(timeoutRunnable, 1200);
-        foundBroudcastQueries = DeviceSend.instance().sendBroadcastQuery();
+        DeviceSend.instance().sendBroadcastQuery();
     }
 
     /**
@@ -114,9 +105,23 @@ public boolean notifyObservers(DeviceInfo received_data) {
         if (devices_to_observe.isEmpty()) {
             timeoutHandler.removeCallbacks(timeoutRunnable);
             if (target != null)
-                target.onDeviceQueryFinished(devices_to_observe.size());
+                target.onDeviceQueryFinished(devices_to_observe);
             return true;
         }
         return false;
     }
+
+    /**
+     * Called right before this object is removed from the Application list
+     * of DeviceQueries because the listener service has been shutdown. All
+     * remaining device queries of this object have to timeout now.
+     */
+    public void finishWithTimeouts() {
+        timeoutHandler.removeCallbacks(timeoutRunnable);
+        for (DeviceInfo di : devices_to_observe) {
+            di.reachable = false;
+            target.onDeviceTimeout(di);
+        }
+        target.onDeviceQueryFinished(devices_to_observe);
+    }
 }