davidgraeff
diff --git a/‎.idea/workspace.xml‎
Lines changed: 561 additions & 388 deletions b/‎.idea/workspace.xml‎
Lines changed: 561 additions & 388 deletions
diff --git a/‎app/src/main/AndroidManifest.xml‎
Lines changed: 51 additions & 67 deletions b/‎app/src/main/AndroidManifest.xml‎
Lines changed: 51 additions & 67 deletions
diff --git a/‎app/src/main/java/oly/netpowerctrl/datastructure/DeviceInfo.java‎
Lines changed: 142 additions & 0 deletions b/‎app/src/main/java/oly/netpowerctrl/datastructure/DeviceInfo.java‎
Lines changed: 142 additions & 0 deletions
diff --git a/‎app/src/main/java/oly/netpowerctrl/datastructure/OutletCommand.java‎
Lines changed: 40 additions & 0 deletions b/‎app/src/main/java/oly/netpowerctrl/datastructure/OutletCommand.java‎
Lines changed: 40 additions & 0 deletions
@@ -2,99 +2,83 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="oly.netpowerctrl"
     android:versionCode="4"
-    android:versionName="1.3" >
+    android:versionName="1.3">
 
-    <uses-sdk android:minSdkVersion="16"
-              android:targetSdkVersion="17" />
-    
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.NFC"/>
+    <uses-sdk
+        android:minSdkVersion="16"
+        android:targetSdkVersion="17" />
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.NFC" />
 
     <application
         android:icon="@drawable/netpowerctrl"
-        android:label="@string/app_name" android:allowBackup="true">
+        android:label="@string/app_name"
+        android:allowBackup="true">
         <activity
             android:name="oly.netpowerctrl.main.NetpowerctrlActivity"
             android:label="@string/app_name"
-            android:launchMode="singleInstance"
+            android:launchMode="singleTask"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:theme="@style/Theme.CustomLightTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        
-        <activity
-             android:name="oly.netpowerctrl.preferences.DevicePreferencesActivity"
-             android:configChanges="keyboardHidden|orientation|screenSize">
-        </activity>
-        
-        <activity
-			 android:name="oly.netpowerctrl.preferences.PreferencesActivity"
-             android:configChanges="keyboardHidden|orientation|screenSize">
-        </activity>
-        
+
         <activity
-             android:name="oly.netpowerctrl.outletconfig.OutletConfig"
-             android:configChanges="keyboardHidden|orientation|screenSize"
-             android:windowSoftInputMode="adjustPan"> <!--  needed for focusable EditText inside ListView -->
-        </activity>
-        
-        <activity 
-            android:name="oly.netpowerctrl.devicecontrol.DeviceControlActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:theme="@style/Theme.CustomLightTheme">
-        </activity>
-        
-        <activity 
-            android:name="oly.netpowerctrl.service.ShortcutExecutionActivity"
+            android:name=".shortcut.ShortcutExecutionActivity"
             android:label="@string/app_name"
             android:icon="@drawable/netpowerctrl"
             android:theme="@style/Theme.Transparent"
             android:exported="true">
-			<intent-filter>
-            	<action android:name="android.intent.action.MAIN"/>
-        	</intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
         </activity>
 
-	    <activity android:name="oly.netpowerctrl.widget.WidgetConfig">
-    	    <intent-filter>        
-    	    	<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
-    	    </intent-filter>
-   	    </activity>
-   	    
-	    <activity
-	        android:icon="@drawable/netpowerctrl"
-		  	android:label="@string/app_name"
-		  	android:name="oly.netpowerctrl.service.ShortcutCreatorActivity">
-		  <intent-filter>
-		    <action android:name="android.intent.action.CREATE_SHORTCUT" />
-		    <category android:name="android.intent.category.DEFAULT" />
-		  </intent-filter>
-		</activity>
+        <activity
+            android:name="oly.netpowerctrl.widget.WidgetConfig"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.CustomLightTheme">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:icon="@drawable/netpowerctrl"
+            android:label="@string/app_name"
+            android:launchMode="standard"
+            android:theme="@style/Theme.CustomLightTheme"
+            android:name=".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:name="oly.netpowerctrl.widget.DeviceWidgetProvider" >
-	       <intent-filter >
-	            <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-	       </intent-filter>
-	
-	       <meta-data
-	          android:name="android.appwidget.provider"
-	          android:resource="@xml/appwidget_provider" />
-		</receiver>
-		
-        <service 
+            android:icon="@drawable/netpowerctrl"
+            android:label="@string/app_name"
+            android:name="oly.netpowerctrl.widget.DeviceWidgetProvider">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/appwidget_provider" />
+        </receiver>
+
+        <service
             android:label="@string/app_name"
             android:icon="@drawable/netpowerctrl"
             android:name="oly.netpowerctrl.service.NetpowerctrlService"
-            android:permission="android.permission.INTERNET">
-        </service>
+            android:permission="android.permission.INTERNET" />
+
+    </application>
 
-     </application>
 
-    
 </manifest>
@@ -0,0 +1,142 @@
+package oly.netpowerctrl.datastructure;
+
+import android.content.Context;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import oly.netpowerctrl.R;
+import oly.netpowerctrl.service.DeviceQuery;
+
+// this class holds all the info about one device
+public class DeviceInfo implements Parcelable {
+
+    public UUID uuid;
+
+    public String DeviceName; // name of the device as reported by UDP or configured by the user
+    public String HostName;   // the hostname or ip address used to reach the device
+    public String MacAddress; // the mac address as sent from the device
+
+    public String UserName;
+    public String Password;
+
+    public boolean DefaultPorts;
+    public int SendPort;
+    public int RecvPort;
+
+    public boolean Configured;
+
+    public List<OutletInfo> Outlets;
+
+    public static String makePrefname(UUID uuid) {
+        return uuid.toString().replace(":", "-");
+    }
+
+
+    public DeviceInfo() {
+        uuid = UUID.randomUUID();
+        DeviceName = "";
+        HostName = "";
+        MacAddress = "";
+        UserName = "";
+        Password = "";
+        DefaultPorts = true;
+        SendPort = -1;
+        RecvPort = -1;
+        Configured = false;
+        Outlets = new ArrayList<OutletInfo>();
+    }
+
+    public DeviceInfo(Context cx) {
+        this();
+        DeviceName = cx.getResources().getString(R.string.default_device_name);
+        SendPort = DeviceQuery.getDefaultSendPort(cx);
+        RecvPort = DeviceQuery.getDefaultRecvPort(cx);
+    }
+
+    public DeviceInfo(DeviceInfo other) {
+        uuid = UUID.randomUUID();
+        DeviceName = other.DeviceName;
+        HostName = other.HostName;
+        MacAddress = other.MacAddress;
+        UserName = other.UserName;
+        Password = other.Password;
+        DefaultPorts = other.DefaultPorts;
+        SendPort = other.SendPort;
+        RecvPort = other.RecvPort;
+        Configured = other.Configured;
+        Outlets = new ArrayList<OutletInfo>();
+        for (OutletInfo oi : other.Outlets)
+            Outlets.add(new OutletInfo(oi));
+    }
+
+    @SuppressWarnings("unused")
+    public boolean equals(DeviceInfo other) {
+        return uuid.equals(other.uuid);
+    }
+
+    @SuppressWarnings("unused")
+    public boolean equals(UUID uuid) {
+        return uuid.equals(uuid);
+    }
+
+    public String getPrefname() {
+        return makePrefname(uuid);
+    }
+
+    public int describeContents() {
+        return 0;
+    }
+
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(uuid.toString());
+        dest.writeString(DeviceName);
+        dest.writeString(HostName);
+        dest.writeString(MacAddress);
+        dest.writeString(UserName);
+        dest.writeString(Password);
+        dest.writeInt(DefaultPorts ? 1 : 0);
+        dest.writeInt(SendPort);
+        dest.writeInt(RecvPort);
+        dest.writeTypedList(Outlets);
+    }
+
+    // this is used to regenerate your object. All Parcelables must have a CREATOR that implements these two methods
+    public static final Parcelable.Creator<DeviceInfo> CREATOR = new Parcelable.Creator<DeviceInfo>() {
+        public DeviceInfo createFromParcel(Parcel in) {
+            return new DeviceInfo(in);
+        }
+
+        public DeviceInfo[] newArray(int size) {
+            return new DeviceInfo[size];
+        }
+    };
+
+    // example constructor that takes a Parcel and gives you an object populated with it's values
+    private DeviceInfo(Parcel in) {
+        this();
+        uuid = UUID.fromString(in.readString());
+        DeviceName = in.readString();
+        HostName = in.readString();
+        MacAddress = in.readString();
+        UserName = in.readString();
+        Password = in.readString();
+        DefaultPorts = in.readInt() != 0;
+        SendPort = in.readInt();
+        RecvPort = in.readInt();
+        Configured = true;
+        in.readTypedList(Outlets, OutletInfo.CREATOR);
+    }
+
+    public void setConfigured(boolean b) {
+        Configured = b;
+    }
+
+    public boolean isConfigured() {
+        return Configured;
+    }
+
+}
@@ -0,0 +1,40 @@
+package oly.netpowerctrl.datastructure;
+
+public class OutletCommand {
+    // This field is not saved and is filled by fromOutletInfo for cache purposes only
+    public String description;
+
+    public String device_mac;
+    public int outletNumber;
+    public int state; //0:off;1:on;2:toggle
+    public boolean enabled = false;
+
+    public String toString() {
+        if (device_mac.isEmpty())
+            return "";
+        return description.replace("§", "$") + "§" + device_mac +
+                "§" + Integer.valueOf(outletNumber).toString() + "§" + Integer.valueOf(state).toString();
+    }
+
+    public static OutletCommand fromString(String source) {
+        OutletCommand c = new OutletCommand();
+        String src[] = source.split("§");
+        if (src.length < 3)
+            return null;
+        c.description = src[0];
+        c.device_mac = src[1];
+        c.outletNumber = Integer.valueOf(src[2]);
+        c.state = Integer.valueOf(src[3]);
+        return c;
+    }
+
+    public static OutletCommand fromOutletInfo(OutletInfo info, boolean enabled) {
+        OutletCommand c = new OutletCommand();
+        c.enabled = enabled;
+        c.description = info.device.DeviceName + ": " + (info.UserDescription.isEmpty() ? info.Description : info.UserDescription);
+        c.device_mac = info.device.MacAddress;
+        c.outletNumber = info.OutletNumber;
+        c.state = info.State ? 1 : 0;
+        return c;
+    }
+}