improve add device dialog; lint fixes

Author: David Gräff

.idea/misc.xml

@@ -5,6 +5,7 @@ android {
     buildToolsVersion '20'
 
     productFlavors {
+        //noinspection GroovyMissingReturnStatement
         vanilla {
 
         }
@@ -17,8 +18,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 20
-        versionCode 80
-        versionName "5.6.5"
+        versionCode 81
+        versionName "5.7"
     }
 
     lintOptions {

.idea/workspace.xml

@@ -35,22 +35,13 @@
 }
 
 # keep this otherwise it is removed by ProGuard
--keep public class org.acra.ErrorReporter
-{
+-keep public class org.acra.ErrorReporter {
     public void addCustomData(java.lang.String,java.lang.String);
     public void putCustomData(java.lang.String,java.lang.String);
     public void removeCustomData(java.lang.String);
 }
 
 # keep this otherwise it is removed by ProGuard
--keep public class org.acra.ErrorReporter
-{
+-keep public class org.acra.ErrorReporter {
     public void handleSilentException(java.lang.Throwable);
 }
-
--keepnames class oly.netpowerctrl.shortcut.SceneEditFragmentReady {
-    *;
-}
--keepnames class oly.netpowerctrl.main.SceneEditFragment {
-    *;
-}

app/build.gradle

@@ -34,7 +34,8 @@
         android:name=".application_state.NetpowerctrlApplication"
         android:allowBackup="true"
         android:icon="@drawable/netpowerctrl"
-        android:label="@string/app_name">
+        android:label="@string/app_name"
+        android:supportsRtl="true">
 
         <!--android:permission="android.permission.MANAGE_DOCUMENTS"-->
         <provider

app/proguard-rules.txt

@@ -1,6 +1,5 @@
 package oly.netpowerctrl.anel;
 
-import android.content.Context;
 import android.os.Handler;
 
 import java.util.List;
@@ -17,13 +16,11 @@
  */
 public class AnelCreateDevice implements DeviceObserverResult, DeviceUpdate {
     public final Device device;
-    private final Context context;
     public AnelCreateDeviceResult listener = null;
     TestStates test_state = TestStates.TEST_INIT;
     private DeviceQuery deviceQuery;
 
-    public AnelCreateDevice(Device di, Context context) {
-        this.context = context;
+    public AnelCreateDevice(Device di) {
         if (di == null) {
             device = Device.createNewDevice(AnelUDPDeviceDiscoveryThread.anelPlugin.getPluginID());
             device.setPluginInterface(AnelUDPDeviceDiscoveryThread.anelPlugin);
@@ -54,6 +51,12 @@ public void onDeviceUpdated(Device updated_device, boolean willBeRemoved) {
         if (!updated_device.equalsByUniqueID(device))
             return;
 
+        if (!updated_device.isReachable()) {
+            test_state = TestStates.TEST_INIT;
+            if (listener != null)
+                listener.testFinished(false);
+        }
+
         if (test_state == TestStates.TEST_REACHABLE) {
             // Update stored device with received values
             device.UniqueDeviceID = updated_device.UniqueDeviceID;
@@ -106,6 +109,7 @@ public void onObserverJobFinished(List<Device> timeout_devices) {
         }
     }
 
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     public boolean startTest() {
         test_state = TestStates.TEST_REACHABLE;
 

app/src/main/AndroidManifest.xml

@@ -432,7 +432,7 @@ public void configureDeviceScreenClose() {
 
     @Override
     public void showConfigureDeviceScreen(Device device) {
-        anelCreateDevice = new AnelCreateDevice(device, NetpowerctrlApplication.instance);
+        anelCreateDevice = new AnelCreateDevice(device);
         MainActivity.getNavigationController().changeToDialog(MainActivity.instance, AnelDevicePreferences.class.getName());
     }
 

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

@@ -30,7 +30,7 @@ public class LoadStoreData {
         public void scenesSave(SceneCollection scenes) {
             Context context = NetpowerctrlApplication.instance;
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-            prefs.edit().putString("scenes", scenes.toJSON()).commit();
+            prefs.edit().putString("scenes", scenes.toJSON()).apply();
         }
     };
 
@@ -39,7 +39,7 @@ public void scenesSave(SceneCollection scenes) {
         public void groupsSave(GroupCollection groups) {
             Context context = NetpowerctrlApplication.instance;
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-            prefs.edit().putString("groups", groups.toJSON()).commit();
+            prefs.edit().putString("groups", groups.toJSON()).apply();
         }
     };
 
@@ -48,7 +48,7 @@ public void groupsSave(GroupCollection groups) {
         public void devicesSave(DeviceCollection devices) {
             Context context = NetpowerctrlApplication.instance;
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-            prefs.edit().putString("devices", devices.toJSON()).commit();
+            prefs.edit().putString("devices", devices.toJSON()).apply();
         }
     };
 
@@ -57,7 +57,7 @@ public void devicesSave(DeviceCollection devices) {
         public void alarmsSave(TimerController alarms) {
             Context context = NetpowerctrlApplication.instance;
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-            prefs.edit().putString("alarms", alarms.toJSON()).commit();
+            prefs.edit().putString("alarms", alarms.toJSON()).apply();
         }
     };
 

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

@@ -114,7 +114,7 @@ public boolean isShowingHidden() {
         return mShowHidden;
     }
 
-    public void setRemoveAnimation(AnimationController animationController) {
+    public void setAnimationController(AnimationController animationController) {
         mAnimationWeakReference = new WeakReference<>(animationController);
     }
 
@@ -471,9 +471,9 @@ private boolean addItemToGroup(DevicePort devicePort, int command_value, int sta
             // If the same DevicePort already exists in this adapter, we will update that instead
             if (l.port.uuid.equals(devicePort.uuid)) {
                 // Animate if value has changed
-                if (l.command_value != command_value && a != null) {
-                    a.addSmallHighlight(l.id);
-                }
+//                if (l.command_value != command_value && a != null) {
+//                    a.addSmallHighlight(l.id);
+//                }
                 // Apply new values to existing item
                 l.command_value = command_value;
                 l.setPort(devicePort);

app/src/main/java/oly/netpowerctrl/application_state/LoadStoreData.java

@@ -4,7 +4,9 @@
 import android.util.JsonWriter;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -179,11 +181,6 @@ public DeviceConnection getFirstReachableConnection(String protocol) {
         return null;
     }
 
-    public void setReachable(int index) {
-        DeviceConnections.get(index).setReachable();
-        compute_first_reachable();
-    }
-
     /**
      * Set all device connections to not reachable, which match the given protocol.
      *
@@ -487,12 +484,31 @@ public String getFeatureString() {
         return f;
     }
 
+    public boolean isReachable() {
+        if (!enabled)
+            return false;
+        for (DeviceConnection connection : DeviceConnections) {
+            if (connection.isReachable())
+                return true;
+        }
+        return false;
+    }
+
+    public void setReachable(int index) {
+        DeviceConnections.get(index).setReachable();
+        compute_first_reachable();
+    }
+
     public String getNotReachableReasons() {
         if (!enabled)
             return NetpowerctrlApplication.instance.getString(R.string.error_device_disabled);
         String f = "";
-        for (DeviceConnection connection : DeviceConnections)
-            f += connection.getNotReachableReason() + " ";
+        for (DeviceConnection connection : DeviceConnections) {
+            String a = connection.getNotReachableReason();
+            if (a != null) {
+                f += a + " ";
+            }
+        }
         return f;
     }
 
@@ -524,4 +540,27 @@ public void addConnection(DeviceConnection newConnection) {
             setReachable(DeviceConnections.size() - 1);
         }
     }
+
+    public InetAddress[] getHostnameIPs() {
+        List<InetAddress> addresses = new ArrayList<>();
+        for (DeviceConnection connection : DeviceConnections) {
+            Collections.addAll(addresses, connection.getHostnameIPs());
+        }
+
+        InetAddress[] a = new InetAddress[addresses.size()];
+        addresses.toArray(a);
+        return a;
+    }
+
+    public boolean hasAddress(InetAddress[] hostnameIPs) {
+        if (hostnameIPs == null || hostnameIPs.length == 0)
+            return false;
+
+        for (DeviceConnection connection : DeviceConnections) {
+            if (connection.hasAddress(hostnameIPs))
+                return true;
+        }
+
+        return false;
+    }
 }