only show up to 8 outlets and don't discover disabled outlets

Author: oly-nittka

src/oly/netpowerctrl/DiscoveryThread.java

@@ -85,15 +85,26 @@ public void parsePacket(final String message, int recevied_port) {
 		di.RecvPort = recevied_port;
 		// leave SendPort as default, as we have no way to know.
 
-		for (int i=6; i<(msg.length-2); i++) {
-			String outlet[] = msg[i].split(",");
+		int disabledOutlets = 0;
+		int numOutlets = 8; // normally, the device sends info for 8 outlets no matter how many are actually equipped
+		
+		if (msg.length > 14)
+			try {disabledOutlets = Integer.parseInt(msg[14]);} catch (NumberFormatException e) {}
+			
+		if (msg.length < 14)
+			numOutlets = msg.length-6;
+		
+		for (int i=0; i<numOutlets; i++) {
+			String outlet[] = msg[6+i].split(",");
 			if (outlet.length < 1)
 				continue;
 			OutletInfo oi = new OutletInfo();
-			oi.OutletNumber = i-5; // 1-based
+			oi.OutletNumber = i+1; // 1-based
 			oi.Description = outlet[0];
 			if (outlet.length > 1)
 				oi.State = outlet[1].equals("1");
+			oi.Disabled = (disabledOutlets & (1<<i)) != 0; 
+
 			di.Outlets.add(oi);
 		}
 

src/oly/netpowerctrl/NetpowerctrlActivity.java

@@ -1,6 +1,7 @@
 package oly.netpowerctrl;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
@@ -304,6 +305,15 @@ synchronized public void onReceive(Context context, Intent intent) {
 			}
 
 			if (!found) {
+				// remove it's disabled outlets
+				List<OutletInfo> remove = new ArrayList<OutletInfo>();
+				for (OutletInfo oi: device_info.Outlets) 
+					if (oi.Disabled)
+						remove.add(oi);
+				
+				for (OutletInfo oi: remove)
+					device_info.Outlets.remove(oi);
+
 				alDiscoveredDevices.add(device_info);
 		  		adpDiscoveredDevices.getFilter().filter("");
 			}

src/oly/netpowerctrl/OutletInfo.java

@@ -8,17 +8,20 @@ public class OutletInfo implements Parcelable {
 		public int OutletNumber;
 		public String Description;
 		public boolean State;
+		public boolean Disabled;
 
 		public OutletInfo() {
 			OutletNumber = -1;
 			Description = "";
 			State = false;
+			Disabled = false;
 		}
 
 		public OutletInfo(OutletInfo other) {
 			OutletNumber = other.OutletNumber;
 			Description = other.Description;
 			State = other.State;
+			Disabled = other.Disabled;
 		}
 
 		public int describeContents() {
@@ -29,6 +32,7 @@ public void writeToParcel(Parcel dest, int flags) {
 			dest.writeInt(OutletNumber);
 			dest.writeString(Description);
 			dest.writeInt(State ? 1 : 0);
+			dest.writeInt(Disabled ? 1 : 0);
 		}
 
 		// this is used to regenerate your object. All Parcelables must have a CREATOR that implements these two methods
@@ -47,6 +51,7 @@ private OutletInfo(Parcel in) {
 	    	OutletNumber = in.readInt();
 	    	Description = in.readString();
 	    	State = in.readInt() != 0;
+	    	Disabled = in.readInt() != 0;
 	    }
 }