rhodes 2.0.0 → 2.0.2

data/platform/android/build/RhodesSRC_build.files

@@ -1,40 +1,44 @@
-platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/AndroidR.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/HttpLog.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/Logger.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/NavBar.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkConnectivityListener.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkStateTracker.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoConf.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoLogConf.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesInstance.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/Utils.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/camera/FileList.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCaptureCallback.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/Capabilities.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCaptureCallback.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePicker.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePickerScreen.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/HttpLog.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/Logger.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/MainView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/Annotation.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/AnnotationsOverlay.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/NavBar.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkConnectivityListener.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkStateTracker.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactField.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessor.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorNew.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorOld.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactField.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Phonebook.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhoConf.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesInstance.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhoLogConf.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSockAddr.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocketImpl.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocket.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocketImpl.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/socket/SSLImpl.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/ui/AboutDialog.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogOptionsDialog.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogViewDialog.java
@@ -43,5 +47,3 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/uri/SmsUriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/TelUriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/UriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/VideoUriHandler.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/Utils.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java

data/platform/android/build/android.rake

@@ -27,11 +27,13 @@ end
 ANDROID_API_LEVEL = 3
 
 ANDROID_PERMISSIONS = {
+  'audio' => ['RECORD_AUDIO', 'MODIFY_AUDIO_SETTINGS'],
   'camera' => 'CAMERA',
   'gps' => 'ACCESS_FINE_LOCATION',
   'network_state' => 'ACCESS_NETWORK_STATE',
   'phone' => ['CALL_PHONE', 'READ_PHONE_STATE'],
-  'pim' => ['READ_CONTACTS', 'WRITE_CONTACTS'],
+  'pim' => ['READ_CONTACTS', 'WRITE_CONTACTS', 'GET_ACCOUNTS'],
+  'record_audio' => 'RECORD_AUDIO',
   'vibrate' => 'VIBRATE'
 }
 
@@ -77,7 +79,7 @@ def set_app_name_android(newname)
   end
   doc.elements.delete "manifest/application/uses-library[@android:name='com.google.android.maps']" unless $use_geomapping
 
-  caps = ['INTERNET']
+  caps = ['INTERNET', 'PERSISTENT_ACTIVITY']
   $app_config["capabilities"].each do |cap|
     cap = ANDROID_PERMISSIONS[cap]
     next if cap.nil?
@@ -89,7 +91,7 @@ def set_app_name_android(newname)
 
   manifest = doc.elements["manifest"]
   manifest.elements.each('uses-permission') { |e| manifest.delete e }
-  caps.each do |cap|
+  caps.sort.each do |cap|
     element = REXML::Element.new('uses-permission')
     element.add_attribute('android:name', "android.permission.#{cap}")
     manifest.add element
@@ -125,8 +127,6 @@ namespace "config" do
 
     $emuversion = $app_config["android"]["version"] unless $app_config["android"].nil?
     $emuversion = $config["android"]["version"] if $emuversion.nil? and !$config["android"].nil?
-    $emuversion = get_market_version(ANDROID_API_LEVEL) if $emuversion.nil?
-    $emuversion = $emuversion.to_s unless $emuversion.nil?
 
     # Here is switch between release/debug configuration used for
     # building native libraries
@@ -176,6 +176,7 @@ namespace "config" do
     $app_android_r = File.join $tmpdir, "AndroidR.java"
     $app_rjava_dir = File.join $tmpdir
     $app_native_libs_java = File.join $tmpdir, "NativeLibraries.java"
+    $app_capabilities_java = File.join $tmpdir, "Capabilities.java"
 
     if RUBY_PLATFORM =~ /(win|w)32$/
       $emulator = #"cmd /c " + 
@@ -206,10 +207,11 @@ namespace "config" do
     end
 
     puts "+++ Looking for platform..." if USE_TRACES
+    napilevel = ANDROID_API_LEVEL
     Dir.glob(File.join($androidsdkpath, "platforms", "*")).each do |platform|
       props = File.join(platform, "source.properties")
       unless File.file? props
-        puts "+++ WARNING! No source.properties found in #{platform}" if USE_TRACES
+        puts "+++ WARNING! No source.properties found in #{platform}"
         next
       end
 
@@ -224,7 +226,11 @@ namespace "config" do
 
       puts "+++ API LEVEL of #{platform}: #{apilevel}" if USE_TRACES
 
-      $androidplatform = File.basename(platform) if apilevel == ANDROID_API_LEVEL
+      if apilevel > napilevel
+        napilevel = apilevel
+        $androidplatform = File.basename(platform)
+        $found_api_level = apilevel
+      end
     end
 
     if $androidplatform.nil?
@@ -233,7 +239,7 @@ namespace "config" do
     end
 
     if $androidplatform.nil?
-      puts "+++ No required platform (API level #{ANDROID_API_LEVEL}) found, can't proceed"
+      puts "+++ No required platform (API level >= #{ANDROID_API_LEVEL}) found, can't proceed"
       exit 1
     else
       puts "+++ Platform found: #{$androidplatform}" if USE_TRACES
@@ -282,19 +288,15 @@ namespace "config" do
       end
     end
 
-    $avdname = "rhoAndroid" + $emuversion.gsub(/[^0-9]/, "")
-    $avdname += "ext" if $use_geomapping
-    $avdtarget = $androidtargets[get_api_level($emuversion)]
-
     # Detect Google API add-on path
     if $use_geomapping
       puts "+++ Looking for Google APIs add-on..." if USE_TRACES
+      napilevel = ANDROID_API_LEVEL
       Dir.glob(File.join($androidsdkpath, 'add-ons', '*')).each do |dir|
-        break unless $gapijar.nil?
 
         props = File.join(dir, 'manifest.ini')
         if !File.file? props
-          puts "+++ WARNING: no manifest.ini found in #{dir}" if USE_TRACES
+          puts "+++ WARNING: no manifest.ini found in #{dir}"
           next
         end
 
@@ -309,7 +311,11 @@ namespace "config" do
 
         puts "+++ API LEVEL of #{dir}: #{apilevel}" if USE_TRACES
 
-        $gapijar = File.join(dir, 'libs', 'maps.jar') if apilevel == ANDROID_API_LEVEL
+        if apilevel > napilevel
+          napilevel = apilevel
+          $gapijar = File.join(dir, 'libs', 'maps.jar')
+          $found_api_level = apilevel
+        end
       end
       if $gapijar.nil?
         puts "+++ No Google APIs add-on found (which is required because 'mapping' enabled in build.yml)"
@@ -319,7 +325,13 @@ namespace "config" do
       end
     end
 
-    setup_ndk($androidndkpath,ANDROID_API_LEVEL)
+    $emuversion = get_market_version($found_api_level) if $emuversion.nil?
+    $emuversion = $emuversion.to_s
+    $avdname = "rhoAndroid" + $emuversion.gsub(/[^0-9]/, "")
+    $avdname += "ext" if $use_geomapping
+    $avdtarget = $androidtargets[get_api_level($emuversion)]
+
+    setup_ndk($androidndkpath, ANDROID_API_LEVEL)
     
     $stlport_includes = File.join $shareddir, "stlport", "stlport"
 
@@ -668,7 +680,7 @@ namespace "build" do
         puts "Need to regenerate rhocaps.inc"
         $stdout.flush
         File.open(rhocaps_inc, 'w') do |f|
-          ANDROID_PERMISSIONS.keys.each do |k|
+          ANDROID_PERMISSIONS.keys.sort.each do |k|
             f.puts "RHO_DEFINE_CAP(#{k.upcase})"
           end
         end
@@ -676,6 +688,16 @@ namespace "build" do
         puts "No need to regenerate rhocaps.inc"
         $stdout.flush
       end
+
+      # Generate Capabilities.java
+      File.open($app_capabilities_java, "w") do |f|
+        f.puts "package com.rhomobile.rhodes;"
+        f.puts "public class Capabilities {"
+        ANDROID_PERMISSIONS.keys.sort.each do |k|
+          f.puts "  public static boolean #{k.upcase}_ENABLED = true;"
+        end
+        f.puts "}"
+      end
     end
 
     task :gen_java_ext => "config:android" do
@@ -811,6 +833,7 @@ namespace "build" do
       end
       lines << $app_android_r
       lines << $app_native_libs_java
+      lines << $app_capabilities_java
       if File.exists? File.join($extensionsdir, "ext_build.files")
         File.open(File.join($extensionsdir, "ext_build.files")) do |f|
           while line = f.gets

data/platform/iphone/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.0.0</string>
+	<string>2.0.2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 </dict>

data/platform/iphone/rbuild/iphone.rake

@@ -76,10 +76,10 @@ namespace "config" do
     $excludelib = ['**/builtinME.rb','**/ServeME.rb','**/TestServe.rb']
     $tmpdir =  $bindir +"/tmp"
 
-    $homedir = `echo ~`.to_s.strip
+    $homedir = ENV['HOME']
     $simdir = "#{$homedir}/Library/Application Support/iPhone Simulator/"
     $sim="/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications"
-    $guid="364FFCAF-C71D-4543-B293-9058E31CFFEE"
+    $guid = `uuidgen`.strip
     $applog = File.join($homedir,$app_config["applog"]) if $app_config["applog"] 
 
 
@@ -171,7 +171,9 @@ namespace "build" do
     task :rhodes => ["config:iphone", "build:iphone:rhobundle"] do
   
       set_app_name($app_config["name"]) unless $app_config["name"].nil?
-      cp $app_path + "/icon/icon.png", $config["build"]["iphonepath"]
+      ipath = $config["build"]["iphonepath"]
+      cp File.join(ipath, 'icon.png'), File.join(ipath, 'icon.png.bak') unless File.exists? File.join(ipath, 'icon.png.bak')
+      cp $app_path + "/icon/icon.png", ipath
 
       set_signing_identity($signidentity,$provisionprofile,$entitlements.to_s) if $signidentity.to_s != ""
 
@@ -179,11 +181,18 @@ namespace "build" do
       args = ['build', '-target', 'rhorunner', '-configuration', $configuration, '-sdk', $sdk]
 
       puts Jake.run("xcodebuild",args)
-      unless $? == 0
+      ret = $?
+
+      chdir $startdir
+      set_app_name("Rhodes") unless $app_config["name"].nil?
+      rm_f File.join(ipath, 'icon.png')
+      cp File.join(ipath, 'icon.png.bak'), File.join(ipath, 'icon.png')
+      rm_f File.join(ipath, 'icon.png.bak')
+
+      unless ret == 0
         puts "Error cleaning"
         exit 1
       end
-      chdir $startdir
 
     end
     
@@ -198,50 +207,66 @@ namespace "run" do
        exit 1       
      end
      `killall "iPhone Simulator"`
+
+     puts "sdk: #{$sdk.inspect.to_s}"
+     sdkver = $sdk.gsub(/^iphonesimulator/, '')
      
      rhorunner = $config["build"]["iphonepath"] + "/build/#{$configuration}-iphonesimulator/rhorunner.app"
+     puts "rhorunner: #{rhorunner}"
 
   
-     Find.find($simdir) do |path|
-       if File.basename(path) == "rhorunner.app"
-         $guid = File.basename(File.dirname(path))
+     puts "our app name: #{$app_config['name']}"
+     puts "simdir: #{$simdir}"
+     Dir.glob(File.join($simdir, sdkver, "Applications", "*")).each do |simapppath|
+       need_rm = true if File.directory? simapppath
+       if File.exists?(File.join(simapppath, 'rhorunner.app', 'name'))
+         name = File.read(File.join(simapppath, 'rhorunner.app', 'name'))
+         puts "found app name: #{name}"
+         guid = File.basename(simapppath)
+         puts "found guid: #{guid}"
+         if name == $app_config['name']
+           $guid = guid
+           need_rm = false
+         end
        end
+       rm_rf simapppath if need_rm
+       rm_rf simapppath + ".sb" if need_rm
      end
 
-     Dir.glob($simdir + '*').each do |sdk|
-       simapp = sdk + "/Applications"
-       simlink = sdk + "/Library/Preferences"
+     puts "app guid: #{$guid}"
 
-       simrhodes = File.join(simapp,$guid)
-       $simrhodes = simrhodes if $simrhodes.nil?
+     mkdir_p File.join($simdir, sdkver)
 
-       mkdir_p File.join(simrhodes,"Documents")
-       mkdir_p File.join(simrhodes,"Library","Preferences")
+     simapp = File.join($simdir, sdkver, "Applications")
+     simlink = File.join($simdir, sdkver, "Library", "Preferences")
 
-       `cp -R -p "#{rhorunner}" "#{simrhodes}"`
-       `ln -f -s "#{simlink}/com.apple.PeoplePicker.plist" "#{simrhodes}/Library/Preferences/com.apple.PeoplePicker.plist"`
-       `ln -f -s "#{simlink}/.GlobalPreferences.plist" "#{simrhodes}/Library/Preferences/.GlobalPreferences.plist"`
+     $simrhodes = File.join(simapp, $guid)
 
-       `echo "#{$applog}" > "#{simrhodes}/Documents/rhologpath.txt"`
-       rholog = simapp + "/" + $guid + "/Documents/RhoLog.txt"
+     mkdir_p File.join($simrhodes, "Documents")
+     mkdir_p File.join($simrhodes, "Library", "Preferences")
 
+     rm_rf File.join($simrhodes, 'rhorunner.app')
+     cp_r rhorunner, $simrhodes
+     ['com.apple.PeoplePicker.plist', '.GlobalPreferences.plist'].each do |f|
+       `ln -f -s "#{simlink}/#{f}" "#{$simrhodes}/Library/Preferences/#{f}"`
+     end
 
-       simpublic = simapp + "/" + $guid + "/Documents/apps/public"
-       apppublic = $app_path + "/sim-public-#{File.basename(sdk)}"
+     `echo "#{$applog}" > "#{$simrhodes}/Documents/rhologpath.txt"`
+     rholog = simapp + "/" + $guid + "/Documents/RhoLog.txt"
 
-       apprholog = $app_path + "/rholog-#{File.basename(sdk)}.txt"
-       rm_f apprholog
-       rm_f apppublic
-       `ln -f -s "#{simpublic}" "#{apppublic}"`
-       `ln -f -s "#{rholog}" "#{apprholog}"`
-       `echo > "#{rholog}"`
-       f = File.new("#{simapp}/#{$guid}.sb","w")
-       f << "(version 1)\n(debug deny)\n(allow default)\n"
-       f.close
 
+     simpublic = simapp + "/" + $guid + "/Documents/apps/public"
+     apppublic = $app_path + "/sim-public-#{sdkver}"
 
-     end
-     
+     apprholog = $app_path + "/rholog-#{sdkver}.txt"
+     rm_f apprholog
+     rm_f apppublic
+     `ln -f -s "#{simpublic}" "#{apppublic}"`
+     `ln -f -s "#{rholog}" "#{apprholog}"`
+     `echo > "#{rholog}"`
+     f = File.new("#{simapp}/#{$guid}.sb","w")
+     f << "(version 1)\n(debug deny)\n(allow default)\n"
+     f.close
      
   end
 

data/platform/iphone/rhorunner.xcodeproj/project.pbxproj

@@ -739,7 +739,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "RHO_SOURCE_DIR=${TARGET_BUILD_DIR}/../../bin/RhoBundle\nRHO_TARGET_DIR=${TARGET_BUILD_DIR}/${TARGET_NAME}.app\nmkdir -p ${RHO_TARGET_DIR}\ncp -Rf ${RHO_SOURCE_DIR}/* ${RHO_TARGET_DIR}";
+			shellScript = "RHO_SOURCE_DIR=${TARGET_BUILD_DIR}/../../bin/RhoBundle\nRHO_TARGET_DIR=${TARGET_BUILD_DIR}/${TARGET_NAME}.app\necho \"Create dir $RHO_TARGET_DIR\"\nmkdir -p ${RHO_TARGET_DIR}\nfor i in `ls -1 ${RHO_SOURCE_DIR}`\ndo\n  echo \"rm -Rf $RHO_TARGET_DIR/$i\"\n  rm -Rf ${RHO_TARGET_DIR}/$i\ndone\necho \"cp -Rf $RHO_SOURCE_DIR/* $RHO_TARGET_DIR\"\ncp -Rf ${RHO_SOURCE_DIR}/* ${RHO_TARGET_DIR}";
 		};
 /* End PBXShellScriptBuildPhase section */
 

data/platform/shared/common/RhoPort.h

@@ -8,12 +8,19 @@
 #include <windows.h>
 #include <time.h>
 
+typedef int socklen_t;
+
 #if defined(OS_WINCE)
 #include "ruby/wince/sys/types.h"
 #include "ruby/wince/sys/stat.h"
-#else
+#ifdef __cplusplus
+extern "C"
+#endif //__cplusplus
+char *strdup(const char * str);
+
+#else //!defined(OS_WINCE)
 #include <sys/stat.h>
-#endif
+#endif //!defined(OS_WINCE)
 
 #define LOG_NEWLINE "\r\n"
 #define LOG_NEWLINELEN 2
@@ -25,7 +32,15 @@ typedef unsigned __int64 uint64;
 
 #define strcasecmp _stricmp
 #define snprintf _snprintf
-#else
+
+#define FMTI64 "%I64d"
+#define FMTU64 "%I64u"
+
+#else // !(defined( OS_WINDOWS ) || defined( OS_WINCE ))
+
+#define FMTI64 "%lli"
+#define FMTU64 "%llu"
+
 #  if defined(OS_ANDROID)
 // Needed for va_list on Android
 #    include <stdarg.h>

data/platform/shared/common/RhodesApp.cpp

@@ -325,74 +325,96 @@ void CRhodesApp::initHttpServer()
 
 const char* CRhodesApp::getFreeListeningPort()
 {
+    int sockfd = -1;
+	struct sockaddr_in serv_addr = {0};
+    int noerrors = 1;
+    
 	if ( m_strListeningPorts.length() > 0 )
 		return m_strListeningPorts.c_str();
 	
-	int noerrors = 1;
 	LOG(INFO) + "Trying to get free listening port.";
 	
-	//get free port
-	int sockfd = -1;
-	struct sockaddr_in serv_addr = {0};
-	//struct hostent *server = {0};
-	//int result = -1;
-	
-	if ( noerrors )
-	{
-		sockfd = socket(AF_INET, SOCK_STREAM, 0);
-		if ( sockfd < 0 )
-		{
-			LOG(WARNING) + ("Unable to open socket");
-			noerrors = 0;
-		}
-		
-		if ( noerrors )
-		{
-			//server = gethostbyname( "localhost" );
-			
-			memset((void *) &serv_addr, 0, sizeof(serv_addr));
-			serv_addr.sin_family = AF_INET;
-			serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
-			serv_addr.sin_port = htons(8080);
+    sockfd = socket(AF_INET, SOCK_STREAM, 0);
+    if ( sockfd < 0 )
+    {
+        LOG(WARNING) + "Unable to open socket";
+        noerrors = 0;
+    }
+    
+    int disable = 0;
+    if (noerrors && setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (const char*)&disable, sizeof(disable)) != 0)
+    {
+        LOG(WARNING) + "Unable to set socket option";
+        noerrors = 0;
+    }
+#if defined(OS_MACOSX)
+    if (noerrors && setsockopt(sockfd, SOL_SOCKET, SO_REUSEPORT, (const char *)&disable, sizeof(disable)) != 0)
+    {
+        LOG(WARNING) + "Unable to set socket option";
+        noerrors = 0;
+    }
+#endif
+    
+    if (noerrors)
+    {
+        memset((void *) &serv_addr, 0, sizeof(serv_addr));
+#if defined(OS_MACOSX)
+        serv_addr.sin_len = sizeof(serv_addr);
+#endif
+        serv_addr.sin_family = AF_INET;
+        serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
+        serv_addr.sin_port = htons(8080);
+        
+        LOG(INFO) + "Trying to bind on 8080 port...";
 
-			if ( bind( sockfd, (struct sockaddr *) &serv_addr, sizeof( serv_addr ) ) )
+        if ( bind( sockfd, (struct sockaddr *) &serv_addr, sizeof( serv_addr ) ) != 0 )
+        {
+            // Fill serv_addr again but with dynamically selected port
+#if defined(OS_MACOSX)
+            serv_addr.sin_len = sizeof(serv_addr);
+#endif
+            serv_addr.sin_family = AF_INET;
+            serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
+            serv_addr.sin_port = htons(0);
+            
+            LOG(INFO) + "Trying to bind on dynamic port...";
+            
+            if ( bind( sockfd, (struct sockaddr *) &serv_addr, sizeof( serv_addr ) ) != 0 )
             {
-    			serv_addr.sin_port = htons(0);
-			    if ( bind( sockfd, (struct sockaddr *) &serv_addr, sizeof( serv_addr ) ) )
-			    {
-				    LOG(WARNING) + "Unable to bind";
-				    noerrors = 0;
-			    }
+                LOG(WARNING) + "Unable to bind";
+                noerrors = 0;
             }
+        }
+    }
 
-			if ( noerrors )
-			{
-				char buf[10] = {0};
-#ifdef OS_MACOSX
-				socklen_t
-#else				
-				int
-#endif				
-				length = sizeof( serv_addr );
-				
-				getsockname( sockfd, (struct sockaddr *)&serv_addr, &length );
-				
-				sprintf(buf,"%d",ntohs(serv_addr.sin_port));
-				
-				m_strListeningPorts = buf;
-			}
-			//Clean up
+    if ( noerrors )
+    {
+        char buf[10] = {0};
+        
+        socklen_t length = sizeof( serv_addr );
+        
+        if (getsockname( sockfd, (struct sockaddr *)&serv_addr, &length ) != 0)
+        {
+            LOG(WARNING) + "Can not get socket info";
+            noerrors = 0;
+        }
+        else
+        {
+            sprintf(buf, "%d", (int)ntohs(serv_addr.sin_port));
+            LOG(INFO) + "Got port to bind on: " + buf;
+            m_strListeningPorts = buf;
+        }
+    }
+    
+    //Clean up
 #if defined(OS_ANDROID)
-			close(sockfd);
+    close(sockfd);
 #else
-			closesocket(sockfd);
+    closesocket(sockfd);
 #endif
-		}
-		
-	}
 	
 	if ( !noerrors )
-		m_strListeningPorts = "8080";
+		m_strListeningPorts = "0";
 	
 	LOG(INFO) + "Free listening port: " + m_strListeningPorts;