Don't show disabled outlets anymore

davidgraeff · davidgraeff · commit a8bd6a047591 · 2014-01-03T05:04:57.000+01:00
diff --git a/app/src/main/java/oly/netpowerctrl/listadapter/OutletSwitchListAdapter.java b/app/src/main/java/oly/netpowerctrl/listadapter/OutletSwitchListAdapter.java
@@ -118,8 +118,7 @@ public void onDevicesUpdated() {
         for (DeviceInfo device : all_devices) {
             for (OutletInfo oi : device.Outlets) {
                 oi.device = device;
-                oi.Disabled = false;
-                if (!oi.Hidden || showHidden)
+                if (!oi.Disabled && (!oi.Hidden || showHidden))
                     all_outlets.add(oi);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -118,8 +118,7 @@ public void onDevicesUpdated() {`
`118`	`118`	`for (DeviceInfo device : all_devices) {`
`119`	`119`	`for (OutletInfo oi : device.Outlets) {`
`120`	`120`	`oi.device = device;`
`121`		`- oi.Disabled = false;`
`122`		`- if (!oi.Hidden \|\| showHidden)`
	`121`	`+ if (!oi.Disabled && (!oi.Hidden \|\| showHidden))`
`123`	`122`	`all_outlets.add(oi);`
`124`	`123`	`}`
`125`	`124`	`}`