fixed all deprecated warnings. fixed device detection. improved scene element adding. fixed scene element change propagation

Author: David Graeff

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

@@ -4,19 +4,23 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import oly.netpowerctrl.devices.Credentials;
 import oly.netpowerctrl.executables.Executable;
+import oly.netpowerctrl.executables.ExecutableAndCommand;
 import oly.netpowerctrl.executables.onNameChangeResult;
 import oly.netpowerctrl.ioconnection.IOConnection;
 import oly.netpowerctrl.ioconnection.onNewIOConnection;
-import oly.netpowerctrl.network.ReachabilityStates;
 import oly.netpowerctrl.network.onExecutionFinished;
 
 /**
  * This interface defines a plugin
  */
 public abstract class AbstractBasePlugin {
     protected final DataService dataService;
+    protected final List<ExecutableAndCommand> command_list = new ArrayList<>();
     protected AbstractBasePlugin(DataService dataService) {
         this.dataService = dataService;
     }
@@ -32,16 +36,25 @@ public DataService getDataService() {
 
     abstract public boolean isStarted();
 
-    ////////////// Request data and executeToggle //////////////
+    ////////////// Request data and execute //////////////
     abstract public void requestData();
 
     abstract public void requestData(@NonNull IOConnection ioConnection);
 
     abstract public boolean execute(@NonNull Executable executable, final int command, @Nullable onExecutionFinished callback);
 
-    abstract public void addToTransaction(@NonNull Executable executable, final int command);
+    public void addToTransaction(@NonNull Executable port, int command) {
+        command_list.add(new ExecutableAndCommand(port, command));
+    }
 
-    abstract public void executeTransaction(@Nullable onExecutionFinished callback);
+    public void executeTransaction(@Nullable onExecutionFinished callback) {
+        if (callback != null)
+            callback.addExpected(command_list.size());
+        for (ExecutableAndCommand executableAndCommand : command_list) {
+            execute(executableAndCommand.executable, executableAndCommand.command, callback);
+        }
+        command_list.clear();
+    }
 
     abstract public void setTitle(@NonNull Executable executable, @NonNull final String new_name, @Nullable onNameChangeResult callback);
 
@@ -55,7 +68,8 @@ public DataService getDataService() {
      *
      * @param credentials The device, identified by the credentials.
      */
-    abstract public void openConfigurationPage(Credentials credentials);
+    public void openConfigurationPage(Credentials credentials) {
+    }
 
     /**
      * Start editing an existing device by existing credentials (where configured==true) or edit
@@ -64,9 +78,13 @@ public DataService getDataService() {
     @Nullable
     abstract public Credentials createNewDefaultCredentials();
 
-    abstract public boolean hasEditableCredentials();
+    public boolean hasEditableCredentials() {
+        return false;
+    }
 
-    abstract public boolean isNewIOConnectionAllowed(Credentials credentials);
+    public boolean isNewIOConnectionAllowed(Credentials credentials) {
+        return false;
+    }
 
     /**
      * Provide credentials and then the plugin will call you back asynchronously with a new connection.
@@ -78,7 +96,6 @@ public DataService getDataService() {
      * @param credentials Credentials that identify a device.
      * @param callback    The callback method with the new IOConnection.
      */
-    abstract public void addNewIOConnection(@NonNull Credentials credentials, @NonNull onNewIOConnection callback);
-
-    public abstract ReachabilityStates getReachableState(Executable executable);
+    public void addNewIOConnection(@NonNull Credentials credentials, @NonNull onNewIOConnection callback) {
+    }
 }

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

@@ -15,7 +15,6 @@
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import oly.netpowerctrl.anel.AnelPlugin;
 import oly.netpowerctrl.data.query.DataQueryCompletedObserver;
 import oly.netpowerctrl.data.query.DataQueryRefreshObserver;
 import oly.netpowerctrl.data.query.onDataQueryCompleted;
@@ -31,6 +30,9 @@
 import oly.netpowerctrl.main.App;
 import oly.netpowerctrl.main.GuiThreadHandler;
 import oly.netpowerctrl.main.MainActivity;
+import oly.netpowerctrl.network.NetworkChangedBroadcastReceiver;
+import oly.netpowerctrl.plugin_anel.AnelPlugin;
+import oly.netpowerctrl.plugin_simpleudp.SimpleUDPPlugin;
 import oly.netpowerctrl.preferences.SharedPrefs;
 import oly.netpowerctrl.status_bar.FavCollection;
 import oly.netpowerctrl.timer.TimerCollection;
@@ -47,6 +49,7 @@ public class DataService extends Service implements onDataLoaded, onDataQueryCom
     private static final String TAG = "DataService";
     private static final String PLUGIN_QUERY_ACTION = "oly.netpowerctrl.plugins.INetPwrCtrlPlugin";
     private static final String PAYLOAD_SERVICE_NAME = "SERVICE_NAME";
+    private static final NetworkChangedBroadcastReceiver networkChangedListener = new NetworkChangedBroadcastReceiver();
     public static String service_shutdown_reason = "";
     ///////////////// Service start/stop /////////////////
     static private WeakHashMap<Object, Boolean> weakHashMap = new WeakHashMap<>();
@@ -185,6 +188,7 @@ public int onStartCommand(@Nullable final Intent intent, final int flags, final
 
         discoverExtensions();
         plugins.add(new AnelPlugin(this));
+        plugins.add(new SimpleUDPPlugin(this));
 
         // Load all Devices, Scenes etc from disk.
         /**
@@ -193,6 +197,8 @@ public int onStartCommand(@Nullable final Intent intent, final int flags, final
          */
         loadStoreCollections.loadData(this);
 
+        networkChangedListener.registerReceiver(this);
+
         return START_STICKY;
     }
 
@@ -220,6 +226,7 @@ public void discoverExtensions() {
 
     @Override
     public void onDestroy() {
+        networkChangedListener.unregister(this);
 
         observersServiceReady.onServiceFinished(this);
 
@@ -264,7 +271,6 @@ private void interconnect_collection_objects() {
                     credentials.setPlugin(newlyAddedPlugin);
                 }
             }
-            newlyAddedPlugin.onStart(this);
         }
         // Check all credentials for a plugin and set up IOConnections
         Iterator<Map.Entry<String, Credentials>> deviceIterator = credentials.getItems().entrySet().iterator();
@@ -284,6 +290,9 @@ private void interconnect_collection_objects() {
         }
         connections.removeOrphaned();
         executables.removeOrphaned();
+
+        for (AbstractBasePlugin newlyAddedPlugin : plugins)
+            newlyAddedPlugin.onStart(this);
     }
 
     @Override
@@ -364,6 +373,7 @@ public void refreshExistingDevice(Credentials credentials, DevicesObserver.onDev
      * Refreshes all configured devices.
      */
     public void refreshExistingDevices() {
+        if (observersStartStopRefresh.isRefreshing()) return;
         observersStartStopRefresh.onRefreshStateChanged(true);
         deviceQuery.addDeviceObserver(new DevicesObserver(credentials.getItems().values(), new DevicesObserver.onDevicesObserverFinished() {
             @Override
@@ -379,6 +389,7 @@ public void onObserverJobFinished(DevicesObserver devicesObserver) {
      * Refreshes all configured devices (detect unreachable devices) and detect new un-configured devices.
      */
     public void detectDevices() {
+        if (observersStartStopRefresh.isRefreshing()) return;
         observersStartStopRefresh.onRefreshStateChanged(true);
         deviceQuery.addDeviceObserver(new DevicesObserver(new DevicesObserver.onDevicesObserverFinished() {
             @Override

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

@@ -6,10 +6,16 @@
  * Created by david on 19.08.14.
  */
 public class DataQueryRefreshObserver extends Observer<onDataQueryRefreshQuery> implements onDataQueryRefreshQuery {
+    private boolean mIsRefreshing = false;
     @Override
     public void onRefreshStateChanged(boolean isRefreshing) {
+        mIsRefreshing = isRefreshing;
         for (onDataQueryRefreshQuery listener : listeners.keySet()) {
             listener.onRefreshStateChanged(isRefreshing);
         }
     }
+
+    public boolean isRefreshing() {
+        return mIsRefreshing;
+    }
 }

app/src/main/java/oly/netpowerctrl/data/query/DataQueryRefreshObserver.java

@@ -62,9 +62,7 @@ public void finish() {
         Looper.myLooper().quit();
     }
 
-    protected void doAction(Credentials credentials) {
-        Log.w(TAG, "Query " + credentials.getDeviceName());
-
+    protected void doAction(Credentials credentials, int attempt) {
         AbstractBasePlugin abstractBasePlugin = credentials.getPlugin();
         // First try to find the not assigned plugin
         if (abstractBasePlugin == null) {
@@ -118,11 +116,14 @@ protected void doAction(Credentials credentials) {
             dataService.connections.put(l);
         }
 
-        for (Iterator<IOConnection> iterator = l.iterator(); iterator.hasNext(); ) {
-            IOConnection connection = iterator.next();
-            abstractBasePlugin.requestData(connection);
-            if (connection.reachableState() == ReachabilityStates.Reachable) break;
-        }
+        IOConnection connection = l.getConnectionByPositionModulo(attempt);
+        abstractBasePlugin.requestData(connection);
+
+//        for (Iterator<IOConnection> iterator = l.iterator(); iterator.hasNext(); ) {
+//            IOConnection connection = iterator.next();
+//            abstractBasePlugin.requestData(connection);
+//            //if (connection.reachableState() == ReachabilityStates.Reachable) break;
+//        }
     }
 
     /**
@@ -131,6 +132,7 @@ protected void doAction(Credentials credentials) {
      */
     private void deviceSuccess(Credentials credentials) {
         if (Thread.currentThread() != thread) throw new RuntimeException();
+        Log.w(TAG, "Response " + credentials.deviceName);
         handler.removeMessages(MSG_REQUEST, credentials);
         for (DevicesObserver devicesObserver : devicesObserverList) {
             if (!devicesObserver.credentialsList.containsKey(credentials.deviceUID)) continue;
@@ -166,6 +168,7 @@ private void checkObserverFinished(DevicesObserver devicesObserver) {
     }
 
     private void deviceFailed(Credentials credentials) {
+        Log.w(TAG, "Query failed " + credentials.getDeviceName());
         if (Thread.currentThread() != thread) throw new RuntimeException();
         handler.removeMessages(MSG_REQUEST, credentials);
         for (DevicesObserver devicesObserver : devicesObserverList) {
@@ -266,14 +269,15 @@ public void handleMessage(Message msg) {
                     // Add devices
                     for (Credentials credentials : devicesObserver.credentialsList.values()) {
                         removeMessages(MSG_REQUEST, credentials);
-                        sendMessageDelayed(obtainMessage(MSG_REQUEST, credentials), 10);
-                        sendMessageDelayed(obtainMessage(MSG_REQUEST, credentials), 200);
-                        sendMessageDelayed(obtainMessage(MSG_REQUEST, credentials), 400);
+                        sendMessageDelayed(obtainMessage(MSG_REQUEST, 0, 0, credentials), 10);
+                        sendMessageDelayed(obtainMessage(MSG_REQUEST, 1, 0, credentials), 100);
+                        sendMessageDelayed(obtainMessage(MSG_REQUEST, 2, 0, credentials), 200);
+                        sendMessageDelayed(obtainMessage(MSG_REQUEST, 3, 0, credentials), 300);
                     }
                     break;
                 }
                 case MSG_REQUEST: {
-                    doAction((Credentials) msg.obj);
+                    doAction((Credentials) msg.obj, msg.arg1);
                     break;
                 }
                 case MSG_TIMEOUT: {