Version 1.5

* Fix: Abstürze im "Alle Steckdosen"-Fenster behoben, das Speichern von
  versteckten Steckdosen
* Fix: Das Erstellen von Szenen ist wieder möglich.
* Feature: Widgets werden jetzt über einen Hintergrundservice aktuell
  gehalten. Dies kann in den Einstellungen abgeschaltet werden.
* Deutsche Übersetzung vervollständigt.
* Feature: NFC / Android Beam kann nun auch Szenen übertragen.
* Feature: Im "Alle Steckdosen"-Fenster können die Gerätenamen nun
  vor den Steckdosennamen angezeigt werden.
* Feature: Steckdosen können alphabetisch sortiert werden im "Alle Steckdosen"-Fenster.

Author: davidgraeff

.idea/dictionaries/david.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="oly.netpowerctrl"
-    android:versionCode="5"
-    android:versionName="1.3a">
+    android:versionCode="8"
+    android:versionName="1.5">
 
     <!-- Api level 16: Android 4.1 27. Juni 2012 -->
     <uses-sdk
@@ -11,6 +11,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.launcher.permission.INSTALL_SHORTCUT" />
 
     <application
         android:name="oly.netpowerctrl.main.NetpowerctrlApplication"
@@ -27,6 +28,11 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="application/oly.netpowerctrl" />
+            </intent-filter>
         </activity>
 
         <activity
@@ -51,19 +57,19 @@
 
         <activity
             android:icon="@drawable/netpowerctrl"
-            android:label="@string/app_name"
-            android:launchMode="standard"
+            android:label="@string/app_name_shortcut"
+            android:description="@string/app_name_shortcut_desc"
             android:theme="@style/Theme.CustomLightTheme"
-            android:name=".shortcut.ShortcutCreatorActivity">
+            android:name="oly.netpowerctrl.shortcut.ShortcutCreatorActivity">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
         <receiver
-            android:icon="@drawable/netpowerctrl"
-            android:label="@string/app_name"
+            android:icon="@drawable/widget"
+            android:label="@string/app_name_widget"
             android:name="oly.netpowerctrl.widget.DeviceWidgetProvider">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -78,6 +84,10 @@
             android:name="oly.netpowerctrl.anelservice.NetpowerctrlService"
             android:permission="android.permission.INTERNET" />
 
+        <service
+            android:name="oly.netpowerctrl.test.TestService"
+            android:permission="android.permission.INTERNET" />
+
         <service android:name="oly.netpowerctrl.widget.WidgetUpdateService" />
     </application>
 

.idea/workspace.xml

@@ -16,9 +16,9 @@
 
 /**
  * Use the static sendQuery and sendBroadcastQuery methods to issue a query to one
- * or all devices. If you want to issue a query and get notified on the result or get a
+ * or all scenes. If you want to issue a query and get notified on the result or get a
  * timeout if no reaction can be received within 1.2s, create a DeviceQuery object with
- * all devices to query.
+ * all scenes to query.
  */
 public class DeviceQuery {
     private Collection<DeviceInfo> devices_to_observe;

app/src/main/AndroidManifest.xml

@@ -58,7 +58,6 @@ public void interrupt() {
     }
 
     void parsePacket(final String message, int receive_port) {
-
         String msg[] = message.split(":");
         if (msg.length < 3) {
             return;
@@ -93,7 +92,7 @@ void parsePacket(final String message, int receive_port) {
                 continue;
             OutletInfo oi = new OutletInfo(di);
             oi.OutletNumber = i + 1; // 1-based
-            oi.Description = outlet[0];
+            oi.setDescriptionByDevice(outlet[0]);
             if (outlet.length > 1)
                 oi.State = outlet[1].equals("1");
             oi.Disabled = (disabledOutlets & (1 << i)) != 0;

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

@@ -20,22 +20,25 @@ public class NetpowerctrlService extends Service {
     private ArrayList<DeviceError> errorObserver = new ArrayList<DeviceError>();
 
     public void registerDeviceUpdateObserver(DeviceUpdate o) {
-        observer.add(o);
+        if (!observer.contains(o))
+            observer.add(o);
     }
 
     public void unregisterDeviceUpdateObserver(DeviceUpdate o) {
         observer.remove(o);
     }
 
     public void registerDeviceErrorObserver(DeviceError o) {
-        errorObserver.add(o);
+        if (!errorObserver.contains(o))
+            errorObserver.add(o);
     }
 
     public void unregisterDeviceErrorObserver(DeviceError o) {
         errorObserver.remove(o);
     }
 
     public void notifyObservers(final DeviceInfo di) {
+        //Log.w("LISTEN_SERVICE", "UPDATE "+di.HostName);
         assert di != null;
         if (observer.isEmpty())
             return;

app/src/main/java/oly/netpowerctrl/anelservice/DiscoveryThread.java

@@ -0,0 +1,8 @@
+package oly.netpowerctrl.anelservice;
+
+/**
+ * Get a notification when the service is ready
+ */
+public interface ServiceReady {
+    void onServiceReady(NetpowerctrlService mDiscoverService);
+}

app/src/main/java/oly/netpowerctrl/anelservice/NetpowerctrlService.java

@@ -3,80 +3,40 @@
 import android.util.JsonReader;
 import android.util.JsonWriter;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Contains DeviceInfos. Used for NFC and backup transfers
  */
 public class DeviceCollection {
-    public static final int PROTOCOLVERSION = 1;
-    public ArrayList<DeviceInfo> devices;
+    public List<DeviceInfo> devices;
 
-    public static DeviceCollection fromDevices(ArrayList<DeviceInfo> devices) {
+    public static DeviceCollection fromDevices(List<DeviceInfo> devices) {
         DeviceCollection dc = new DeviceCollection();
         dc.devices = devices;
         return dc;
     }
 
-    public static DeviceCollection fromJSON(String devices_as_string) throws IOException {
+    public static DeviceCollection fromJSON(JsonReader reader) throws IOException, IllegalStateException {
         DeviceCollection dc = new DeviceCollection();
-
-        // Get JsonReader from String
-        byte[] bytes;
-        try {
-            bytes = devices_as_string.getBytes("UTF-8");
-        } catch (UnsupportedEncodingException ignored) {
-            return null;
-        }
-        ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
-        JsonReader reader = new JsonReader(new InputStreamReader(bais));
-
         dc.devices = new ArrayList<DeviceInfo>();
 
-        reader.beginObject();
+
+        reader.beginArray();
         while (reader.hasNext()) {
-            String name = reader.nextName();
-            if (name.equals("devices")) {
-                reader.beginArray();
-                while (reader.hasNext()) {
-                    dc.devices.add(DeviceInfo.fromJSON(reader));
-                }
-                reader.endArray();
-            } else {
-                reader.skipValue();
-            }
+            dc.devices.add(DeviceInfo.fromJSON(reader));
         }
-        reader.endObject();
+        reader.endArray();
         return dc;
     }
 
-    public String toJSON() throws IOException {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        JsonWriter writer;
-        try {
-            writer = new JsonWriter(new OutputStreamWriter(baos, "UTF-8"));
-        } catch (UnsupportedEncodingException e) {
-            return null;
-        }
-
-        writer.beginObject();
-        writer.name("version").value(PROTOCOLVERSION);
-        writer.name("source_device").value(android.os.Build.MODEL);
-        writer.name("devices").beginArray();
+    public void toJSON(JsonWriter writer) throws IOException {
+        writer.beginArray();
         for (DeviceInfo di : devices) {
             di.toJSON(writer);
         }
         writer.endArray();
-        writer.endObject();
-
-        writer.close();
-
-        return baos.toString();
     }
 }

app/src/main/java/oly/netpowerctrl/anelservice/ServiceReady.java

@@ -66,9 +66,9 @@ public byte getSwitchByte() {
         return data;
     }
 
-    static public Collection<DeviceCommand> fromOutletCommandGroup(OutletCommandGroup og) {
+    static public Collection<DeviceCommand> fromOutletCommandGroup(Scene og) {
         TreeMap<String, DeviceCommand> deviceCommands = new TreeMap<String, DeviceCommand>();
-        for (OutletCommand c : og.commands) {
+        for (SceneOutlet c : og.commands) {
             if (!deviceCommands.containsKey(c.device_mac)) {
                 deviceCommands.put(c.device_mac, new DeviceCommand(c.outletinfo.device));
             }

app/src/main/java/oly/netpowerctrl/datastructure/DeviceCollection.java

@@ -84,6 +84,23 @@ public DeviceInfo(DeviceInfo other) {
             Outlets.add(new OutletInfo(oi));
     }
 
+    /**
+     * Return true if both DeviceInfo objects refer to the same device.
+     *
+     * @param other Compare to other DeviceInfo
+     * @return
+     */
+    @SuppressWarnings("unused")
+    public boolean equalsFuntional(DeviceInfo other) {
+        return HostName.equals(other.HostName) && ReceivePort == other.ReceivePort;
+    }
+
+    /**
+     * Return true if this and the other DeviceInfo are the same configured DeviceInfo.
+     *
+     * @param other Compare to other DeviceInfo
+     * @return
+     */
     @SuppressWarnings("unused")
     public boolean equals(DeviceInfo other) {
         return uuid.equals(other.uuid);