Move OFF,ON,TOGGLE defines from Executable to ExecutableAndCommand. If an executable is of type toggle, a toggle switches value between value_min and value_max (not only between two states anymore).

If a command is send, and the remote device responds but the state hasn't changed, we still will still update the gui (remove grey-out text flag) now.

Credential changes are saved now.

Author: David Graeff

app/src/main/java/oly/netpowerctrl/data/DataService.java

@@ -335,6 +335,7 @@ public void addToConfiguredDevices(Credentials credentials) {
         credentials.setConfigured(true);
         this.credentials.put(credentials);
         connections.save(credentials.deviceUID);
+        executables.save(credentials.deviceUID);
     }
 
     public void showNotificationForNextRefresh(boolean notificationAfterNextRefresh) {

app/src/main/java/oly/netpowerctrl/devices/Credentials.java

@@ -53,6 +53,10 @@ public void resetChanged() {
         mLastHashCode = computeChangedCode();
     }
 
+    public void setHasChanged() {
+        mLastHashCode = 0;
+    }
+
     public boolean isConfigured() {
         return mConfigured;
     }
@@ -61,7 +65,6 @@ public void setConfigured(boolean configured) {
         if (configured && deviceUID == null)
             throw new RuntimeException("Credential cannot be set to configured without an UID!");
         this.mConfigured = configured;
-        resetChanged();
     }
 
     @Override
@@ -179,4 +182,5 @@ public String getDeviceName() {
     public void setDeviceName(String deviceName) {
         this.deviceName = deviceName;
     }
+
 }

app/src/main/java/oly/netpowerctrl/devices/CredentialsCollection.java

@@ -52,7 +52,8 @@ public void put(Credentials credentials) {
             changed |= credentials.hasChanged();
             if (!changed) return;
             items.put(credentials.getUid(), credentials);
-            storage.save(credentials);
+            if (credentials.isConfigured())
+                storage.save(credentials);
             notifyObservers(credentials, ObserverUpdateActions.UpdateAction);
             return;
         }

app/src/main/java/oly/netpowerctrl/devices/DeviceQuery.java

@@ -83,7 +83,7 @@ protected void doAction(Credentials credentials, int attempt) {
         DeviceIOConnections l = dataService.connections.openDevice(credentials.deviceUID);
 
         // No connections for this device. Nothing to do.
-        if (l == null) {
+        if (l == null || l.size() == 0) {
             // remove from list of devices to observe and notify observers
             deviceFailed(credentials);
             return;

app/src/main/java/oly/netpowerctrl/devices/TestCredentials.java

@@ -8,6 +8,7 @@
 import oly.netpowerctrl.App;
 import oly.netpowerctrl.data.DataService;
 import oly.netpowerctrl.executables.Executable;
+import oly.netpowerctrl.executables.ExecutableAndCommand;
 import oly.netpowerctrl.executables.ExecutableCollection;
 import oly.netpowerctrl.utils.ObserverUpdateActions;
 import oly.netpowerctrl.utils.onCollectionUpdated;
@@ -53,7 +54,7 @@ public void run() {
                 // This should not change the actual device state, but will cause an update signal of the
                 // received and "changed" executable (in updated(...)).
                 observedExecutable.current_value = observedExecutable.getCurrentValueToggled();
-                observedExecutable.execute(dataService, Executable.TOGGLE, null);
+                observedExecutable.execute(dataService, ExecutableAndCommand.TOGGLE, null);
             } else {
                 test_state = TestStates.TEST_INIT;
                 if (listener != null)

app/src/main/java/oly/netpowerctrl/executables/Executable.java

@@ -29,14 +29,10 @@
  */
 public class Executable implements Comparable, IOInterface {
     // Some value constants
-    public static final int OFF = 0;
-    public static final int ON = 1;
-    public static final int TOGGLE = -1;
-    public static final int INVALID = -2;
 
     // Values
-    public int min_value = OFF;
-    public int max_value = ON;
+    public int min_value = 0;
+    public int max_value = 0;
     public int current_value = 0;
     // The device this port belongs to.
     public String deviceUID;
@@ -87,10 +83,6 @@ public void execute(@NonNull final DataService dataService, final int command, @
         }
     }
 
-    public void execute(@NonNull final DataService dataService, @Nullable final onExecutionFinished callback) {
-        execute(dataService, TOGGLE, callback);
-    }
-
     public final Set<String> getGroupUIDs() {
         return group_uids;
     }
@@ -124,7 +116,9 @@ public final int getMinimumValue() {
     }
 
     public int getCurrentValueToggled() {
-        return current_value > min_value ? min_value : max_value;
+        int c = (current_value + 1) % (max_value + 1);
+        if (c < min_value) c = min_value;
+        return c;
     }
 
     /**
@@ -239,6 +233,11 @@ public boolean hasChanged() {
         return isSaveable && last_hash_code != computeChangedCode();
     }
 
+    @Override
+    public void setHasChanged() {
+        last_hash_code = 0;
+    }
+
     @Override
     public void resetChanged() {
         last_hash_code = computeChangedCode();

app/src/main/java/oly/netpowerctrl/executables/ExecutableAndCommand.java

@@ -4,6 +4,11 @@
  * Created by david on 21.04.15.
  */
 public class ExecutableAndCommand {
+    public static final int OFF = 0;
+    public static final int ON = 1;
+    public static final int TOGGLE = -1;
+    public static final int INVALID = -2;
+
     public final Executable executable;
     public final Integer command;
 

app/src/main/java/oly/netpowerctrl/executables/ExecutableCollection.java

@@ -66,18 +66,20 @@ public void put(Executable executable) {
             return;
         }
 
-        executable.setExecutionInProgress(false);
-
         Executable existed = items.get(executable.getUid());
         if (existed != null) {
-            if (executable == existed && !executable.hasChanged()) return;
+            if (executable == existed && !executable.hasChanged() && !executable.executionInProgress())
+                return;
+
+            executable.setExecutionInProgress(false);
 
             items.put(executable.getUid(), executable);
             if (!executable.needCredentials() || executable.getCredentials().isConfigured())
                 storage.save(executable);
             notifyObservers(executable, ObserverUpdateActions.UpdateAction);
             return;
-        }
+        } else
+            executable.setExecutionInProgress(false);
 
         if (executable.isSaveable()) {
             items.put(executable.getUid(), executable);
@@ -169,6 +171,18 @@ public List<Executable> filterExecutables(Credentials credentials) {
         return list;
     }
 
+    /**
+     * Save all connections that belong to the same device ID as the given credential object.
+     * This will not issue updated notifications even if the objects have changed since last save.
+     */
+    public void save(String deviceUID) {
+        for (Executable executable : items.values()) {
+            if (!executable.deviceUID.equals(deviceUID)) continue;
+            executable.setHasChanged();
+            put(executable);
+        }
+    }
+
     public interface PredicateExecutable {
         boolean accept(Executable e);
     }

app/src/main/java/oly/netpowerctrl/executables/ExecutablesFragment.java

@@ -377,7 +377,7 @@ public boolean onItemClick(View view, final int position, boolean isLongClick) {
         ((ExecutableViewHolder) mRecyclerView.findViewHolderForAdapterPosition(position)).animate();
         adapter.notifyItemChanged(position);
 
-        item.getExecutable().execute(dataService, null);
+        item.getExecutable().execute(dataService, ExecutableAndCommand.TOGGLE, null);
         return true;
     }
 

app/src/main/java/oly/netpowerctrl/executables/adapter/InputDemo.java

@@ -4,14 +4,12 @@
 import java.util.List;
 
 import oly.netpowerctrl.data.DataService;
-import oly.netpowerctrl.executables.Executable;
+import oly.netpowerctrl.executables.ExecutableAndCommand;
 import oly.netpowerctrl.network.ReachabilityStates;
 import oly.netpowerctrl.scenes.Scene;
 
-;
-
 /**
- * Created by david on 07.07.14.
+ * Adapter with some demo executables.
  */
 public class InputDemo extends AdapterInput {
     private List<Scene> demoItems = new ArrayList<>();
@@ -24,7 +22,8 @@ public InputDemo() {
     private Scene createScene(String name, ReachabilityStates isReachable, boolean isOn) {
         Scene scene = Scene.createNewScene();
         scene.title = name;
-        scene.max_value = (1);
+        scene.min_value = 0;
+        scene.max_value = 1;
         scene.current_value = (isOn ? 1 : 0);
         scene.setReachable(isReachable);
         return scene;
@@ -33,7 +32,7 @@ private Scene createScene(String name, ReachabilityStates isReachable, boolean i
     @Override
     public void doUpdateNow() {
         for (Scene scene : demoItems)
-            adapterSource.addItem(scene, Executable.TOGGLE);
+            adapterSource.addItem(scene, ExecutableAndCommand.TOGGLE);
     }
 
     @Override