Master/Slave for outlets

Master/Slave for scenes
Fix crashes

Author: David Gräff

.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="44"
-    android:versionName="2.11">
+    android:versionCode="46"
+    android:versionName="3.0">
 
     <!-- Api level 14: Android 4.0 15. Dezember 2011 -->
     <!-- Api level 16: Android 4.1 27. Juni 2012 -->

app/src/main/AndroidManifest.xml

@@ -12,6 +12,7 @@
 import java.util.Set;
 
 import oly.netpowerctrl.application_state.NetpowerctrlApplication;
+import oly.netpowerctrl.application_state.NetpowerctrlService;
 import oly.netpowerctrl.datastructure.DeviceInfo;
 import oly.netpowerctrl.network.DeviceSend;
 
@@ -74,10 +75,13 @@ public void process(DeviceSend deviceSend) {
 //                        Toast.LENGTH_SHORT).show();
 
             // Query all existing anel devices directly
+            NetpowerctrlService service = NetpowerctrlApplication.getService();
+            if (service == null)
+                return;
             List<DeviceInfo> devices = NetpowerctrlApplication.getDataController().configuredDevices;
             for (DeviceInfo di : devices) {
                 if (di.pluginID.equals(AnelPlugin.PLUGIN_ID))
-                    di.getPluginInterface().requestData(di);
+                    di.getPluginInterface(service).requestData(di);
             }
         }
     }

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

@@ -22,6 +22,7 @@
 
 import oly.netpowerctrl.R;
 import oly.netpowerctrl.application_state.NetpowerctrlApplication;
+import oly.netpowerctrl.application_state.NetpowerctrlService;
 import oly.netpowerctrl.application_state.PluginInterface;
 import oly.netpowerctrl.application_state.RuntimeDataController;
 import oly.netpowerctrl.datastructure.DeviceInfo;
@@ -84,10 +85,10 @@ public void startDiscoveryThreads(int additional_port) {
         }
     }
 
-    public void stopDiscoveryThreads() {
+    public void stopDiscoveryThreads(NetpowerctrlService service) {
         RuntimeDataController d = NetpowerctrlApplication.getDataController();
         for (DeviceInfo di : d.configuredDevices) {
-            if (di.getPluginInterface() == this) {
+            if (this.equals(di.getPluginInterface(service))) {
                 di.setNotReachable("Energiesparmodus");
                 d.onDeviceUpdated(di);
             }

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

@@ -53,7 +53,7 @@ private void testDevice() {
 
         test_state = TestStates.TEST_REACHABLE;
 
-        PluginInterface pi = device.getPluginInterface();
+        PluginInterface pi = device.getPluginInterface(NetpowerctrlApplication.getService());
         assert pi != null;
         pi.prepareForDevices(device);
 
@@ -80,7 +80,7 @@ public void onClick(DialogInterface dialog, int whichButton) {
     }
 
     private void saveAndFinish() {
-        PluginInterface pi = device.getPluginInterface();
+        PluginInterface pi = device.getPluginInterface(NetpowerctrlApplication.getService());
         assert pi != null;
         pi.prepareForDevices(device);
 
@@ -201,7 +201,7 @@ public void onDeviceUpdated(DeviceInfo di, boolean willBeRemoved) {
             test_state = TestStates.TEST_ACCESS;
             // Just send the current value of the first device port as target value.
             // Should change nothing but we will get a feedback if the credentials are working.
-            PluginInterface pi = device.getPluginInterface();
+            PluginInterface pi = device.getPluginInterface(NetpowerctrlApplication.getService());
             assert pi != null;
             if (deviceQuery != null) {
                 deviceQuery.addDevice(device, false);

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

@@ -123,7 +123,7 @@ private void finish() {
         PluginInterface first = plugins.get(0);
         plugins.clear();
         plugins.add(first);
-        ((AnelPlugin) first).stopDiscoveryThreads();
+        ((AnelPlugin) first).stopDiscoveryThreads(this);
 
         isNetworkReducedMode = true;
         // Stop send and listen threads

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

@@ -173,7 +173,7 @@ public void clearNewDevices() {
     public void addToConfiguredDevices(DeviceInfo current_device, boolean write_to_disk) {
         // Already in configured devices?
         for (int i = configuredDevices.size() - 1; i >= 0; --i) {
-            if (current_device.UniqueDeviceID.equals(configuredDevices.get(i).UniqueDeviceID)) {
+            if (current_device.equalsByUniqueID(configuredDevices.get(i))) {
                 configuredDevices.set(i, current_device);
                 if (write_to_disk) {
                     saveConfiguredDevices(true);
@@ -189,7 +189,7 @@ public void addToConfiguredDevices(DeviceInfo current_device, boolean write_to_d
 
         // Remove from new devices list
         for (int i = 0; i < newDevices.size(); ++i) {
-            if (newDevices.get(i).UniqueDeviceID.equals(current_device.UniqueDeviceID)) {
+            if (newDevices.get(i).equalsByUniqueID(current_device)) {
                 newDevices.remove(i);
                 notifyNewDeviceObservers(current_device, true);
                 break;
@@ -326,7 +326,7 @@ public void rename(DevicePort port, String new_name, DevicePortRenamed callback)
         if (callback != null)
             callback.devicePort_start_rename(port);
 
-        PluginInterface remote = port.device.getPluginInterface();
+        PluginInterface remote = port.device.getPluginInterface(NetpowerctrlApplication.getService());
         if (remote != null) {
             remote.rename(port, new_name, callback);
             if (callback != null)
@@ -346,7 +346,7 @@ public void execute(Scene scene, ExecutionFinished callback) {
             if (p == null)
                 continue;
 
-            PluginInterface remote = p.device.getPluginInterface();
+            PluginInterface remote = p.device.getPluginInterface(NetpowerctrlApplication.getService());
             if (remote == null)
                 continue;
 
@@ -361,9 +361,27 @@ public void execute(Scene scene, ExecutionFinished callback) {
     }
 
     public void execute(final DevicePort port, final int command, final ExecutionFinished callback) {
-        PluginInterface remote = port.device.getPluginInterface();
+        PluginInterface remote = port.device.getPluginInterface(NetpowerctrlApplication.getService());
         if (remote != null) {
             remote.execute(port, command, callback);
+
+            // Support for slaves of an outlet.
+            List<UUID> slaves = port.getSlaves();
+            if (slaves.size() > 0) {
+                boolean bValue = false;
+                if (command == DevicePort.ON)
+                    bValue = true;
+                else if (command == DevicePort.OFF)
+                    bValue = false;
+                else if (command == DevicePort.TOGGLE)
+                    bValue = port.current_value <= 0;
+
+                for (UUID slave_uuid : slaves) {
+                    DevicePort p = NetpowerctrlApplication.getDataController().findDevicePort(slave_uuid);
+                    if (p != null)
+                        execute(p, bValue ? DevicePort.ON : DevicePort.OFF, null);
+                }
+            }
             return;
         }
 
@@ -390,7 +408,7 @@ public void setDevicePortBitmap(Context context, DevicePort port, Bitmap bitmap)
     public int countNetworkDevices() {
         int i = 0;
         for (DeviceInfo di : configuredDevices)
-            if (di.isNetworkDevice()) ++i;
+            if (di.isNetworkDevice(NetpowerctrlApplication.getService())) ++i;
         return i;
     }
 }

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

@@ -17,6 +17,7 @@
 import oly.netpowerctrl.R;
 import oly.netpowerctrl.anel.AnelPlugin;
 import oly.netpowerctrl.application_state.NetpowerctrlApplication;
+import oly.netpowerctrl.application_state.NetpowerctrlService;
 import oly.netpowerctrl.application_state.PluginInterface;
 import oly.netpowerctrl.preferences.SharedPrefs;
 import oly.netpowerctrl.utils.JSONHelper;
@@ -215,11 +216,11 @@ public int compareTo(DeviceInfo deviceInfo) {
      *
      * @return
      */
-    public PluginInterface getPluginInterface() {
+    public PluginInterface getPluginInterface(NetpowerctrlService service) {
         PluginInterface pi = pluginInterface != null ? pluginInterface.get() : null;
 
         if (pi == null) {
-            pi = NetpowerctrlApplication.getService().getPluginInterface(this);
+            pi = service.getPluginInterface(this);
             pluginInterface = new WeakReference<PluginInterface>(pi);
         }
 
@@ -424,8 +425,8 @@ public void remove(Integer id) {
         DevicePorts.remove(id);
     }
 
-    public boolean isNetworkDevice() {
-        PluginInterface pi = getPluginInterface();
+    public boolean isNetworkDevice(NetpowerctrlService service) {
+        PluginInterface pi = getPluginInterface(service);
         if (pi == null)
             return false;
         return pi.isNetworkPlugin();

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

@@ -37,6 +37,7 @@ public final class DevicePort implements Comparable {
     public DeviceInfo device;
     protected DevicePortType ui_type;
     private String Description = "";
+    private List<UUID> slaves = new ArrayList<UUID>();
 
 
     public DevicePort(DeviceInfo di, DevicePortType ui_type) {
@@ -54,6 +55,7 @@ public DevicePort(DevicePort other) {
         positionRequest = other.positionRequest;
         ui_type = other.ui_type;
         device = other.device;
+        slaves = other.slaves;
         id = other.id;
         // do not copy last_command_timecode! This value is set by the execute(..) methods
     }
@@ -92,6 +94,13 @@ public static DevicePort fromJSON(JsonReader reader, DeviceInfo di)
                 oi.id = reader.nextInt();
             } else if (name.equals("uuid")) {
                 oi.uuid = UUID.fromString(reader.nextString());
+            } else if (name.equals("slaves")) {
+                oi.slaves.clear();
+                reader.beginArray();
+                while (reader.hasNext()) {
+                    oi.slaves.add(UUID.fromString(reader.nextString()));
+                }
+                reader.endArray();
             } else if (name.equals("groups")) {
                 oi.groups.clear();
                 reader.beginArray();
@@ -164,6 +173,10 @@ public void toJSON(JsonWriter writer) throws IOException {
         for (UUID group_uuid : groups)
             writer.value(group_uuid.toString());
         writer.endArray();
+        writer.name("slaves").beginArray();
+        for (UUID slave_uuid : slaves)
+            writer.value(slave_uuid.toString());
+        writer.endArray();
         writer.endObject();
     }
 
@@ -193,6 +206,14 @@ public void addToGroup(UUID uuid) {
             groups.add(uuid);
     }
 
+    public void setSlaves(List<UUID> slaves) {
+        this.slaves = slaves;
+    }
+
+    public List<UUID> getSlaves() {
+        return slaves;
+    }
+
     public enum DevicePortType {
         TypeUnknown, TypeRangedValue, TypeToggle, TypeButton
     }

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

@@ -26,6 +26,14 @@ public boolean isFavourite() {
         return favourite;
     }
 
+    public void setMaster(DevicePort master) {
+        uuid_master = master.uuid;
+    }
+
+    public UUID getMasterUUid() {
+        return uuid_master;
+    }
+
 
     public static class SceneItem {
         public UUID uuid = UUID.randomUUID();
@@ -149,7 +157,7 @@ public static Scene fromJSON(JsonReader reader) throws IOException {
                 scene.sceneName = reader.nextString();
             } else if (name.equals("uuid")) {
                 scene.uuid = UUID.fromString(reader.nextString());
-            } else if (name.equals("master")) {
+            } else if (name.equals("uuid_master")) {
                 scene.uuid_master = UUID.fromString(reader.nextString());
             } else if (name.equals("favourite")) {
                 scene.favourite = reader.nextBoolean();