Removed port 7 dependency of AndroidRemote

7 files changed, 42 insertions, 85 deletions

diff --git a/src/AndroidRemote/AndroidApp/.classpath b/src/AndroidRemote/AndroidApp/.classpath
index a4763d1..3f9691c 100644
--- a/src/AndroidRemote/AndroidApp/.classpath
+++ b/src/AndroidRemote/AndroidApp/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/src/AndroidRemote/AndroidApp/AndroidManifest.xml b/src/AndroidRemote/AndroidApp/AndroidManifest.xml
index 43fc6a4..77affe3 100644
--- a/src/AndroidRemote/AndroidApp/AndroidManifest.xml
+++ b/src/AndroidRemote/AndroidApp/AndroidManifest.xml
@@ -27,8 +27,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.nstamato.bansheeremote"
-    android:versionCode="14"
-    android:versionName="4.2">
+    android:versionCode="16"
+    android:versionName="4.4">
     <uses-sdk android:minSdkVersion="4" />
     <application android:icon="@drawable/banshee" android:label="Banshee Remote">
         <activity android:name=".BansheeRemote" android:label="Banshee Remote" >
diff --git a/src/AndroidRemote/AndroidApp/BansheeRemote.apk b/src/AndroidRemote/AndroidApp/BansheeRemote.apk
index e301c2b..7b45c0c 100644
--- a/src/AndroidRemote/AndroidApp/BansheeRemote.apk
+++ b/src/AndroidRemote/AndroidApp/BansheeRemote.apk
diff --git a/src/AndroidRemote/AndroidApp/project.properties b/src/AndroidRemote/AndroidApp/project.properties
index 2e98c5f..5e47523 100644
--- a/src/AndroidRemote/AndroidApp/project.properties
+++ b/src/AndroidRemote/AndroidApp/project.properties
@@ -10,5 +10,5 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-10
+target=android-8
 apk-configurations=
diff --git a/src/AndroidRemote/AndroidApp/src/org/nstamato/bansheeremote/BansheeRemote.java b/src/AndroidRemote/AndroidApp/src/org/nstamato/bansheeremote/BansheeRemote.java
index 385557b..cb0636d 100644
--- a/src/AndroidRemote/AndroidApp/src/org/nstamato/bansheeremote/BansheeRemote.java
+++ b/src/AndroidRemote/AndroidApp/src/org/nstamato/bansheeremote/BansheeRemote.java
@@ -28,7 +28,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 import java.io.FileInputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.net.InetAddress;
 import java.net.Socket;
 import java.util.ArrayList;
 import android.app.ListActivity;
@@ -114,36 +113,22 @@ public class BansheeRemote extends ListActivity {
     	}
     	else{
     		boolean canConnect = false;
-    		boolean isReachable=false;
     		String server[] = selected.split(":");
     		String ip = server[0];
     		int port = Integer.parseInt(server[1]);
     		String command = "test/";
     		Socket s;
 			OutputStream os;
-    		try{
-    			InetAddress address = InetAddress.getByName(ip);
-            	isReachable = address.isReachable(3000);
-    			if(isReachable){
-    				try {
-    					s = new Socket(ip,port); 
-    					os = s.getOutputStream();
-    					os.write(command.getBytes(), 0, command.length());
-    					s.close();
-    					os.close();
-    					canConnect = true;
-    				} catch(Exception e) {
-    					canConnect = false;
-    					Toast.makeText(BansheeRemote.this,"Can't connect to Server. Check your settings.",Toast.LENGTH_SHORT).show();
-    				}
-    			}
-    			else{
-					Toast.makeText(BansheeRemote.this,"Unreachable host.",Toast.LENGTH_SHORT).show();
-
-    			}
-    		}catch(Exception e){
-				Toast.makeText(BansheeRemote.this,"Can't connect to Server. Check your settings.",Toast.LENGTH_SHORT).show();
-
+    		try {
+    			s = new Socket(ip,port); 
+    			os = s.getOutputStream();
+    			os.write(command.getBytes(), 0, command.length());
+    			s.close();
+    			os.close();
+    			canConnect = true;
+    		} catch(Exception e) {
+    			canConnect = false;
+    			Toast.makeText(BansheeRemote.this,"Can't connect to Server. Check your settings.",Toast.LENGTH_SHORT).show();
     		}
 			
 			if(canConnect){
diff --git a/src/AndroidRemote/AndroidApp/src/org/nstamato/bansheeremote/NewServer.java b/src/AndroidRemote/AndroidApp/src/org/nstamato/bansheeremote/NewServer.java
index 3044881..d33be3c 100644
--- a/src/AndroidRemote/AndroidApp/src/org/nstamato/bansheeremote/NewServer.java
+++ b/src/AndroidRemote/AndroidApp/src/org/nstamato/bansheeremote/NewServer.java
@@ -30,7 +30,6 @@ import java.io.FileOutputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
-import java.net.InetAddress;
 import java.net.Socket;
 import android.app.Activity;
 import android.content.Context;
@@ -126,34 +125,20 @@ public class NewServer extends Activity {
 				OutputStream os;
 				String command = "test/";
 				boolean canConnect = false;
-				boolean isReachable = false;
 				int port=0;
-				
-				try{
-					port=Integer.parseInt(porttext.getText().toString());
-	    			InetAddress address = InetAddress.getByName(ip);
-	            	isReachable = address.isReachable(3000);
-	    			if(isReachable){
-	    				try {
-	    					s = new Socket(ip,port); 
-	    					os = s.getOutputStream();
-	    					os.write(command.getBytes(), 0, command.length());
-	    					s.close();
-	    					os.close();
-	    					canConnect = true;
-	    				} catch(Exception e) {
-	    					canConnect = false;
-	    					Toast.makeText(NewServer.this,"Can't connect to Server. Check your settings.",Toast.LENGTH_SHORT).show();
-	    				}
-	    			}
-	    			else{
-						Toast.makeText(NewServer.this,"Unreachable host.",Toast.LENGTH_SHORT).show();
-
-	    			}
-	    		}catch(Exception e){
-					Toast.makeText(NewServer.this,"Can't connect to Server. Check your settings.",Toast.LENGTH_SHORT).show();
-
-	    		}
+	
+	    			try {
+	    				port=Integer.parseInt(porttext.getText().toString());
+	    				s = new Socket(ip,port); 
+	    				os = s.getOutputStream();
+	    				os.write(command.getBytes(), 0, command.length());
+	   					s.close();
+	   					os.close();
+	   					canConnect = true;
+	   				} catch(Exception e) {
+	    				canConnect = false;
+	    				Toast.makeText(NewServer.this,"Can't connect to Server. Check your settings.",Toast.LENGTH_SHORT).show();
+	   				}
 				
 				if(canConnect){
 					Intent response = new Intent(NewServer.this,main.class);
diff --git a/src/AndroidRemote/AndroidApp/src/org/nstamato/bansheeremote/Settings.java b/src/AndroidRemote/AndroidApp/src/org/nstamato/bansheeremote/Settings.java
index 8047f5c..29198df 100644
--- a/src/AndroidRemote/AndroidApp/src/org/nstamato/bansheeremote/Settings.java
+++ b/src/AndroidRemote/AndroidApp/src/org/nstamato/bansheeremote/Settings.java
@@ -26,7 +26,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 import java.io.OutputStream;
-import java.net.InetAddress;
 import java.net.Socket;
 
 import android.app.Activity;
@@ -64,33 +63,21 @@ public class Settings extends Activity {
 				OutputStream os;
 				String command = "test/";
 				boolean canConnect = false;
-				boolean isReachable = false;
 				int port=Integer.parseInt(porttext.getText().toString());
-				
-				try{
-	    			InetAddress address = InetAddress.getByName(ip);
-	            	isReachable = address.isReachable(3000);
-	    			if(isReachable){
-	    				try {
-	    					s = new Socket(ip,port); 
-	    					os = s.getOutputStream();
-	    					os.write(command.getBytes(), 0, command.length());
-	    					s.close();
-	    					os.close();
-	    					canConnect = true;
-	    				} catch(Exception e) {
-	    					canConnect = false;
-	    					Toast.makeText(Settings.this,"Can't connect to Server. Check your settings.",Toast.LENGTH_SHORT).show();
-	    				}
-	    			}
-	    			else{
-						Toast.makeText(Settings.this,"Unreachable host.",Toast.LENGTH_SHORT).show();
-
-	    			}
-	    		}catch(Exception e){
-					Toast.makeText(Settings.this,"Can't connect to Server. Check your settings.",Toast.LENGTH_SHORT).show();
-
-	    		}
+	    		try 
+	    		{
+	    			s = new Socket(ip,port); 
+	    			os = s.getOutputStream();
+	    			os.write(command.getBytes(), 0, command.length());
+	    			s.close();
+	   				os.close();
+	 				canConnect = true;
+	 			} 
+	    		catch(Exception e) 
+	    		{
+	  				canConnect = false;
+	   				Toast.makeText(Settings.this,"Can't connect to Server. Check your settings.",Toast.LENGTH_SHORT).show();
+	   			}
 				
 				if(canConnect){
 					Intent response = new Intent();