summaryrefslogtreecommitdiff
path: root/src/AndroidRemote/AndroidApp/src/org/nstamato/bansheeremote/BansheeRemote.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/AndroidRemote/AndroidApp/src/org/nstamato/bansheeremote/BansheeRemote.java')
-rw-r--r--src/AndroidRemote/AndroidApp/src/org/nstamato/bansheeremote/BansheeRemote.java35
1 files changed, 10 insertions, 25 deletions
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){