datagramSocket.disconnect() Deadlock

.classpath

@@ -1,9 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="output" path="bin/classes"/>
+	<classpathentry kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.gitignore

@@ -28,4 +28,5 @@ local.properties
 .buildpath
 *.DS_Store
 bin/jarlist.cache
-test/test-reports/
+test/test-reports/
+/target/

.project

@@ -1,33 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Connect-SDK-Android-Core</name>
+	<name>Connect-SDK-Java-Core</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>

README.md

@@ -1,4 +1,7 @@
-#Connect SDK Core (Android)
+#Connect SDK Core
+
+This is a fork from the Android version of Connect SDK. In this version all dependencies to android are removed.
+
 The Connect SDK Core contains all of the core classes required for basic operation of Connect SDK. The core also includes support for some select protocols which do not have any heavy and/or external dependencies. These protocols include:
 - Apple TV
 - DIAL
@@ -10,8 +13,7 @@ The Connect SDK Core contains all of the core classes required for basic operati
 ##General Information
 For more information about Connect SDK, visit the [main repository](https://github.com/ConnectSDK/Connect-SDK-Android).
 
-##Setup
-Unless you are doing very specialized work to extend the SDK, you should not need to make direct use of this repository. Instead, clone the [main repository](https://github.com/ConnectSDK/Connect-SDK-Android), which includes this repository as a submodule.
+For details on this fork, visit the [project page](http://sprehn.github.io/Connect-SDK-Java-Core/).
 
 ##License
 Copyright (c) 2013-2015 LG Electronics.

pom.xml

@@ -0,0 +1,114 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>Connect-SDK-Java-Core</groupId>
+	<artifactId>Connect-SDK-Java-Core</artifactId>
+	<version>1.1-SNAPSHOT</version>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+	<repositories>
+		<repository>
+			<!-- required for java-websocket 1.3.1 -->
+			<id>clojars.org</id>
+			<url>http://clojars.org/repo</url>
+		</repository>
+	</repositories>
+
+	<build>
+		<sourceDirectory>src</sourceDirectory>
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.5.1</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<version>3.3</version>
+				<configuration>
+					<skipDeploy>true</skipDeploy>
+				</configuration>
+			</plugin>
+			<plugin>
+				<!-- Deploy the web site -->
+				<groupId>com.github.github</groupId>
+				<artifactId>site-maven-plugin</artifactId>
+				<version>0.12</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>site</goal>
+						</goals>
+						<phase>site-deploy</phase>
+						<configuration>
+							<server>github</server>
+							<message>site built</message>
+							<path>${site.path}</path>
+							<merge>true</merge>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.10.4</version>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>findbugs-maven-plugin</artifactId>
+				<version>3.0.4</version>
+				<configuration>
+                <effort>Max</effort>
+                <!--threshold>Low</threshold-->
+            </configuration>
+			</plugin>
+		</plugins>
+	</reporting>
+	<dependencies>
+		<dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20140107</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.jmdns</groupId>
+			<artifactId>jmdns</artifactId>
+			<version>3.4.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.java-websocket</groupId>
+			<artifactId>java-websocket</artifactId>
+			<version>1.3.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.servicemix.bundles</groupId>
+			<artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
+			<version>1.1.4c_7</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.21</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>4.5.2</version>
+		</dependency>
+	</dependencies>
+	<scm>
+		<url>https://github.com/sprehn/Connect-SDK-Java-Core</url>
+		<connection>scm:git:https://github.com/sprehn/Connect-SDK-Java-Core.git</connection>
+	</scm>
+</project>

src/com/connectsdk/core/AppInfo.java

@@ -57,6 +57,7 @@ public AppInfo(String id) {
      * Gets the ID of the app on the first screen device. Format is different
      * depending on the platform. (ex. youtube.leanback.v4, 0000001134, netflix,
      * etc).
+     * @return ID of the app on the first screen device
      */
     public String getId() {
         return id;
@@ -66,6 +67,7 @@ public String getId() {
      * Sets the ID of the app on the first screen device. Format is different
      * depending on the platform. (ex. youtube.leanback.v4, 0000001134, netflix,
      * etc).
+     * @param id ID of the app on the first screen device
      */
     public void setId(String id) {
         this.id = id;
@@ -74,6 +76,7 @@ public void setId(String id) {
     /**
      * Gets the user-friendly name of the app (ex. YouTube, Browser, Netflix,
      * etc).
+     * @return user-friendly name of the app
      */
     public String getName() {
         return name;
@@ -82,17 +85,18 @@ public String getName() {
     /**
      * Sets the user-friendly name of the app (ex. YouTube, Browser, Netflix,
      * etc).
+     * @param name user-friendly name of the app
      */
     public void setName(String name) {
         this.name = name.trim();
     }
 
-    /** Gets the raw data from the first screen device about the app. */
+    /** @return the raw data from the first screen device about the app. */
     public JSONObject getRawData() {
         return raw;
     }
 
-    /** Sets the raw data from the first screen device about the app. */
+    /** @param data  the raw data from the first screen device about the app. */
     public void setRawData(JSONObject data) {
         raw = data;
     }
@@ -110,20 +114,29 @@ public JSONObject toJSONObject() throws JSONException {
 
     // @endcond
 
-    /**
-     * Compares two AppInfo objects.
-     * 
-     * @param o
-     *            Other AppInfo object to compare.
-     * 
-     * @return true if both AppInfo id values are equal
-     */
     @Override
-    public boolean equals(Object o) {
-        if (o instanceof AppInfo) {
-            AppInfo ai = (AppInfo) o;
-            return this.id.equals(ai.id);
-        }
-        return super.equals(o);
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        return result;
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        AppInfo other = (AppInfo) obj;
+        if (id == null) {
+            if (other.id != null)
+                return false;
+        } else if (!id.equals(other.id))
+            return false;
+        return true;
+    }    
+
 }