rhodes 3.0.1.beta.6 → 3.0.1.beta.7

data/CHANGELOG

@@ -3,6 +3,8 @@
 * Android: fix push issues
 * Support Android 3.1
 * Support Windows Phone 7.1(Mango)
+* Blackberry 6: fix geolocation
+* Android 2.3.4: fix web browser issue with redirect
 
 ## 3.0
 * RhoSimulator: simulator for fast Rhodes application development, support debugging using Rhodes Eclipse plug-in.(Windows only)

data/Rakefile

@@ -107,7 +107,7 @@ def make_application_build_capabilities_header_file
  
   capabilities = $app_config["capabilities"]
 
-  if capabilities != nil
+  if capabilities != nil && capabilities.is_a?(Array)
      capabilities.each do |cap|
         caps << cap
      end

data/doc/build.txt

@@ -241,7 +241,7 @@ In case if you are planning to work with native geo mapping (MapView interface),
 	android:
 	  mapping: yes
 
-If you are using Eclipse (Optional) please follow [these instructions](http://source.android.com/using-eclipse) on how to increase Java memory space to use Android.
+If you are using Eclipse (Optional) please follow [these instructions](http://source.android.com/source/using-eclipse.html) on how to increase Java memory space to use Android.
 
 
 Please check you applications and change the way how you include css files into html pages.

data/doc/synchronization.txt

@@ -305,6 +305,7 @@ Next, in your controller action that displays the object(s), add the object noti
 	
 		# refresh the current page
 	    WebView.refresh
+	    # or call System.execute_js to call javascript function which will update list
 	  end
 	end
 

data/lib/framework/rho/rhoutils.rb

@@ -36,7 +36,8 @@ module Rho
           parts = line.chomp.split('|')
 
           row = {}
-          columns.each_with_index do |col,idx| 
+          columns.each_with_index do |col,idx|
+            col.strip! 
             if col == 'source_name'
               src_name = parts[idx]
               src_name = source_map[src_name] if source_map

data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java

@@ -491,10 +491,12 @@ public class RhodesActivity extends BaseActivity {
         }
 
         String urlStart = uri.getPath();
-        if (urlStart.compareTo("") != 0)
-        {
-            Logger.D(TAG, "PROCESS URL START: " + urlStart);
-            RhoConf.setString("start_path", Uri.decode(urlStart));
+        if (urlStart != null) { 
+		    if ("".compareTo(urlStart) != 0)
+		    {
+		        Logger.D(TAG, "PROCESS URL START: " + urlStart);
+		        RhoConf.setString("start_path", Uri.decode(urlStart));
+		    }
         }
 
 		ENABLE_LOADING_INDICATION = !RhoConf.getBool("disable_loading_indication");

data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java

@@ -1239,7 +1239,7 @@ public class RhodesService extends Service {
 		}
 		
 		String syncSources = extras.getString("do_sync");
-		if (syncSources != null) {
+		if ((syncSources != null) && (syncSources.length() > 0)) {
 			Logger.D(TAG, "PUSH: Sync:");
 			boolean syncAll = false;
 			for (String source : syncSources.split(",")) {

data/platform/android/build/androidcommon.rb

@@ -347,7 +347,7 @@ def apk_build(sdk, apk_name, res_name, dex_name, debug)
         params = [apk_name, "-u", "-z", res_name, "-f", dex_name]
     end
     
-    Jake.run("apkbuilder" + $bat_ext, params)
+    Jake.run File.join(".", "apkbuilder" + $bat_ext), params
     
     unless $?.success?
         Dir.chdir prev_dir

data/platform/bb/RubyVM/src/com/rho/net/RhoConnection.java

@@ -855,14 +855,6 @@ public class RhoConnection implements IHttpConnection {
 			if ( responseData != null )
 				contentLength = Integer.parseInt(resHeaders.getPropertyIgnoreCase("Content-Length"));
 
-			try {
-				IRhoRubyHelper helper = RhoClassFactory.createRhoRubyHelper();
-				helper.wakeUpGeoLocation();
-			}catch(Exception exc)
-			{
-				LOG.ERROR("getGeoLocationText failed", exc);
-			}
-			
 		}
 	}
 	

data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java

@@ -1362,6 +1362,15 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
         m_bDisableInput = true;
         m_oBrowserAdapter.processConnection(connection, e);
         m_bDisableInput = false;
+        
+		try {
+			IRhoRubyHelper helper = RhoClassFactory.createRhoRubyHelper();
+			helper.wakeUpGeoLocation();
+		}catch(Exception exc)
+		{
+			LOG.ERROR("wakeUpGeoLocation failed", exc);
+		}
+        
     }
 
     public static class PrimaryResourceFetchThread {//extends Thread {

data/platform/shared/common/RhodesApp.cpp

@@ -1170,7 +1170,7 @@ void rho_http_redirect( void* httpContext, const char* szUrl)
     headers.push_back(HttpHeader("Content-Type", "text/plain"));
     
     CHttpServer *serv = (CHttpServer *)httpContext;
-    serv->send_response(serv->create_response("301 Moved Permanently", headers));
+    serv->send_response(serv->create_response("301 Moved Permanently", headers), true);
 }
 
 void rho_http_senderror(void* httpContext, int nError, const char* szMsg)

data/platform/shared/net/HttpServer.cpp

@@ -569,6 +569,17 @@ bool CHttpServer::send_response_impl(String const &data, bool continuation)
     return true;
 }
 
+bool CHttpServer::send_response(String const &response, bool redirect)
+{
+#ifdef OS_ANDROID
+    if (redirect) {
+        CAutoPtr<IRhoThreadImpl> ptrThread = rho_get_RhoClassFactory()->createThreadImpl();
+        ptrThread->sleep(20);
+    }
+#endif
+    return send_response_impl(response, false);
+}
+
 String CHttpServer::create_response(String const &reason)
 {
     return create_response(reason, "");
@@ -1049,16 +1060,16 @@ bool CHttpServer::decide(String const &method, String const &arg_uri, String con
 
     String uri = arg_uri;
 
-#ifdef OS_ANDROID
-    //Work around malformed Android WebView URLs
-    if (!String_startsWith(uri, "/app") &&
-        !String_startsWith(uri, "/public") &&
-        !String_startsWith(uri, "/data")) 
-    {
-        RAWTRACE1("Malformed URL: '%s', adding '/app' prefix.", uri.c_str());
-        uri = CFilePath::join("/app", uri);
-    }
-#endif
+//#ifdef OS_ANDROID
+//    //Work around malformed Android WebView URLs
+//    if (!String_startsWith(uri, "/app") &&
+//        !String_startsWith(uri, "/public") &&
+//        !String_startsWith(uri, "/data")) 
+//    {
+//        RAWTRACE1("Malformed URL: '%s', adding '/app' prefix.", uri.c_str());
+//        uri = CFilePath::join("/app", uri);
+//    }
+//#endif
 
     String fullPath = CFilePath::join(m_root, uri);
     
@@ -1072,7 +1083,10 @@ bool CHttpServer::decide(String const &method, String const &arg_uri, String con
         String reply(getStringFromValue(data), getStringLenFromValue(data));
         rho_ruby_releaseValue(data);
 
-        if (!send_response(reply))
+        bool isRedirect = String_startsWith(reply, "HTTP/1.1 301") ||
+                          String_startsWith(reply, "HTTP/1.1 302");
+
+        if (!send_response(reply, isRedirect))
             return false;
 
         if (method == "GET")
@@ -1084,7 +1098,7 @@ bool CHttpServer::decide(String const &method, String const &arg_uri, String con
         return true;
     }
     
-#ifndef OS_ANDROID
+//#ifndef OS_ANDROID
     if (isdir(fullPath)) {
         RAWTRACE1("Uri %s is directory, redirecting to index", uri.c_str());
         String q = query.empty() ? "" : "?" + query;
@@ -1092,17 +1106,17 @@ bool CHttpServer::decide(String const &method, String const &arg_uri, String con
         HeaderList headers;
         headers.push_back(Header("Location", CFilePath::join( uri, "index"RHO_ERB_EXT) + q));
         
-        send_response(create_response("301 Moved Permanently", headers));
+        send_response(create_response("301 Moved Permanently", headers), true);
         return false;
     }
-#else
-    //Work around this Android redirect bug:
-    //http://code.google.com/p/android/issues/detail?can=2&q=11583&id=11583
-    if (isdir(fullPath)) {
-        RAWTRACE1("Uri %s is directory, override with index", uri.c_str());
-        return decide(method, CFilePath::join( uri, "index"RHO_ERB_EXT), query, headers, body);
-    }
-#endif
+//#else
+//    //Work around this Android redirect bug:
+//    //http://code.google.com/p/android/issues/detail?can=2&q=11583&id=11583
+//    if (isdir(fullPath)) {
+//        RAWTRACE1("Uri %s is directory, override with index", uri.c_str());
+//        return decide(method, CFilePath::join( uri, "index"RHO_ERB_EXT), query, headers, body);
+//    }
+//#endif
     if (isindex(uri)) {
         if (!isfile(fullPath)) {
             RAWLOG_ERROR1("The file %s was not found", fullPath.c_str());

data/platform/shared/net/HttpServer.h

@@ -77,7 +77,7 @@ public:
     bool run();
     void stop();
 
-    bool send_response(String const &response) {return send_response_impl(response, false);}
+    bool send_response(String const &response, bool redirect = false);
     bool send_response_body(String const &data) {return send_response_impl(data, true);}
     
     String create_response(String const &reason);
@@ -124,3 +124,4 @@ private:
 } // namespace rho
 
 #endif // RHO_HTTP_SERVER_F5FFD21AD3EE463E850C5E2C789397BD
+

data/rakefile.rb

@@ -107,7 +107,7 @@ def make_application_build_capabilities_header_file
  
   capabilities = $app_config["capabilities"]
 
-  if capabilities != nil
+  if capabilities != nil && capabilities.is_a?(Array)
      capabilities.each do |cap|
         caps << cap
      end

data/rhodes.gemspec

@@ -3,7 +3,7 @@ require "lib/rhodes.rb"
 
 Gem::Specification.new do |s|
   s.name = %q{rhodes}
-  s.version = "3.0.1.beta.6"
+  s.version = "3.0.1.beta.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rhomobile"]

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 62196423
+  hash: 62196421
   prerelease: true
   segments: 
   - 3
   - 0
   - 1
   - beta
-  - 6
-  version: 3.0.1.beta.6
+  - 7
+  version: 3.0.1.beta.7
 platform: ruby
 authors: 
 - Rhomobile
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-31 00:00:00 -07:00
+date: 2011-06-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency