Add screenshots, Change plugin interface, remove help text, improve feedback/nfc sections, add groups, refactored all anel stuff into anel package, improve dynamic gridview auto columns

Author: David Gräff

README.md

@@ -47,6 +47,7 @@ support libraries (v13) and need at least android 4.0 (sdk version 14, released
 
 ### Authors
 * david.graeff(at)web_de
+* Some icons from http://www.clker.com/
 
 ### License
 Dual licensed: GPLv2+GPLv3

app/src/main/AndroidManifest.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="26"
-    android:versionName="2.5">
+    android:versionCode="30"
+    android:versionName="2.6b">
 
-    <!-- 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"

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

@@ -4,6 +4,7 @@ import oly.netpowerctrl.plugins.INetPwrCtrlPluginResult;
 
 interface INetPwrCtrlPlugin {
 	void init(INetPwrCtrlPluginResult cb);
+	void finish();
     void requestValues();
     void updateIntValue(int id, int value);
     void updateBooleanValue(int id, boolean value);

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

@@ -1,10 +1,11 @@
 package oly.netpowerctrl.plugins;
 
 interface INetPwrCtrlPluginResult {
-    void ready();
+    void pluginState(int state);
 	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);
-	void header(int id, String name);
+	void header(String name);
 	void finished();
+
 }

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

@@ -76,7 +76,8 @@ public void process(DeviceSend deviceSend) {
             // Query all existing devices directly
             ArrayList<DeviceInfo> devices = NetpowerctrlApplication.getDataController().configuredDevices;
             for (DeviceInfo di : devices) {
-                deviceSend.addSendJob(di, "wer da?\r\n".getBytes(), DeviceSend.INQUERY_REQUEST, false);
+                if (di.deviceType == DeviceInfo.DeviceType.AnelDevice)
+                    AnelExecutor.sendQuery(di);
             }
         }
     }

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

@@ -64,8 +64,11 @@ static DeviceInfo createReceivedAnelDevice(String DeviceName, String HostName,
         DeviceInfo di = DeviceInfo.createNewDevice(DeviceInfo.DeviceType.AnelDevice);
         di.DeviceName = DeviceName;
         di.HostName = HostName;
-        di.MacAddress = MacAddress;
+        di.UniqueDeviceID = MacAddress;
         di.ReceivePort = receive_port;
+        // Default values for user and password
+        di.UserName = "admin";
+        di.Password = "anel";
 
         di.SendPort = SharedPrefs.getDefaultSendPort();
         di.reachable = true;

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

@@ -11,7 +11,7 @@
 import oly.netpowerctrl.network.DeviceSend;
 
 /**
- * For executing a command on a DevicePort or commands for multiple DevicePorts (bulk).
+ * For executing a name on a DevicePort or commands for multiple DevicePorts (bulk).
  * This is a specialized class for Anel devices.
  */
 final public class AnelExecutor {
@@ -127,18 +127,19 @@ public static void execute(DeviceInfo di, List<Executor.PortAndCommand> command_
         // Thirst step: Send data
         String access = di.UserName + di.Password;
         byte[] data = new byte[3 + access.length()];
-        data[0] = 'S';
-        data[1] = 'w';
-        data[2] = data_outlet;
         System.arraycopy(access.getBytes(), 0, data, 3, access.length());
 
         if (containsOutlets) {
-            DeviceSend.instance().addSendJob(di, data, DeviceSend.INQUERY_REQUEST, false);
-        } else if (containsIO) {
+            data[0] = 'S';
+            data[1] = 'w';
+            data[2] = data_outlet;
+            DeviceSend.instance().addJob(new DeviceSend.SendJob(di, data, DeviceSend.INQUERY_REQUEST, true));
+        }
+        if (containsIO) {
             data[0] = 'I';
             data[1] = 'O';
             data[2] = data_io;
-            DeviceSend.instance().addSendJob(di, data, DeviceSend.INQUERY_REQUEST, false);
+            DeviceSend.instance().addJob(new DeviceSend.SendJob(di, data, DeviceSend.INQUERY_REQUEST, true));
         }
     }
 
@@ -168,6 +169,15 @@ else if (command == DevicePort.TOGGLE)
             data = String.format(Locale.US, "%s%d%s%s", bValue ? "Sw_on" : "Sw_off",
                     port.id, port.device.UserName, port.device.Password).getBytes();
         }
-        DeviceSend.instance().addSendJob(port.device, data, DeviceSend.INQUERY_REQUEST, false);
+
+        DeviceSend.instance().addJob(new DeviceSend.SendJob(port.device, data, DeviceSend.INQUERY_REQUEST, true));
+    }
+
+    public static void sendBroadcastQuery() {
+        DeviceSend.instance().addJob(new AnelBroadcastSendJob());
+    }
+
+    public static void sendQuery(DeviceInfo di) {
+        DeviceSend.instance().addJob(new DeviceSend.SendJob(di, "wer da?\r\n".getBytes(), DeviceSend.INQUERY_REQUEST, true));
     }
 }

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

@@ -105,7 +105,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setTitle(R.string.configure_device);
         builder.setView(view);
-        builder.setPositiveButton(R.string.device_save, new DialogInterface.OnClickListener() {
+        builder.setPositiveButton(R.string.save, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialogInterface, int i) {
             }
@@ -202,7 +202,7 @@ public void onDeviceUpdated(DeviceInfo di) {
 
         if (test_state == TestStates.TEST_REACHABLE) {
             // Update stored device with received values
-            device.MacAddress = di.MacAddress;
+            device.UniqueDeviceID = di.UniqueDeviceID;
             device.DeviceName = di.DeviceName;
             device.copyFreshValues(di);
             // Test user+password by setting a device port.

app/src/main/java/oly/netpowerctrl/application_state/NetpowerctrlApplication.java

@@ -41,7 +41,7 @@
 public class NetpowerctrlApplication extends Application {
     public static NetpowerctrlApplication instance;
 
-    private RuntimeDataController dataController = new RuntimeDataController();
+    private RuntimeDataController dataController = null;
     private int mDiscoverServiceRefCount = 0;
     private NetpowerctrlService mDiscoverService;
     private boolean mWaitForService;
@@ -78,12 +78,7 @@ public void onCreate() {
         // The following line triggers the initialization of ACRA
         ACRA.init(this);
         instance = this;
-        dataController.reloadConfiguredDevices();
-
-        // Plugins
-        if (SharedPrefs.getLoadExtensions())
-            pluginController = new PluginController();
-
+        dataController = new RuntimeDataController();
 
         // Start listen service and listener for wifi changes
         mWaitForService = true;
@@ -98,8 +93,37 @@ public void run() {
         }, 180);
     }
 
+    private Handler stopServiceHandler = new Handler();
+    private Runnable stopRunnable = new Runnable() {
+        @Override
+        public void run() {
+            try {
+                mDiscoverService = null;
+                mWaitForService = false;
+                unbindService(mConnection);
+            } catch (IllegalArgumentException ignored) {
+            }
+
+            dataController.clear();
+
+            // stop send queue
+            DeviceSend.instance().interrupt();
+
+            if (pluginController != null) {
+                pluginController.finish();
+                pluginController = null;
+            }
+
+            if (SharedPrefs.notifyOnStop()) {
+                ShowToast.FromOtherThread(NetpowerctrlApplication.this, getString(R.string.service_stopped));
+            }
+        }
+    };
+
     public void useListener() {
         ++mDiscoverServiceRefCount;
+        // Stop delayed stop-service
+        stopServiceHandler.removeCallbacks(stopRunnable);
         // Service is not running anymore, restart it
         if (mDiscoverService == null && !mWaitForService) {
             mWaitForService = true;
@@ -114,21 +138,7 @@ public void stopUseListener() {
             mDiscoverServiceRefCount--;
         }
         if (mDiscoverServiceRefCount == 0) {
-            try {
-                mDiscoverService = null;
-                mWaitForService = false;
-                unbindService(mConnection);
-            } catch (IllegalArgumentException ignored) {
-            }
-
-            dataController.clear();
-
-            // stop send queue
-            DeviceSend.instance().interrupt();
-
-            if (SharedPrefs.notifyOnStop()) {
-                ShowToast.FromOtherThread(this, getString(R.string.service_stopped));
-            }
+            stopServiceHandler.postDelayed(stopRunnable, 2000);
         }
     }
 
@@ -140,8 +150,8 @@ public void stopUseListener() {
     public void detectNewDevicesAndReachability() {
 
         // The following mechanism allows only one update request within a
-        // 1sec timeframe.
-        if (isDetecting)
+        // 1sec timeframe and only if the service is available and not in reduced mode.
+        if (isDetecting || mWaitForService || mDiscoverService.isNetworkReducedMode)
             return;
 
         isDetecting = true;
@@ -166,8 +176,23 @@ public void onDeviceUpdated(DeviceInfo di) {
 
             @Override
             public void onDeviceQueryFinished(List<DeviceInfo> timeout_devices) {
-                if (timeout_devices.size() > 0)
-                    dataController.notifyConfiguredObservers(timeout_devices);
+                if (timeout_devices.size() == 0)
+                    return;
+
+                // Do we need to go into network reduced mode?
+                List<DeviceInfo> remaining = new ArrayList<DeviceInfo>(dataController.configuredDevices);
+                remaining.removeAll(timeout_devices);
+                boolean containsNetworkReachableDevices = false;
+                for (DeviceInfo di : remaining) {
+                    if (di.deviceType == DeviceInfo.DeviceType.AnelDevice) {
+                        containsNetworkReachableDevices = true;
+                        break;
+                    }
+                }
+                if (!containsNetworkReachableDevices)
+                    mDiscoverService.setNetworkReducedMode();
+
+                dataController.notifyConfiguredObservers(timeout_devices);
             }
         });
     }
@@ -187,10 +212,17 @@ public void onServiceConnected(ComponentName className,
             mDiscoverService.registerDeviceUpdateObserver(dataController);
             if (mDiscoverServiceRefCount == 0)
                 mDiscoverServiceRefCount = 1;
-            instance.notifyServiceReady();
             mWaitForService = false;
+
+            // Plugins
+            if (SharedPrefs.getLoadExtensions())
+                pluginController = new PluginController();
+
             // We do a device detection in the wifi change listener already
             detectNewDevicesAndReachability();
+
+            // Notify all observers that we are ready
+            instance.notifyServiceReady();
         }
 
         // Service crashed