new icons; improved design; fixed bugs

Author: David Graeff

app/app.iml

@@ -70,6 +70,16 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.0.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/22.0.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/palette-v7/22.0.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/22.0.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v13/22.0.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.0.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.gabrielemariotti.changeloglib/library/1.5.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.rey5137/material/1.1.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.wefika/flowlayout/0.3.4/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/jp.wasabeef/recyclerview-animators/1.2.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />

app/hs_err_pid12500.log

@@ -64,15 +64,11 @@
             android:name=".main.MainActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|layoutDirection"
             android:label="@string/app_name"
-            android:launchMode="singleTask"
             android:theme="@style/Theme.StartTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
         </activity>
 
         <activity
@@ -94,15 +90,17 @@
 
         <activity
             android:name="oly.netpowerctrl.widget.ConfigExecutableActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden|layoutDirection">
+            android:configChanges="orientation|screenSize|keyboardHidden|layoutDirection"
+            android:theme="@style/Theme.StartTheme">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
             </intent-filter>
         </activity>
 
         <activity
             android:name="oly.netpowerctrl.widget.ConfigGroupActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden|layoutDirection">
+            android:configChanges="orientation|screenSize|keyboardHidden|layoutDirection"
+            android:theme="@style/Theme.StartTheme">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
             </intent-filter>
@@ -133,7 +131,7 @@
             android:description="@string/shortcut_existing_executable_desc"
             android:icon="@drawable/netpowerctrl"
             android:label="@string/shortcut_existing_executable"
-            android:theme="@style/Theme.StartTheme"
+            android:theme="@android:style/Theme.Dialog"
             android:windowSoftInputMode="stateHidden">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT" />

app/hs_err_pid15286.log

@@ -39,14 +39,18 @@ public String getUid() {
         return deviceUID;
     }
 
+    private int computeChangedCode() {
+        return deviceName.hashCode() + version.hashCode() + userName.hashCode() + password.hashCode() + (mConfigured ? 1 : 0);
+    }
+
     @Override
     public boolean hasChanged() {
-        return mLastHashCode != (deviceName.hashCode() + version.hashCode() + userName.hashCode() + password.hashCode());
+        return mLastHashCode != computeChangedCode();
     }
 
     @Override
     public void resetChanged() {
-        mLastHashCode = deviceName.hashCode() + version.hashCode() + userName.hashCode() + password.hashCode();
+        mLastHashCode = computeChangedCode();
     }
 
     public boolean isConfigured() {

app/src/main/AndroidManifest.xml

@@ -32,22 +32,26 @@ public class DeviceQuery {
     private static final int MSG_RECHECK_MINIMUM_TIME = 5;
     @SuppressWarnings("unused")
     private static final String TAG = "DeviceQuery";
+    private static int instances = 0;
     private final DataService dataService;
     private List<DevicesObserver> devicesObserverList = new ArrayList<>();
     private RepeatHandler handler;
     private MainHandler mainHandler = new MainHandler();
     private Thread thread = new Thread("DeviceObserverBase") {
         @Override
         public void run() {
+            if (++instances != 1)
+                throw new RuntimeException("Only one instance for DeviceQuery allowed!");
+
             Looper.prepare();
             handler = new RepeatHandler(Looper.myLooper());
             Looper.loop();
         }
     };
 
     public DeviceQuery(DataService dataService) {
-        thread.start();
         this.dataService = dataService;
+        thread.start();
     }
 
     /**
@@ -101,6 +105,7 @@ protected void doAction(Credentials credentials) {
             // remove from list of devices to observe and notify observers
             deviceFailed(credentials);
 
+            l.setReachability(ReachabilityStates.NotReachable);
             l.setStatusMessage(App.getAppString(R.string.device_energysave_mode));
             dataService.connections.put(l);
             return;
@@ -125,6 +130,7 @@ protected void doAction(Credentials credentials) {
      * can be removed.
      */
     private void deviceSuccess(Credentials credentials) {
+        if (Thread.currentThread() != thread) throw new RuntimeException();
         handler.removeMessages(MSG_REQUEST, credentials);
         for (DevicesObserver devicesObserver : devicesObserverList) {
             if (!devicesObserver.credentialsList.containsKey(credentials.deviceUID)) continue;
@@ -135,6 +141,7 @@ private void deviceSuccess(Credentials credentials) {
     }
 
     private void checkObserverFinished(DevicesObserver devicesObserver) {
+        if (Thread.currentThread() != thread) throw new RuntimeException();
         if (!devicesObserver.credentialsList.isEmpty()) return;
 
         // Remove timeouts for this observer. We will now either finish or wait for the minimum time
@@ -159,6 +166,7 @@ private void checkObserverFinished(DevicesObserver devicesObserver) {
     }
 
     private void deviceFailed(Credentials credentials) {
+        if (Thread.currentThread() != thread) throw new RuntimeException();
         handler.removeMessages(MSG_REQUEST, credentials);
         for (DevicesObserver devicesObserver : devicesObserverList) {
             if (!devicesObserver.credentialsList.containsKey(credentials.deviceUID)) continue;
@@ -169,6 +177,7 @@ private void deviceFailed(Credentials credentials) {
     }
 
     private void devicesTimeout(DevicesObserver devicesObserver) {
+        if (Thread.currentThread() != thread) throw new RuntimeException();
         handler.removeMessages(MSG_TIMEOUT, devicesObserver);
 
         for (Iterator<Map.Entry<String, Credentials>> iterator = devicesObserver.credentialsList.entrySet().iterator(); iterator.hasNext(); ) {
@@ -178,6 +187,7 @@ private void devicesTimeout(DevicesObserver devicesObserver) {
             DeviceIOConnections l = dataService.connections.openDevice(credentials.deviceUID);
             if (l != null) {
                 l.setStatusMessage(App.getAppString(R.string.device_timeout));
+                l.setReachability(ReachabilityStates.NotReachable);
                 dataService.connections.put(l);
             }
         }

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

@@ -3,7 +3,6 @@
 import android.support.annotation.NonNull;
 import android.util.JsonReader;
 import android.util.JsonWriter;
-import android.util.Log;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -315,7 +314,7 @@ public void setCredentials(Credentials credentials) {
      * @return Return true if the old cached state differs from the new state.
      */
     public boolean updateCachedReachability(ReachabilityStates new_state) {
-        Log.w("executable", "reachability " + new_state.name());
+        //Log.w("executable", "reachability " + new_state.name());
         ReachabilityStates a = cached_reachabilityStates;
         cached_reachabilityStates = new_state;
         return new_state != a;

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

@@ -18,6 +18,7 @@
 import oly.netpowerctrl.data.storage_container.CollectionOtherThreadPutHandler;
 import oly.netpowerctrl.devices.Credentials;
 import oly.netpowerctrl.network.ReachabilityStates;
+import oly.netpowerctrl.scenes.Scene;
 import oly.netpowerctrl.utils.ObserverUpdateActions;
 
 /**
@@ -46,7 +47,7 @@ public Executable findByUID(String uid) {
     }
 
     private void put_test(Executable executable) {
-        if (executable.getUid() == null || executable.getCredentials() == null || executable.title.isEmpty())
+        if (executable.getUid() == null || (!(executable instanceof Scene) && executable.getCredentials() == null) || executable.title.isEmpty())
             throw new RuntimeException();
     }