rhodes 2.4.1 → 3.0.0.beta.1

data/platform/bb/rhodes/src/com/rho/BrowserAdapter5.java

@@ -145,7 +145,7 @@ public class BrowserAdapter5 implements IBrowserAdapter
 
     public void executeJavascript(String strJavascript)
     {
-        //synchronized (Application.getEventLock()) 
+        synchronized (Application.getEventLock()) 
         {
         	BrowserField field = (BrowserField)m_oMainScreen.getField(0);
         	field.executeScript("javascript:" + strJavascript);
@@ -154,7 +154,7 @@ public class BrowserAdapter5 implements IBrowserAdapter
     
     public void setCookie(String url, String cookie)
     {
-        //synchronized (Application.getEventLock()) 
+        synchronized (Application.getEventLock()) 
         {
         	BrowserFieldCookieManager man = (BrowserFieldCookieManager)m_oConfig.getProperty(BrowserFieldConfig.COOKIE_MANAGER);
         	if ( man != null )

data/platform/bb/rhodes/src/com/rho/rubyext/System.java

@@ -15,6 +15,7 @@ import com.xruby.runtime.lang.*;
 import com.xruby.runtime.builtin.*;
 import com.rho.RhoRubyHelper;
 import com.rho.file.IRAFile;
+import com.rho.Version;
 
 import net.rim.device.api.system.ApplicationDescriptor;
 import net.rim.device.api.system.ApplicationManager;
@@ -358,7 +359,11 @@ public class System {
     		return ObjectFactory.createBoolean(rhomobile.RhodesApplication.getInstance().hasTouchScreen());
     	if ( strPropName.equalsIgnoreCase("has_sqlite") )
     		return ObjectFactory.createBoolean(com.rho.Capabilities.USE_SQLITE);
-    	    	
+    	if ( strPropName.equalsIgnoreCase("webview") ) {
+    		Version.SoftVersion ver = Version.getSoftVersion();
+    		return ObjectFactory.createString((ver.nMajor < 6 ? "BB" : "WEBKIT")+"/"+DeviceInfo.getSoftwareVersion() ); 
+    	}
+
     	return RubyConstant.QNIL;
     }
 

data/platform/bb/rhodes/src/com/rho/rubyext/WebView.java

@@ -119,9 +119,16 @@ public class WebView
 		klass.getSingletonClass().defineMethod("set_cookie", new RubyTwoArgMethod() {
 			protected RubyValue run(RubyValue receiver, RubyValue arg1, RubyValue arg2, RubyBlock block) {
 				try {
-					String url = arg1.toString();
-					String cookie = arg2.toString();
-					RhodesApplication.getInstance().setCookie(RhodesApp.getInstance().canonicalizeRhoUrl(url), cookie);
+					final String url = arg1.toString();
+					final String cookie = arg2.toString();
+					
+					RhodesApplication.getInstance().invokeLater( new Runnable() { 
+			            public void run() 
+			            {
+							RhodesApplication.getInstance().setCookie(RhodesApp.getInstance().canonicalizeRhoUrl(url), cookie);
+			            }
+			        } );
+					
 					return RubyConstant.QNIL;
 				}
 				catch (Exception e) {

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

@@ -40,6 +40,7 @@ import net.rim.device.api.ui.Manager;
 import net.rim.device.api.math.Fixed32;
 //import net.rim.device.api.system.EventInjector.KeyCodeEvent;
 import net.rim.blackberry.api.invoke.MessageArguments;
+import net.rim.blackberry.api.invoke.PhoneArguments;
 import net.rim.blackberry.api.mail.Address;
 import net.rim.blackberry.api.mail.Message.RecipientType;
 
@@ -281,8 +282,22 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
     	return str;
     }
     
+    private boolean isHistoryIgnore(String strUrl)
+    {
+    	if ( strUrl == null || strUrl.length() == 0 )
+    		return true;
+    	
+    	if (strUrl.indexOf(':') == -1 )
+    		return false;
+    	
+    	return !(strUrl.startsWith("http:")||strUrl.startsWith("https:"));
+    }
+    
     public void addToHistory(String strUrl, String refferer )
     {
+    	if ( isHistoryIgnore(strUrl) )
+    		return;
+    	
     	strUrl = removeSemicolon(strUrl);
     	refferer = removeSemicolon(refferer);
     	
@@ -1649,7 +1664,7 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
         		}
         	}
 
-        	if ( uri.getScheme().equalsIgnoreCase("rhomailto"))
+        	if ( uri.getScheme().equalsIgnoreCase("rhomailto") || uri.getScheme().equalsIgnoreCase("mailto"))
         	{
         		runMailApplication(uri);
         		return;
@@ -1660,6 +1675,11 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
         		MessageArguments args = new MessageArguments( msg );
         		Invoke.invokeApplication(Invoke.APP_TYPE_MESSAGES, args);
         		return;
+        	}else if ( uri.getScheme().equalsIgnoreCase("tel"))
+        	{
+        		Invoke.invokeApplication(Invoke.APP_TYPE_PHONE, new PhoneArguments( PhoneArguments.ARG_CALL,
+        				uri.getPath() ));
+        		return;
         	}
 
     		HttpConnection connection = Utilities.makeConnection(_url, _requestHeaders, _postData, null);

data/platform/iphone/Classes/SimpleMainView.m

@@ -476,11 +476,11 @@ static BOOL makeHiddenUntilLoadContent = YES;
 		}
 		break;
 	}
-	if ((current_orientation == UIInterfaceOrientationLandscapeLeft) || (current_orientation == UIInterfaceOrientationLandscapeRight)) {
-		int t = width;
-		width = height;
-		height = t;
-	}
+	//if ((current_orientation == UIInterfaceOrientationLandscapeLeft) || (current_orientation == UIInterfaceOrientationLandscapeRight)) {
+	//	int t = width;
+	//	width = height;
+	//	height = t;
+	//}
 	//rho_rhodesapp_callScreenRotationCallback((int)wFrame.size.width, (int)wFrame.size.height, angle);
 	rho_rhodesapp_callScreenRotationCallback(width, height, angle);
 }

data/platform/iphone/Info.plist

@@ -38,7 +38,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.4.1</string>
+	<string>3.0.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchImageFile</key>

data/platform/iphone/rbuild/iphone.rake

@@ -239,6 +239,31 @@ def app_expanded_path(appname)
 end
 
 
+def check_sdk(sdkname) 
+
+      puts 'Check SDK :'
+      args = ['-version', '-sdk', sdkname]
+
+      puts Jake.run($xcodebuild,args)
+      ret = $?
+
+      chdir $startdir
+
+      unless ret == 0
+        puts ""
+        puts "ERROR: invalid SDK in BUILD.YML !"
+        puts sdkname+' is NOT installed on this computer !'
+        puts ""
+
+        puts "See all installed SDKs on this computer :"
+        args = ['-showsdks']
+        Jake.run($xcodebuild,args)
+        
+        exit 1
+      end
+end
+
+
 namespace "config" do
   task :set_iphone_platform do
     $current_platform = "iphone"
@@ -293,6 +318,8 @@ namespace "config" do
 
     puts $sdk
     
+    check_sdk($sdk)    
+
     if $sdk =~ /iphonesimulator/
       $sdkver = $sdk.gsub(/iphonesimulator/,"")
       $sdkroot = $devroot + "/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" + $sdkver + ".sdk"
@@ -443,7 +470,9 @@ namespace "build" do
       restore_app_icon
 
       unless ret == 0
-        puts "Error cleaning"
+        puts '************************************'
+        puts "ERROR during building by XCode !"
+        puts 'XCode return next error code = '+ret.to_s
         exit 1
       end
 

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

@@ -72,7 +72,10 @@
 		F5FD0944106151C200B7B8ED /* MapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F5FD0943106151C200B7B8ED /* MapViewController.m */; };
 		FA291E9811FF2EF70096AC39 /* SignatureDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = FA291E9511FF2EF70096AC39 /* SignatureDelegate.m */; };
 		FA291E9911FF2EF70096AC39 /* SignatureViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FA291E9711FF2EF70096AC39 /* SignatureViewController.m */; };
+		FA3C79AE136ED523002302E5 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA3C79AD136ED523002302E5 /* CoreVideo.framework */; };
+		FA3C79E2136ED8BB002302E5 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA3C79E1136ED8BB002302E5 /* CoreMedia.framework */; };
 		FA4981B511FFC53C00488CB2 /* SignatureView.m in Sources */ = {isa = PBXBuildFile; fileRef = FA4981B411FFC53C00488CB2 /* SignatureView.m */; };
+		FA4D3F8D136B0A98009D6E63 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FA4D3F8C136B0A98009D6E63 /* libiconv.dylib */; };
 		FA522E7F12DEA7B300AB55CC /* NVDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = FA522E7B12DEA7B300AB55CC /* NVDelegate.m */; };
 		FA522E8012DEA7B300AB55CC /* NVViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FA522E7D12DEA7B300AB55CC /* NVViewController.m */; };
 		FA522E8112DEA7B300AB55CC /* RhoNativeViewManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA522E7E12DEA7B300AB55CC /* RhoNativeViewManager.mm */; };
@@ -265,8 +268,11 @@
 		FA291E9511FF2EF70096AC39 /* SignatureDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SignatureDelegate.m; path = Signature/SignatureDelegate.m; sourceTree = "<group>"; };
 		FA291E9611FF2EF70096AC39 /* SignatureViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SignatureViewController.h; path = Signature/SignatureViewController.h; sourceTree = "<group>"; };
 		FA291E9711FF2EF70096AC39 /* SignatureViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SignatureViewController.m; path = Signature/SignatureViewController.m; sourceTree = "<group>"; };
+		FA3C79AD136ED523002302E5 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/CoreVideo.framework; sourceTree = DEVELOPER_DIR; };
+		FA3C79E1136ED8BB002302E5 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/System/Library/Frameworks/CoreMedia.framework; sourceTree = DEVELOPER_DIR; };
 		FA4981B311FFC53C00488CB2 /* SignatureView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SignatureView.h; path = Signature/SignatureView.h; sourceTree = "<group>"; };
 		FA4981B411FFC53C00488CB2 /* SignatureView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SignatureView.m; path = Signature/SignatureView.m; sourceTree = "<group>"; };
+		FA4D3F8C136B0A98009D6E63 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk/usr/lib/libiconv.dylib; sourceTree = DEVELOPER_DIR; };
 		FA522E7A12DEA7B300AB55CC /* NVDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NVDelegate.h; path = NativeView/NVDelegate.h; sourceTree = "<group>"; };
 		FA522E7B12DEA7B300AB55CC /* NVDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NVDelegate.m; path = NativeView/NVDelegate.m; sourceTree = "<group>"; };
 		FA522E7D12DEA7B300AB55CC /* NVViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NVViewController.m; path = NativeView/NVViewController.m; sourceTree = "<group>"; };
@@ -299,6 +305,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				FA3C79E2136ED8BB002302E5 /* CoreMedia.framework in Frameworks */,
+				FA3C79AE136ED523002302E5 /* CoreVideo.framework in Frameworks */,
+				FA4D3F8D136B0A98009D6E63 /* libiconv.dylib in Frameworks */,
 				BDB15ED510B2EC8700003DFA /* librhorubylib.a in Frameworks */,
 				BDB15ED410B2EC7500003DFA /* librholib.a in Frameworks */,
 				BDB15ED310B2EC6D00003DFA /* libcurl.a in Frameworks */,
@@ -376,6 +385,9 @@
 		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
 			isa = PBXGroup;
 			children = (
+				FA3C79E1136ED8BB002302E5 /* CoreMedia.framework */,
+				FA3C79AD136ED523002302E5 /* CoreVideo.framework */,
+				FA4D3F8C136B0A98009D6E63 /* libiconv.dylib */,
 				FA52317212E750F300AB55CC /* Resources */,
 				BDFBD99910B1B9A900BAAFAB /* Settings.bundle */,
 				BDFBD99510B1B99A00BAAFAB /* Entitlements.plist */,

data/platform/shared/SyncClient/SyncClient.cpp

@@ -42,26 +42,6 @@ void rho_syncclient_initmodel(RHOM_MODEL* model)
     model->partition = "user";
 }
 
-void rho_syncclient_free_syncnotify(RHO_SYNC_NOTIFY* pNotify)
-{
-    if (!pNotify)
-        return;
-
-    if ( pNotify->source_name != null )
-        free(pNotify->source_name);
-
-    if ( pNotify->status != null )
-        free(pNotify->status);
-
-    if ( pNotify->error_message != null )
-        free(pNotify->error_message);
-
-    if ( pNotify->callback_params != null )
-        free(pNotify->callback_params);
-
-    memset( pNotify, 0, sizeof(RHO_SYNC_NOTIFY) );
-}
-
 void rho_syncclient_processmodels(RHOM_MODEL* pModels, int nModels)
 {
     db::CDBAdapter& oUserDB = db::CDBAdapter::getUserDB();
@@ -705,6 +685,142 @@ void rho_syncclient_parsenotify(const char* msg, RHO_SYNC_NOTIFY* pNotify)
         pNotify->callback_params = strdup(msg+nLastPos);
 }
 
+void rho_syncclient_free_syncnotify(RHO_SYNC_NOTIFY* pNotify)
+{
+    if (!pNotify)
+        return;
+    
+    if ( pNotify->source_name != null )
+        free(pNotify->source_name);
+    
+    if ( pNotify->status != null )
+        free(pNotify->status);
+    
+    if ( pNotify->error_message != null )
+        free(pNotify->error_message);
+    
+    if ( pNotify->callback_params != null )
+        free(pNotify->callback_params);
+    
+    memset( pNotify, 0, sizeof(RHO_SYNC_NOTIFY) );
+}
+    
+void rho_syncclient_parse_objectnotify(const char* msg, RHO_SYNC_OBJECT_NOTIFY* pNotify)
+{
+    {
+        CTokenizer oTokenizer( msg, "&" );
+        while (oTokenizer.hasMoreTokens()) 
+        {
+            String tok = oTokenizer.nextToken();
+            if (tok.length() == 0)
+                continue;
+        
+            CTokenizer oValueTok( tok, "=" );
+            String name = net::URI::urlDecode(oValueTok.nextToken());
+        
+            if ( String_startsWith(name, "deleted[][object]"))
+                pNotify->deleted_count++;
+            else if ( String_startsWith(name, "updated[][object]")) 
+                pNotify->updated_count++;
+            else  if ( String_startsWith(name, "created[][object]")) 
+                pNotify->created_count++; 
+        }
+    }
+    
+    if ( pNotify->deleted_count > 0 )
+    {
+        pNotify->deleted_source_ids = new int[pNotify->deleted_count];
+        pNotify->deleted_objects = new char*[pNotify->deleted_count];
+    }
+    
+    if ( pNotify->updated_count > 0 )
+    {
+        pNotify->updated_source_ids = new int[pNotify->updated_count];
+        pNotify->updated_objects = new char*[pNotify->updated_count];
+    }
+
+    if ( pNotify->created_count > 0 )
+    {
+        pNotify->created_source_ids = new int[pNotify->created_count];
+        pNotify->created_objects = new char*[pNotify->created_count];
+    }
+
+    {
+        CTokenizer oTokenizer( msg, "&" );
+        int nDeleted = 0, nUpdated = 0, nCreated = 0;
+        while (oTokenizer.hasMoreTokens()) 
+        {
+            String tok = oTokenizer.nextToken();
+            if (tok.length() == 0)
+                continue;
+            
+            CTokenizer oValueTok( tok, "=" );
+            String name = net::URI::urlDecode(oValueTok.nextToken());
+            String value = net::URI::urlDecode(oValueTok.nextToken());
+            
+            if ( String_startsWith(name, "deleted[][object]"))
+            {
+                pNotify->deleted_objects[nDeleted] = strdup(value.c_str());
+                nDeleted++;
+            }else if (String_startsWith(name, "deleted[][source_id]"))
+                convertFromStringA( value.c_str(), pNotify->deleted_source_ids[nDeleted] );
+            else if ( String_startsWith(name, "updated[][object]")) 
+            {
+                pNotify->updated_objects[nUpdated] = strdup(value.c_str());
+                nUpdated++;
+            }else if (String_startsWith(name, "updated[][source_id]"))
+                convertFromStringA( value.c_str(), pNotify->updated_source_ids[nUpdated] );
+            else  if ( String_startsWith(name, "created[][object]")) 
+            {
+                pNotify->created_objects[nCreated] = strdup(value.c_str());
+                nCreated++;
+            }else if (String_startsWith(name, "created[][source_id]"))
+                convertFromStringA( value.c_str(), pNotify->created_source_ids[nCreated] );
+        }
+    }
+}
+    
+void rho_syncclient_free_sync_objectnotify(RHO_SYNC_OBJECT_NOTIFY* pNotify)
+{
+    if (!pNotify)
+        return;
+    
+    if ( pNotify->deleted_source_ids != null )
+        free(pNotify->deleted_source_ids);
+
+    if ( pNotify->updated_source_ids != null )
+        free(pNotify->updated_source_ids);
+
+    if ( pNotify->created_source_ids != null )
+        free(pNotify->created_source_ids);
+    
+    if ( pNotify->deleted_objects != null )
+    {
+        for(int i = 0; i < pNotify->deleted_count; i++)
+            free(pNotify->deleted_objects[i]);
+        
+        free(pNotify->deleted_objects);
+    }
+
+    if ( pNotify->updated_objects != null )
+    {
+        for(int i = 0; i < pNotify->updated_count; i++)
+            free(pNotify->updated_objects[i]);
+        
+        free(pNotify->updated_objects);
+    }
+
+    if ( pNotify->created_objects != null )
+    {
+        for(int i = 0; i < pNotify->created_count; i++)
+            free(pNotify->created_objects[i]);
+        
+        free(pNotify->created_objects);
+    }
+    
+    memset( pNotify, 0, sizeof(RHO_SYNC_NOTIFY) );        
+}
+    
 unsigned long rho_syncclient_strarray_create()
 {
     return (unsigned long)(new rho::Vector<rho::String>());

data/platform/shared/SyncClient/SyncClient.h

@@ -35,6 +35,20 @@ typedef struct _RHO_SYNC_NOTIFY
     char* callback_params;
 }RHO_SYNC_NOTIFY;
 
+typedef struct _RHO_SYNC_OBJECT_NOTIFY
+{
+    int deleted_count;
+    int updated_count;
+    int created_count;
+    int* deleted_source_ids;
+    int* updated_source_ids;
+    int* created_source_ids;
+    
+    char** deleted_objects;
+    char** updated_objects;
+    char** created_objects;
+}RHO_SYNC_OBJECT_NOTIFY;
+    
 void rho_syncclient_initmodel(RHOM_MODEL* model);
 void rho_syncclient_init(RHOM_MODEL* pModels, int nModels);
 void rho_syncclient_destroy();
@@ -45,6 +59,9 @@ void rho_syncclient_database_full_reset(bool bClientReset);
 void rho_syncclient_parsenotify(const char* msg, RHO_SYNC_NOTIFY* pNotify);
 void rho_syncclient_free_syncnotify(RHO_SYNC_NOTIFY* pNotify);
 
+void rho_syncclient_parse_objectnotify(const char* msg, RHO_SYNC_OBJECT_NOTIFY* pNotify);
+void rho_syncclient_free_sync_objectnotify(RHO_SYNC_OBJECT_NOTIFY* pNotify);
+    
 unsigned long rho_syncclient_strarray_create();
 void rho_syncclient_strarray_add(unsigned long ar, const char* szStr);
 void rho_syncclient_strarray_delete(unsigned long ar);

data/platform/shared/common/AppMenu.cpp

@@ -20,7 +20,12 @@ void CAppMenu::addAppMenuItem( const String& strLabel, const String& strLink )
     if ( strcasecmp( strLabel.c_str(), "back" )==0 && strcasecmp( strLink.c_str(), "back" )!=0 )
         RHODESAPP().setAppBackUrl(strLink);
     else
-    	m_arAppMenuItems.push_back(CAppMenuItem(strLabel, strLink));
+    {
+        synchronized(m_mxAppMenu) 
+	    {
+        	m_arAppMenuItems.push_back(CAppMenuItem(strLabel, strLink));
+        }
+    }
 }
 
 extern "C" void