Do not save scenes from homescreen icons when executed. Complete plugin SimpleUDP. Reduce changelog to version 7 and 8. Buildsystem: Ignore incomlete translation for the time beeing.

Author: David Graeff

app/build.gradle

@@ -16,7 +16,7 @@ android {
     defaultConfig {
         minSdkVersion 17
         targetSdkVersion 22
-        versionCode 119
+        versionCode 120
         versionName "8.0"
         applicationId appID
         testApplicationId "oly.netpowerctrl.tests"
@@ -26,6 +26,7 @@ android {
 
     lintOptions {
         abortOnError false
+        warning "MissingTranslation"
     }
 
     compileOptions {

app/hs_err_pid12500.log

@@ -21,19 +21,11 @@
     *;
 }
 
--keep oly.netpowerctrl.debug {
-    *;
-}
-
 # keep this around for some enums that ACRA needs
 -keep class org.acra.ReportingInteractionMode {
     *;
 }
 
--assumenosideeffects class oly.netpowerctrl.plugin.** { *; }
-
--assumenosideeffects class oly.netpowerctrl.consistency_tests.** { *; }
-
 -keepnames class org.acra.sender.HttpSender$** {
     *;
 }

app/hs_err_pid15286.log

@@ -21,8 +21,6 @@
     <uses-permission android:name="android.permission.MANAGE_DOCUMENTS" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="com.android.vending.BILLING" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 
     <uses-feature
@@ -41,7 +39,7 @@
         <!--android:permission="android.permission.MANAGE_DOCUMENTS"-->
         <provider
             android:name=".utils.AssetDocumentProvider"
-            android:authorities="@string/authority"
+            android:authorities="oly.netpowerctrl.utils.AssetDocumentProvider"
             android:enabled="@bool/atLeastKitKat"
             android:exported="true"
             android:grantUriPermissions="true"

app/proguard-rules.txt

@@ -55,10 +55,20 @@ public class Executable implements Comparable, IOInterface {
     private boolean cached_executionInProgress;
     private Credentials credentials;
     private ReachabilityStates cached_reachabilityStates = ReachabilityStates.NotReachable;
+    private boolean isSaveable = true;
 
     public Executable() {
     }
 
+    public boolean isSaveable() {
+        return this.isSaveable;
+    }
+
+    public void setIsSaveable(boolean isSaveable) {
+        this.isSaveable = isSaveable;
+    }
+
+
     /**
      * Notice: Only call this method if the NetpowerctrlService service is running!
      *
@@ -219,9 +229,14 @@ public int computeChangedCode() {
         return (ui_type.hashCode() + uid.hashCode() + current_value + max_value + min_value + (hidden ? 1 : 0) + group_uids.hashCode());
     }
 
+    /**
+     * An executable may not always be safeable, for example if it is a homescreen icon for execution.
+     *
+     * @return
+     */
     @Override
     public boolean hasChanged() {
-        return last_hash_code != computeChangedCode();
+        return isSaveable && last_hash_code != computeChangedCode();
     }
 
     @Override
@@ -339,4 +354,9 @@ public boolean updateCachedReachability(ReachabilityStates new_state) {
         cached_reachabilityStates = new_state;
         return new_state != a;
     }
+
+    public void destroy(DataService dataService) {
+        credentials = null;
+        //uid = null;
+    }
 }

app/src/main/AndroidManifest.xml

@@ -77,16 +77,20 @@ public void put(Executable executable) {
             return;
         }
 
-        items.put(executable.getUid(), executable);
-        notifyObservers(executable, ObserverUpdateActions.AddAction);
-        if (!executable.needCredentials() || executable.getCredentials().isConfigured())
-            storage.save(executable);
+        if (executable.isSaveable()) {
+            items.put(executable.getUid(), executable);
+            notifyObservers(executable, ObserverUpdateActions.AddAction);
+            if (!executable.needCredentials() || executable.getCredentials().isConfigured())
+                storage.save(executable);
+        }
     }
 
     public void remove(Executable executable) {
-        items.remove(executable.deviceUID);
+        items.remove(executable.getUid());
+        dataService.favourites.setFavourite(executable.getUid(), false);
         storage.remove(executable);
         notifyObservers(executable, ObserverUpdateActions.RemoveAction);
+        executable.destroy(dataService);
     }
 
     /**
@@ -100,8 +104,10 @@ public void remove(Credentials credentials) {
             Executable executable = iterator.next();
             if (executable.deviceUID.equals(credentials.deviceUID)) {
                 iterator.remove();
-                notifyObservers(executable, ObserverUpdateActions.RemoveAction);
+                storage.remove(executable);
                 dataService.favourites.setFavourite(executable.getUid(), false);
+                notifyObservers(executable, ObserverUpdateActions.RemoveAction);
+                executable.destroy(dataService);
             }
         }
     }
@@ -131,7 +137,7 @@ public void notifyReachability(String deviceUID, ReachabilityStates r) {
         }
     }
 
-    public void notifyReachability(Executable executable, ReachabilityStates r) {
+    public void notifyReachability(Executable executable) {
         notifyObservers(executable, ObserverUpdateActions.UpdateReachableAction);
     }
 

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

@@ -98,11 +98,12 @@ public boolean onDataQueryFinished(DataService dataService) {
 
                 // Read data from intent
                 destination_uuid = extra.getString(EXECUTE_ACTION_UUID, destination_uuid);
-                String scene_json = extra.getString(EXECUTE_SCENE_JSON);
+                String execution_json = extra.getString(EXECUTE_SCENE_JSON);
 
-                if (scene_json != null) {
+                if (execution_json != null) {
                     try {
-                        Executable executable = new ExecutableFabric().newInstance(JSONHelper.getReader(scene_json));
+                        Executable executable = new ExecutableFabric().newInstance(JSONHelper.getReader(execution_json));
+                        executable.setIsSaveable(false);
                         executable.execute(dataService, action_command, executionFinished);
                     } catch (IOException | ClassNotFoundException ignored) {
                     }

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

@@ -13,7 +13,7 @@
 import oly.netpowerctrl.ui.notifications.InAppNotifications;
 
 abstract public class UDPReceiving extends Thread {
-    private final int receive_port;
+    protected final int receive_port;
     protected DatagramPacket receivedDatagram;
     private boolean keep_running;
     private DatagramSocket socket;
@@ -39,7 +39,7 @@ public void run() {
                 socket.bind(new InetSocketAddress(receive_port));
                 while (keep_running) {
                     socket.receive(receivedDatagram);
-                    parsePacket(message, receivedDatagram.getLength(), receive_port, socket.getLocalAddress(), receivedDatagram.getAddress());
+                    parsePacket(message, receivedDatagram.getLength(), socket.getLocalAddress(), receivedDatagram.getAddress());
                     //NetworkInterface.getByInetAddress(socket.getLocalAddress()));
                 }
                 socket.close();
@@ -66,7 +66,7 @@ public void interrupt() {
     }
 
     protected abstract void parsePacket(final byte[] message, int length,
-                                        int receive_port, InetAddress local, InetAddress peer);
+                                        InetAddress local, InetAddress peer);
 
     /**
      * @return Return the receive port of this thread

app/src/main/java/oly/netpowerctrl/main/ExecutionActivity.java

@@ -224,59 +224,6 @@ private int executeDeviceBatch(@NonNull IOConnection ioConnection,
         return command_list.size();
     }
 
-    private void startNetworkReceivers(boolean changed) {
-        // Get all ports of configured devices and add the additional_port if != 0
-        Set<Integer> ports = dataService.connections.getAllUDPReceivePorts(this);
-        ports.add(SharedPrefs.getInstance().getDefaultReceivePort());
-
-        if (!changed && discoveryThreads.size() == ports.size()) return;
-
-        boolean new_threads_started = false;
-        List<AnelReceiveUDP> unusedThreads = new ArrayList<>(discoveryThreads);
-
-        StackTraceElement[] stacktrace = Thread.currentThread().getStackTrace();
-        String methodName = stacktrace[3].getClassName() + ":" + stacktrace[3].getMethodName() + "->" + stacktrace[4].getClassName() + ":" + stacktrace[4].getMethodName();
-        Log.w(PLUGIN_ID, "startNetworkReceivers " + methodName);
-
-        // Go through all ports and start a thread for it if none is running for it so far
-        for (int port : ports) {
-            boolean already_running = false;
-            for (AnelReceiveUDP running_thread : discoveryThreads) {
-                if (running_thread.getPort() == port) {
-                    already_running = true;
-                    unusedThreads.remove(running_thread);
-                    break;
-                }
-            }
-
-            if (already_running) {
-                continue;
-            }
-
-            new_threads_started = true;
-            AnelReceiveUDP thr = new AnelReceiveUDP(this, port);
-            thr.start();
-            discoveryThreads.add(thr);
-        }
-
-        if (unusedThreads.size() > 0) {
-            for (AnelReceiveUDP thr : unusedThreads) {
-                thr.interrupt();
-                discoveryThreads.remove(thr);
-            }
-        }
-
-        if (new_threads_started) {
-            // give the threads a chance to start
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException ignored) {
-            }
-        }
-
-        HttpThreadPool.startHTTP();
-    }
-
     private void stopNetwork() {
         StackTraceElement[] stacktrace = Thread.currentThread().getStackTrace();
         String methodName = stacktrace[3].getClassName() + ":" + stacktrace[3].getMethodName() + "->" + stacktrace[4].getClassName() + ":" + stacktrace[4].getMethodName();
@@ -343,7 +290,7 @@ else if (command == Executable.TOGGLE)
             }
             return success;
         } else if (ioConnection instanceof IOConnectionUDP) {
-            final Credentials credentials = dataService.credentials.findByUID(executable.deviceUID);
+            final Credentials credentials = ioConnection.credentials;
             if (credentials == null) {
                 Log.e(PLUGIN_ID, "execute. No credentials found!");
                 if (callback != null) callback.addFail();
@@ -383,7 +330,56 @@ public void onDestroy() {
 
     @Override
     public void onStart(Context context) {
-        startNetworkReceivers(true);
+        // Get all ports of configured devices and add the additional_port if != 0
+        Set<Integer> ports = dataService.connections.getAllUDPReceivePorts(this);
+        ports.add(SharedPrefs.getInstance().getDefaultReceivePort());
+
+        if (discoveryThreads.size() == ports.size()) return;
+
+        boolean new_threads_started = false;
+        List<AnelReceiveUDP> unusedThreads = new ArrayList<>(discoveryThreads);
+
+        StackTraceElement[] stacktrace = Thread.currentThread().getStackTrace();
+        String methodName = stacktrace[3].getClassName() + ":" + stacktrace[3].getMethodName() + "->" + stacktrace[4].getClassName() + ":" + stacktrace[4].getMethodName();
+        Log.w(PLUGIN_ID, "startNetworkReceivers " + methodName);
+
+        // Go through all ports and start a thread for it if none is running for it so far
+        for (int port : ports) {
+            boolean already_running = false;
+            for (AnelReceiveUDP running_thread : discoveryThreads) {
+                if (running_thread.getPort() == port) {
+                    already_running = true;
+                    unusedThreads.remove(running_thread);
+                    break;
+                }
+            }
+
+            if (already_running) {
+                continue;
+            }
+
+            new_threads_started = true;
+            AnelReceiveUDP thr = new AnelReceiveUDP(this, port);
+            thr.start();
+            discoveryThreads.add(thr);
+        }
+
+        if (unusedThreads.size() > 0) {
+            for (AnelReceiveUDP thr : unusedThreads) {
+                thr.interrupt();
+                discoveryThreads.remove(thr);
+            }
+        }
+
+        if (new_threads_started) {
+            // give the threads a chance to start
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException ignored) {
+            }
+        }
+
+        HttpThreadPool.startHTTP();
     }
 
     @Override