Refactor service. Add multiple connections for one device (WIP).

Author: David Gräff

.idea/workspace.xml

@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 19
-        versionCode 66
-        versionName "5.2"
+        versionCode 67
+        versionName "5.3"
     }
 
     lintOptions {
@@ -39,7 +39,7 @@ dependencies {
     //compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.google.android.gms:play-services:4.+'
 
-    compile 'ch.acra:acra:4.5+'
+    compile 'ch.acra:acra:4+'
     compile 'com.android.support:support-v13:+'
     compile 'de.cketti.library.changelog:ckchangelog:1.2+'
     compile 'com.github.chrisbanes.actionbarpulltorefresh:library:0.9+'

app/build.gradle

@@ -13,7 +13,7 @@
 
 import oly.netpowerctrl.R;
 import oly.netpowerctrl.application_state.NetpowerctrlApplication;
-import oly.netpowerctrl.devices.DevicePort;
+import oly.netpowerctrl.device_ports.DevicePort;
 
 /**
  * Created by david on 19.05.14.

app/src/main/java/oly/netpowerctrl/alarms/Alarm.java

@@ -22,9 +22,9 @@
 import oly.netpowerctrl.application_state.NetpowerctrlApplication;
 import oly.netpowerctrl.application_state.NetpowerctrlService;
 import oly.netpowerctrl.application_state.PluginInterface;
+import oly.netpowerctrl.device_ports.DevicePort;
 import oly.netpowerctrl.device_ports.DevicePortSourceConfigured;
 import oly.netpowerctrl.device_ports.DevicePortsListAdapter;
-import oly.netpowerctrl.devices.DevicePort;
 import oly.netpowerctrl.network.AsyncRunnerResult;
 import oly.netpowerctrl.preferences.DatePreference;
 import oly.netpowerctrl.preferences.TimePreference;

app/src/main/java/oly/netpowerctrl/alarms/AlarmEditPreferences.java

@@ -16,6 +16,9 @@
 import oly.netpowerctrl.application_state.NetpowerctrlApplication;
 import oly.netpowerctrl.application_state.NetpowerctrlService;
 import oly.netpowerctrl.application_state.PluginInterface;
+import oly.netpowerctrl.device_ports.DevicePort;
+import oly.netpowerctrl.devices.Device;
+import oly.netpowerctrl.devices.DeviceCollection;
 import oly.netpowerctrl.network.AsyncRunnerResult;
 import oly.netpowerctrl.utils.JSONHelper;
 
@@ -149,9 +152,45 @@ public boolean refresh(NetpowerctrlService service) {
 
         notifyObservers(false, true);
 
-        requestActive = service.requestAllAlarms(alarm_uuids, this);
-        if (!requestActive)
+        if (service.isNetworkReducedMode() || requestActive) {
             notifyObservers(false, false);
+            return requestActive;
+        }
+
+        requestActive = true;
+
+        List<DevicePort> alarm_ports = new ArrayList<>();
+
+        DeviceCollection c = NetpowerctrlApplication.getDataController().deviceCollection;
+        // Put all ports of all devices into the list alarm_ports.
+        // If a port is referenced by the alarm_uuids hashSet, it will be put in front of the list
+        // to refresh that port first.
+        for (Device di : c.devices) {
+            // Request all alarm_uuids may be called before all plugins responded
+            PluginInterface i = di.getPluginInterface(service);
+            if (i == null || !di.isEnabled())
+                continue;
+
+            // Request alarm_uuids for every port
+            di.lockDevicePorts();
+            Iterator<DevicePort> it = di.getDevicePortIterator();
+            while (it.hasNext()) {
+                final DevicePort port = it.next();
+                if (port.Disabled)
+                    continue;
+
+                if (alarm_uuids.contains(port.uuid))
+                    alarm_ports.add(0, port); // add in front of all alarm_uuids
+                else
+                    alarm_ports.add(port);
+            }
+            di.releaseDevicePorts();
+        }
+
+        for (DevicePort port : alarm_ports) {
+            PluginInterface i = port.device.getPluginInterface(service);
+            i.requestAlarms(port, this);
+        }
 
         return requestActive;
     }

app/src/main/java/oly/netpowerctrl/alarms/TimerController.java

@@ -25,7 +25,7 @@
 import oly.netpowerctrl.application_state.NetpowerctrlService;
 import oly.netpowerctrl.application_state.PluginInterface;
 import oly.netpowerctrl.application_state.ServiceReady;
-import oly.netpowerctrl.devices.DevicePort;
+import oly.netpowerctrl.device_ports.DevicePort;
 import oly.netpowerctrl.devices.DevicesFragment;
 import oly.netpowerctrl.main.MainActivity;
 import oly.netpowerctrl.network.AsyncRunnerResult;

app/src/main/java/oly/netpowerctrl/alarms/TimerFragment.java

@@ -13,7 +13,9 @@
 
 import oly.netpowerctrl.application_state.NetpowerctrlApplication;
 import oly.netpowerctrl.application_state.NetpowerctrlService;
-import oly.netpowerctrl.devices.DeviceInfo;
+import oly.netpowerctrl.application_state.PluginInterface;
+import oly.netpowerctrl.devices.Device;
+import oly.netpowerctrl.devices.DeviceConnection;
 import oly.netpowerctrl.network.UDPSending;
 
 /**
@@ -78,10 +80,14 @@ public void process(UDPSending UDPSending) {
             NetpowerctrlService service = NetpowerctrlService.getService();
             if (service == null)
                 return;
-            List<DeviceInfo> devices = NetpowerctrlApplication.getDataController().deviceCollection.devices;
-            for (DeviceInfo di : devices) {
-                if (di.pluginID.equals(AnelPlugin.PLUGIN_ID))
-                    di.getPluginInterface(service).requestData(di);
+            List<Device> devices = NetpowerctrlApplication.getDataController().deviceCollection.devices;
+            for (Device device : devices) {
+                if (device.pluginID.equals(AnelPlugin.PLUGIN_ID)) {
+                    PluginInterface i = device.getPluginInterface(service);
+                    for (DeviceConnection ci : device.DeviceConnections) {
+                        i.requestData(ci);
+                    }
+                }
             }
         }
     }