Fixed timeout support for iOS, Android, and Simulator

Author: shannah

CN1SocketsDemo/lib/CN1Sockets.cn1lib

@@ -1,6 +1,7 @@
 package ca.weblite.codename1.net.impl;
 
 
+import java.net.InetSocketAddress;
 import java.net.Socket;
 public class NativeSocketImpl {
     private Socket socket;
@@ -159,7 +160,8 @@ public boolean createSocket(String host, int port) {
 
     public boolean connectSocket(int timeout){
         try {
-            socket = new Socket(host, port);
+            socket = new Socket();
+            socket.connect(new InetSocketAddress(host, port), timeout);
             return true;
 
         } catch ( Throwable t){

dist/CN1Sockets.cn1lib

@@ -144,13 +144,13 @@ -(BOOL)setKeepAlive:(BOOL)param{
 -(BOOL)isInputShutdown{
     errorMessage = NULL;
     NSStreamStatus status = [inputStream streamStatus];
-    return ( status == NSStreamStatusNotOpen || NSStreamStatusClosed == status );
+    return (status == NSStreamStatusOpening || status == NSStreamStatusNotOpen || NSStreamStatusClosed == status );
 }
 
 -(BOOL)isOutputShutdown{
     errorMessage = NULL;
     NSStreamStatus status = [outputStream streamStatus];
-    return ( status == NSStreamStatusNotOpen || NSStreamStatusClosed == status );
+    return (status == NSStreamStatusOpening ||  status == NSStreamStatusNotOpen || NSStreamStatusClosed == status );
 }
 
 -(NSString*)getErrorMessage{
@@ -296,6 +296,19 @@ -(BOOL)connectSocket:(int)timeout{
         errorMessage = NULL;
         [inputStream open];
         [outputStream open];
+        while ([outputStream streamStatus] == NSStreamStatusOpening) {
+            _yield();
+            usleep(100000);
+            _resume();
+        }
+        while ([inputStream streamStatus] == NSStreamStatusOpening) {
+            _yield();
+            usleep(100000);
+            _resume();
+        }
+        if ([self isInputShutdown] || [self isOutputShutdown]) {
+            return NO;
+        }
         return YES;
     }
 

native/android/ca/weblite/codename1/net/impl/NativeSocketImpl.java

@@ -1,6 +1,7 @@
 package ca.weblite.codename1.net.impl;
 
 
+import java.net.InetSocketAddress;
 import java.net.Socket;
 public class NativeSocketImpl implements ca.weblite.codename1.net.impl.NativeSocket {
     private Socket socket;
@@ -159,7 +160,8 @@ public boolean createSocket(String host, int port) {
 
     public boolean connectSocket(int timeout){
         try {
-            socket = new Socket(host, port);
+            socket = new Socket();
+            socket.connect(new InetSocketAddress(host, port), timeout);
             return true;
 
         } catch ( Throwable t){