Improve connection add dialog. Switch more dialogs to material design. Use material design buttons whereever possible. Change group list: Add device preferences button. Fix empty list recognition. Do not show "Show all" entry in group list if no group is existing, show text hint instead.

Author: David Graeff

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

@@ -120,11 +120,6 @@ Credentials createDefaultCredentials(String MacAddress) {
         return di;
     }
 
-    @Override
-    protected void checkReady() {
-        if (pluginReady != null) pluginReady.onPluginReady(this, false);
-    }
-
     /**
      * Execute multiple port commands for one device (anel supports this as an extra command).
      *
@@ -397,7 +392,7 @@ public boolean isStarted() {
 
     @Override
     public void requestData() {
-        AnelSendUDPBroadcastJob.run(dataService);
+        UDPSend.createBroadcast(dataService, "wer da?\r\n".getBytes(), UDPErrors.INQUERY_BROADCAST_REQUEST);
     }
 
     @Override
@@ -543,7 +538,7 @@ public String getPluginID() {
 
     @Override
     public String getLocalizedName() {
-        return PLUGIN_ID;
+        return App.getAppString(R.string.plugin_anel);
     }
 
     public void checkDevicesReachabilityAfterNetworkChange() {

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

@@ -49,8 +49,14 @@ public void httpResponse(IOConnection ioConnection, boolean callback_success, St
                 Credentials credentials = ioConnection.getCredentials();
                 AnelPlugin anelPlugin = (AnelPlugin) credentials.getPlugin();
 
-                // The name is the second ";" separated entry of the response_message.
-                credentials.setDeviceName(data[1].trim());
+                // The name is the second ";"-separated entry of the response_message.
+                // Only update device name if it is empty, we do not want to overwrite the name given by the user.
+                if (credentials.deviceName.isEmpty())
+                    credentials.setDeviceName(data[1].trim());
+
+                // The order is important: First save the credentials, then save the connections, then save the executables.
+                // Because: connections need the credentials object. Executables need the reachability information of the connections.
+
                 dataService.credentials.put(credentials);
                 // data[10 + i].trim() credentials deviceUID
 

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

@@ -4,10 +4,6 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.List;
-
 import oly.netpowerctrl.devices.Credentials;
 import oly.netpowerctrl.executables.Executable;
 import oly.netpowerctrl.executables.onNameChangeResult;
@@ -21,27 +17,10 @@
  */
 public abstract class AbstractBasePlugin {
     protected final DataService dataService;
-    // Connections to the destination device. This is prioritized, the first reachable connection
-    // is preferred before the second reachable etc.
-    private final List<IOConnection> mIOConnections = new ArrayList<>();
-    protected onPluginReady pluginReady = null;
-    protected WeakReference<onPluginFinished> pluginFinished = new WeakReference<>(null);
-
     protected AbstractBasePlugin(DataService dataService) {
         this.dataService = dataService;
     }
 
-    protected abstract void checkReady();
-
-    protected void registerReadyObserver(onPluginReady pluginReady) {
-        this.pluginReady = pluginReady;
-        checkReady();
-    }
-
-    protected void registerFinishedObserver(onPluginFinished pluginFinished) {
-        this.pluginFinished = new WeakReference<>(pluginFinished);
-    }
-
     public DataService getDataService() {
         return dataService;
     }