davidgraeff
diff --git a/‎.idea/workspace.xml‎
Lines changed: 381 additions & 344 deletions b/‎.idea/workspace.xml‎
Lines changed: 381 additions & 344 deletions
diff --git a/‎app/src/main/AndroidManifest.xml‎
Lines changed: 1 addition & 0 deletions b/‎app/src/main/AndroidManifest.xml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎app/src/main/java/oly/netpowerctrl/datastructure/DeviceInfo.java‎
Lines changed: 20 additions & 21 deletions b/‎app/src/main/java/oly/netpowerctrl/datastructure/DeviceInfo.java‎
Lines changed: 20 additions & 21 deletions
diff --git a/‎app/src/main/java/oly/netpowerctrl/datastructure/OutletCommand.java‎
Lines changed: 20 additions & 1 deletion b/‎app/src/main/java/oly/netpowerctrl/datastructure/OutletCommand.java‎
Lines changed: 20 additions & 1 deletion
diff --git a/‎app/src/main/java/oly/netpowerctrl/datastructure/OutletCommandGroup.java‎
Lines changed: 12 additions & 12 deletions b/‎app/src/main/java/oly/netpowerctrl/datastructure/OutletCommandGroup.java‎
Lines changed: 12 additions & 12 deletions
diff --git a/‎app/src/main/java/oly/netpowerctrl/listadapter/AdapterController.java‎
Lines changed: 23 additions & 0 deletions b/‎app/src/main/java/oly/netpowerctrl/listadapter/AdapterController.java‎
Lines changed: 23 additions & 0 deletions
@@ -12,6 +12,7 @@
     <uses-permission android:name="android.permission.NFC" />
 
     <application
+        android:name="oly.netpowerctrl.main.NetpowerctrlApplication"
         android:icon="@drawable/netpowerctrl"
         android:label="@string/app_name"
         android:allowBackup="true">
 
@@ -25,18 +25,17 @@ public class DeviceInfo implements Parcelable {
 
     public boolean DefaultPorts;
     public int SendPort;
-    public int RecvPort;
+    public int ReceivePort;
 
     public boolean Configured;
 
     public List<OutletInfo> Outlets;
 
-    public static String makePrefname(UUID uuid) {
+    private static String uuidToString(UUID uuid) {
         return uuid.toString().replace(":", "-");
     }
 
-
-    public DeviceInfo() {
+    private DeviceInfo() {
         uuid = UUID.randomUUID();
         DeviceName = "";
         HostName = "";
@@ -45,7 +44,7 @@ public DeviceInfo() {
         Password = "";
         DefaultPorts = true;
         SendPort = -1;
-        RecvPort = -1;
+        ReceivePort = -1;
         Configured = false;
         Outlets = new ArrayList<OutletInfo>();
     }
@@ -54,7 +53,7 @@ public DeviceInfo(Context cx) {
         this();
         DeviceName = cx.getResources().getString(R.string.default_device_name);
         SendPort = DeviceQuery.getDefaultSendPort(cx);
-        RecvPort = DeviceQuery.getDefaultRecvPort(cx);
+        ReceivePort = DeviceQuery.getDefaultRecvPort(cx);
     }
 
     public DeviceInfo(DeviceInfo other) {
@@ -66,7 +65,7 @@ public DeviceInfo(DeviceInfo other) {
         Password = other.Password;
         DefaultPorts = other.DefaultPorts;
         SendPort = other.SendPort;
-        RecvPort = other.RecvPort;
+        ReceivePort = other.ReceivePort;
         Configured = other.Configured;
         Outlets = new ArrayList<OutletInfo>();
         for (OutletInfo oi : other.Outlets)
@@ -83,25 +82,25 @@ public boolean equals(UUID uuid) {
         return uuid.equals(uuid);
     }
 
-    public String getPrefname() {
-        return makePrefname(uuid);
+    public String getID() {
+        return uuidToString(uuid);
     }
 
     public int describeContents() {
         return 0;
     }
 
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(uuid.toString());
-        dest.writeString(DeviceName);
-        dest.writeString(HostName);
-        dest.writeString(MacAddress);
-        dest.writeString(UserName);
-        dest.writeString(Password);
-        dest.writeInt(DefaultPorts ? 1 : 0);
-        dest.writeInt(SendPort);
-        dest.writeInt(RecvPort);
-        dest.writeTypedList(Outlets);
+    public void writeToParcel(Parcel destination, int flags) {
+        destination.writeString(uuid.toString());
+        destination.writeString(DeviceName);
+        destination.writeString(HostName);
+        destination.writeString(MacAddress);
+        destination.writeString(UserName);
+        destination.writeString(Password);
+        destination.writeInt(DefaultPorts ? 1 : 0);
+        destination.writeInt(SendPort);
+        destination.writeInt(ReceivePort);
+        destination.writeTypedList(Outlets);
     }
 
     // this is used to regenerate your object. All Parcelables must have a CREATOR that implements these two methods
@@ -126,7 +125,7 @@ private DeviceInfo(Parcel in) {
         Password = in.readString();
         DefaultPorts = in.readInt() != 0;
         SendPort = in.readInt();
-        RecvPort = in.readInt();
+        ReceivePort = in.readInt();
         Configured = true;
         in.readTypedList(Outlets, OutletInfo.CREATOR);
     }
 
@@ -1,5 +1,9 @@
 package oly.netpowerctrl.datastructure;
 
+import java.util.ArrayList;
+
+import oly.netpowerctrl.main.NetpowerctrlApplication;
+
 public class OutletCommand {
     // This field is not saved and is filled by fromOutletInfo for cache purposes only
     public String description;
@@ -8,6 +12,7 @@ public class OutletCommand {
     public int outletNumber;
     public int state; //0:off;1:on;2:toggle
     public boolean enabled = false;
+    public OutletInfo outletinfo = null;
 
     public String toString() {
         if (device_mac.isEmpty())
@@ -21,15 +26,29 @@ public static OutletCommand fromString(String source) {
         String src[] = source.split("§");
         if (src.length < 3)
             return null;
-        c.description = src[0];
         c.device_mac = src[1];
         c.outletNumber = Integer.valueOf(src[2]);
         c.state = Integer.valueOf(src[3]);
+        c.description = c.device_mac + ":" + Integer.valueOf(c.outletNumber).toString();
+
+        ArrayList<DeviceInfo> devices = NetpowerctrlApplication.instance.configuredDevices;
+        for (DeviceInfo device : devices) {
+            if (device.MacAddress.equals(c.device_mac)) {
+                for (OutletInfo outlet : device.Outlets) {
+                    if (outlet.OutletNumber == c.outletNumber) {
+                        c.outletinfo = outlet;
+                        c.description = outlet.device.DeviceName + ": " + (outlet.UserDescription.isEmpty() ? outlet.Description : outlet.UserDescription);
+                        break;
+                    }
+                }
+            }
+        }
         return c;
     }
 
     public static OutletCommand fromOutletInfo(OutletInfo info, boolean enabled) {
         OutletCommand c = new OutletCommand();
+        c.outletinfo = info;
         c.enabled = enabled;
         c.description = info.device.DeviceName + ": " + (info.UserDescription.isEmpty() ? info.Description : info.UserDescription);
         c.device_mac = info.device.MacAddress;
 
@@ -9,8 +9,8 @@
 
 
 public class OutletCommandGroup {
-    public String groupname;
-    public String groupdetails;
+    public String sceneName;
+    public String sceneDetails;
     private String reserved = "";
     private UUID uuid;
     public ArrayList<OutletCommand> commands;
@@ -31,7 +31,7 @@ public boolean equals(UUID uuid) {
     }
 
     public String toString() {
-        String result = groupname.replace("§§", "") + "§§" + reserved.replace("§§", "") + "§§" + uuid.toString();
+        String result = sceneName.replace("§§", "") + "§§" + reserved.replace("§§", "") + "§§" + uuid.toString();
         for (OutletCommand c : commands) {
             result += "§§" + c.toString();
         }
@@ -43,22 +43,22 @@ public static OutletCommandGroup fromString(String source, Context context) {
             return null;
 
         OutletCommandGroup og = new OutletCommandGroup();
-        String listsrc[] = source.split("§§");
-        if (listsrc.length == 0)
+        String list_src[] = source.split("§§");
+        if (list_src.length == 0)
             return null;
 
-        // groupname is the first element, uuid the third
-        og.groupname = listsrc[0];
-        og.reserved = listsrc[1];
-        og.uuid = UUID.fromString(listsrc[2]);
+        // sceneName is the first element, uuid the third
+        og.sceneName = list_src[0];
+        og.reserved = list_src[1];
+        og.uuid = UUID.fromString(list_src[2]);
 
-        for (int i = 3; i < listsrc.length; ++i) {
-            OutletCommand c = OutletCommand.fromString(listsrc[i]);
+        for (int i = 3; i < list_src.length; ++i) {
+            OutletCommand c = OutletCommand.fromString(list_src[i]);
             if (c != null)
                 og.commands.add(c);
         }
 
-        og.groupdetails = og.buildDetails(context);
+        og.sceneDetails = og.buildDetails(context);
 
         return og;
     }
 
@@ -0,0 +1,23 @@
+package oly.netpowerctrl.listadapter;
+
+import android.content.Context;
+
+/**
+ * All the list/grid adapters for each fragment (new devices, configured devices, outlets etc)
+ * are kept in memory and updated immediately if the device listener service propagates new
+ * outlet values. The adapters are collected in this class which itself is instanciated in the
+ * main activity.
+ */
+public class AdapterController {
+    public DeviceListAdapter adpConfiguredDevices;
+    public DeviceListAdapter adpNewDevices;
+    public OutletSwitchListAdapter adpOutlets;
+    public ScenesListAdapter adpGroups;
+
+    public AdapterController(Context ctx) {
+        adpConfiguredDevices = new DeviceListAdapter(ctx, false);
+        adpNewDevices = new DeviceListAdapter(ctx, true);
+        adpOutlets = new OutletSwitchListAdapter(ctx);
+        adpGroups = new ScenesListAdapter(ctx);
+    }
+}