rhodes 2.2.4.beta.1 → 2.2.5.beta.1

data/platform/android/build/android.rake

@@ -129,7 +129,8 @@ def set_app_name_android(newname)
   doc.elements.delete "manifest/application/uses-library[@android:name='com.google.android.maps']" unless $use_geomapping
 
   caps_proc = []
-  caps = ['INTERNET', 'PERSISTENT_ACTIVITY', 'WAKE_LOCK']
+  # Default permissions. Need to be always enabled.
+  caps = ['INTERNET', 'PERSISTENT_ACTIVITY', 'WAKE_LOCK', 'ACCESS_NETWORK_STATE']
   $app_config["capabilities"].each do |cap|
     cap = ANDROID_PERMISSIONS[cap]
     next if cap.nil?
@@ -146,19 +147,37 @@ def set_app_name_android(newname)
   manifest = doc.elements["manifest"]
 
   manifest.elements.each('uses-sdk') { |e| manifest.delete e }
+  
   element = REXML::Element.new('uses-sdk')
   element.add_attribute('android:minSdkVersion', ANDROID_API_LEVEL.to_s)
   manifest.add element
 
+  # Remove category LAUNCHER from all activities if hidden_app is set
+  hidden_app = get_boolean($app_config['hidden_app'])
+  if hidden_app
+    manifest.elements.each('application') do |app|
+      app.elements.each('activity') do |activity|
+        activity.elements.each('intent-filter') do |intf|
+          intf.elements.each('category') do |c|
+            name = c.attribute('name', 'android')
+            next if name.nil?
+            intf.delete(c) if name.to_s == 'android.intent.category.LAUNCHER'
+          end
+        end
+      end
+    end
+  end
+
   # Clear C2DM stuff
-  doc.elements.delete "manifest/application/receiver[@android:name='com.rhomobile.rhodes.PushReceiver']"
+  doc.elements.delete "manifest/application/receiver[@android:name='#{JAVA_PACKAGE_NAME}.PushReceiver']"
   manifest.elements.each('permission') do |e|
     name = e.attribute('name', 'android')
     next if name.nil?
     manifest.delete(e) if name.to_s =~ /\.C2D_MESSAGE$/
   end
 
-  manifest.elements.each('uses-permission') { |e| manifest.delete e }
+  #manifest.elements.each('uses-permission') { |e| manifest.delete e }
+
   caps.sort.each do |cap|
     element = REXML::Element.new('uses-permission')
     element.add_attribute('android:name', "android.permission.#{cap}")
@@ -250,7 +269,10 @@ namespace "config" do
     $libs = File.join($androidpath, "Rhodes", "libs")
     $appname = $app_config["name"]
     $appname = "Rhodes" if $appname.nil?
-    $app_package_name = "com.rhomobile." + $appname.downcase.gsub(/[^A-Za-z_0-9]/, '')
+    $vendor = $app_config["vendor"]
+    $vendor = "rhomobile" if $vendor.nil?
+    $vendor = $vendor.gsub(/^[^A-Za-z]/, '_').gsub(/[^A-Za-z0-9]/, '_').gsub(/_+/, '_').downcase
+    $app_package_name = "com.#{$vendor}." + $appname.downcase.gsub(/[^A-Za-z_0-9]/, '')
 
     $rhomanifest = File.join $androidpath, "Rhodes", "AndroidManifest.xml"
     $appmanifest = File.join $tmpdir, "AndroidManifest.xml"
@@ -416,9 +438,13 @@ namespace "config" do
         puts "+++ API LEVEL of #{dir}: #{apilevel}" if USE_TRACES
 
         if apilevel > napilevel
-          napilevel = apilevel
-          $gapijar = File.join(dir, 'libs', 'maps.jar')
-          $found_api_level = apilevel
+          
+	  sgapijar = File.join(dir, 'libs', 'maps.jar')
+          if File.exists? sgapijar
+            napilevel = apilevel
+            $gapijar = sgapijar
+            $found_api_level = apilevel
+          end
         end
       end
       if $gapijar.nil?
@@ -435,6 +461,11 @@ namespace "config" do
     $avdname += "ext" if $use_google_addon_api
     $avdtarget = $androidtargets[get_api_level($emuversion)]
 
+    $appavdname = nil
+    if $app_config["android"] != nil
+      $appavdname = $app_config["android"]["emulator"] 
+    end
+
     setup_ndk($androidndkpath, ANDROID_API_LEVEL)
     
     $stlport_includes = File.join $shareddir, "stlport", "stlport"
@@ -831,7 +862,6 @@ namespace "build" do
       end
 
       # Generate Push.java
-      puts "app_push_java: #{$app_push_java.inspect}"
       File.open($app_push_java, "w") do |f|
         f.puts "package #{JAVA_PACKAGE_NAME};"
         f.puts "public class Push {"
@@ -1100,7 +1130,7 @@ namespace "package" do
 end
 
 def get_app_log(appname, device, silent = false)
-  pkgname = 'com.rhomobile.' + appname.downcase.gsub(/[^A-Za-z_0-9]/, '')
+  pkgname = "com.#{$vendor}." + appname.downcase.gsub(/[^A-Za-z_0-9]/, '')
   path = File.join('/data/data', pkgname, 'rhodata', 'RhoLog.txt')
   cc_run($adb, [device ? '-d' : '-e', 'pull', path, $app_path]) or return false
   puts "RhoLog.txt stored to " + $app_path unless silent
@@ -1139,6 +1169,10 @@ namespace "device" do
       #remove temporary files
       rm_rf simple_apkfile
 
+      File.open(File.join(File.dirname(final_apkfile), "app_info.txt"), "w") do |f|
+        f.puts $app_package_name
+      end
+
     end
 
     task :install => :debug do
@@ -1224,6 +1258,10 @@ namespace "device" do
       #remove temporary files
       rm_rf simple_apkfile
       rm_rf signed_apkfile
+
+      File.open(File.join(File.dirname(final_apkfile), "app_info.txt"), "w") do |f|
+        f.puts $app_package_name
+      end
     end
 
     task :getlog => "config:android" do
@@ -1372,6 +1410,9 @@ namespace "run" do
       puts 'Sleep for 5 sec. waiting for "adb start-server"'
       sleep 5
 
+      if $appavdname != nil
+        $avdname = $appavdname
+      end
       createavd = "\"#{$androidbin}\" create avd --name #{$avdname} --target #{$avdtarget} --sdcard 32M --skin HVGA"
       system(createavd) unless File.directory?( File.join(ENV['HOME'], ".android", "avd", "#{$avdname}.avd" ) )
 

data/platform/android/build/librhocommon_build.files

@@ -8,6 +8,7 @@ platform/shared/common/SplashScreen.cpp
 platform/shared/common/Tokenizer.cpp
 platform/shared/common/AppMenu.cpp
 platform/shared/common/rhoparams.cpp
+platform/shared/common/app_build_configs.c
 platform/shared/net/AsyncHttp.cpp
 platform/shared/net/CURLNetRequest.cpp
 platform/shared/net/HttpServer.cpp

data/platform/bb/Hsqldb/src/org/hsqldb/Parser.java

@@ -235,11 +235,12 @@ class Parser {
             if (full) {
                 String   token  = t.getSimpleName();
                 boolean  quoted = t.wasQuotedIdentifier();
-                HsqlName name   = db.nameManager.newHsqlName(token, quoted);
+                HsqlName name   = db.nameManager.newHsqlName(t.sTokenOrig/*token*/, quoted);
 
                 columns.add(name);
             } else {
-                columns.add(t.getName());
+            	String   token  = t.getName();
+                columns.add(t.sTokenOrig);
 
                 if (t.wasLongName()
                         && !t.getLongNameFirst().equals(

data/platform/bb/Hsqldb/src/org/hsqldb/SchemaManager.java

@@ -351,7 +351,9 @@ public class SchemaManager {
                           String schema) throws HsqlException {
 
         Table t = findUserTable(session, name, schema);
-
+        if (t == null)
+        	t = findUserTable(session, session.getOrigToken(), schema);
+        
         if (t == null) {
             if (!INFORMATION_SCHEMA.equals(schema)) {
                 throw Trace.error(Trace.TABLE_NOT_FOUND);

data/platform/bb/Hsqldb/src/org/hsqldb/Session.java

@@ -159,6 +159,13 @@ public class Session implements SessionInterface {
     Session getSession() {
         return this;
     }
+    String getOrigToken() 
+    {
+    	if ( tokenizer!= null)
+    		return tokenizer.sTokenOrig;
+    	
+    	return "";
+    }
 
     //RHO
     private IDBCallback m_dbCallback;

data/platform/bb/Hsqldb/src/org/hsqldb/Tokenizer.java

@@ -380,7 +380,7 @@ public class Tokenizer {
             return false;
         }
 
-        return !Token.isKeyword(sToken);
+        return !Token.isKeyword(sTokenOrig);
     }
 
     String getLongNamePre() throws HsqlException {
@@ -874,7 +874,7 @@ public class Tokenizer {
                     iIndex++;
 
                     sToken = getString('"');//.toUpperCase();
-
+                    sTokenOrig = sToken;	
                     if (iIndex == sCommand.length()) {
                         return;
                     }

data/platform/bb/RubyVM/RubyVM.jdp

@@ -67,6 +67,7 @@ src\com\rho\Sprintf.java
 src\com\rho\StringScanner.java
 src\com\rho\Capabilities.java
 src\com\rho\Extensions.java
+src\com\rho\AppBuildConfig.java
 src\com\rho\sync\ClientRegister.java
 src\com\rho\sync\ISyncStatusListener.java
 src\com\rho\sync\JSONArrayIterator.java

data/platform/bb/RubyVM/src/com/rho/AppBuildConfig.java

@@ -0,0 +1,22 @@
+// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!
+// Generated 2010-12-07 21:11:23 +0300
+package com.rho;
+
+public class AppBuildConfig {
+static final String keys[] = { ""
+};
+
+static final String values[] = { ""
+};
+
+static final int APP_BUILD_CONFIG_COUNT = 1;
+
+public static String getItem(String key){
+  for (int i = 1; i < APP_BUILD_CONFIG_COUNT; i++) {
+    if ( key.compareTo( keys[i]) == 0) {
+      return values[i];
+    }
+  }
+  return null;
+}
+}

data/platform/bb/RubyVM/src/com/rho/RhoRuby.java

@@ -30,6 +30,7 @@ public class RhoRuby {
 	public static final RubyID raiseRhoError = RubyID.intern("raise_rhoerror");
 	public static final RubyID initApp = RubyID.intern("init_app");
 	public static final RubyID activateApp = RubyID.intern("activate_app");
+	public static final RubyID deactivateApp = RubyID.intern("deactivate_app");
 	
 //	public static final RubyID getStartPath = RubyID.intern("get_start_path");
 //	public static final RubyID getOptionsPath = RubyID.intern("get_options_path");
@@ -82,6 +83,10 @@ public class RhoRuby {
 		RubyAPI.callPublicNoArgMethod(receiver, null, activateApp);
 	}
 
+	public static void rho_ruby_deactivateApp(){
+		RubyAPI.callPublicNoArgMethod(receiver, null, deactivateApp);
+	}
+	
 	public static boolean rho_ruby_isValid(){
 		return receiver!= null && receiver != RubyConstant.QNIL;
 	}

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

@@ -689,7 +689,7 @@ public class RhoConnection implements IHttpConnection {
 	
 	protected boolean dispatch()throws IOException
 	{
-		LOG.INFO("dispatch start : " + uri.getPath());
+		//LOG.INFO("dispatch start : " + uri.getPath());
 		
 		UrlParser up = new UrlParser(uri.getPath());
 		String apps = up.next();

data/platform/bb/RubyVM/src/com/rho/sync/SyncEngine.java

@@ -66,6 +66,50 @@ public class SyncEngine implements NetRequest.IRhoSession
         }
     };
     
+    static class SourceOptions
+    {
+        private Mutex m_mxSrcOptions = new Mutex();
+        private Hashtable/*Ptr<int, Hashtable<String,String>* >*/ m_hashSrcOptions = new Hashtable();
+        
+    	public void setProperty(Integer nSrcID, String szPropName, String szPropValue)
+    	{
+    	    synchronized(m_mxSrcOptions)
+    	    {
+    	        Hashtable/*<String,String>* */phashOptions = (Hashtable)m_hashSrcOptions.get(nSrcID);
+    	        if ( phashOptions == null )
+    	        {
+    	            phashOptions = new Hashtable/*<String,String>*/();
+    	            m_hashSrcOptions.put( nSrcID, phashOptions );
+    	        }
+
+    	        //Hashtable<String,String>& hashOptions = *phashOptions;
+    	        phashOptions.put(szPropName,szPropValue!=null?szPropValue:"");
+    	    }
+    	}
+        public String getProperty(Integer nSrcID, String szPropName)
+        {
+            String res = "";
+            synchronized(m_mxSrcOptions)
+            {
+                Hashtable/*<String,String>* */phashOptions = (Hashtable)m_hashSrcOptions.get(nSrcID);
+                if ( phashOptions != null )
+                {
+                    //Hashtable<String,String>& hashOptions = *phashOptions;
+                    res = (String)phashOptions.get(szPropName);
+                }
+            }
+
+            return res;
+        }
+        public boolean getBoolProperty(Integer nSrcID, String szPropName)
+        {
+            String strValue = getProperty(nSrcID, szPropName);
+
+            return strValue.compareTo("1") == 0 || strValue.compareTo("true") == 0 ? true : false;
+        	
+        }
+    };
+    
     Vector/*<SyncSource*>*/ m_sources = new Vector();
     Vector/*<String>*/      m_arPartitions = new Vector();    
     NetRequest m_NetRequest;
@@ -81,6 +125,7 @@ public class SyncEngine implements NetRequest.IRhoSession
     int m_nErrCode = RhoAppAdapter.ERR_NONE;
     String m_strError = "";
     boolean m_bIsSearch, m_bIsSchemaChanged;
+    static SourceOptions m_oSourceOptions = new SourceOptions();
     
     void setState(int eState){ m_syncState = eState; }
     int getState(){ return m_syncState; }
@@ -112,6 +157,7 @@ public class SyncEngine implements NetRequest.IRhoSession
     
     boolean isNoThreadedMode(){ return m_bNoThreaded; }
     void setNonThreadedMode(boolean b){m_bNoThreaded = b;}
+    static SourceOptions getSourceOptions(){ return m_oSourceOptions; }
     
     SyncEngine(){
 		m_NetRequest = null;
@@ -130,6 +176,7 @@ public class SyncEngine implements NetRequest.IRhoSession
     
     void setFactory(RhoClassFactory factory)throws Exception{ 
 		m_NetRequest = RhoClassFactory.createNetRequest();
+		m_oSyncNotify.setFactory(factory);		
     }
     
     void prepareSync(int eState, SourceID oSrcID)throws Exception
@@ -677,7 +724,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 	        {
 	    	    LOG.ERROR( "Bulk sync failed: server return an error." );
 	    	    stopSync();
-	    	    getNotify().fireBulkSyncNotification(true, "", strPartition, RhoAppAdapter.ERR_REMOTESERVER);
+	    	    getNotify().fireBulkSyncNotification(true, "", strPartition,RhoAppAdapter.getErrorFromResponse(resp));
 	    	    return;
 	        }
 
@@ -721,7 +768,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 		    {
 			    LOG.ERROR("Bulk sync failed: cannot download database file: " + resp1.getRespCode() );
 			    stopSync();
-			    getNotify().fireBulkSyncNotification(true, "", strPartition, RhoAppAdapter.ERR_REMOTESERVER);
+			    getNotify().fireBulkSyncNotification(true, "", strPartition, RhoAppAdapter.getErrorFromResponse(resp1));
 			    return;
 		    }
 	    }
@@ -738,7 +785,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 		    {
 			    LOG.ERROR("Bulk sync failed: cannot download database file.");
 			    stopSync();
-			    getNotify().fireBulkSyncNotification(true, "", strPartition, RhoAppAdapter.ERR_REMOTESERVER);
+			    getNotify().fireBulkSyncNotification(true, "", strPartition, RhoAppAdapter.getErrorFromResponse(resp1));
 			    return;
 		    }
 	    }
@@ -828,7 +875,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 	        bError = !syncOneSource(i);
 	    }
 
-	    if ( !bError)
+	    if ( !bError && !isSchemaChanged() )
 	    	getNotify().fireSyncNotification(null, true, RhoAppAdapter.ERR_NONE, RhoAppAdapter.getMessageText("sync_completed"));
 	}
 	

data/platform/bb/RubyVM/src/com/rho/sync/SyncNotify.java

@@ -1,6 +1,7 @@
 package com.rho.sync;
 
 import com.rho.Mutex;
+import com.rho.RhoClassFactory;
 import com.rho.RhoEmptyLogger;
 import com.rho.RhoLogger;
 import com.rho.RhoAppAdapter;
@@ -10,6 +11,7 @@ import java.util.Hashtable;
 import com.rho.*;
 import com.rho.db.*;
 import com.rho.net.*;
+
 import java.util.Vector;
 
 public class SyncNotify {
@@ -47,19 +49,29 @@ public class SyncNotify {
     Mutex m_mxSyncNotifications = new Mutex();
     ISyncStatusListener m_syncStatusListener = null;
     boolean m_bEnableReporting = false;
+    boolean m_bEnableReportingGlobal = true;
     String m_strNotifyBody = "";
+    NetRequest m_NetRequest;
     
     SyncEngine getSync(){ return m_syncEngine; }
-	NetRequest getNet(){ return getSync().getNet(); }
+    NetRequest getNet() { return m_NetRequest;}
 
 	String getNotifyBody(){ return m_strNotifyBody; }
 	void cleanNotifyBody(){ m_strNotifyBody = ""; }
-	
+
+    boolean isReportingEnabled(){return m_bEnableReporting&&m_bEnableReportingGlobal;}
+    void enableReporting(boolean bEnable) {	m_bEnableReporting = bEnable; }
+    void enableStatusPopup(boolean bEnable){m_bEnableReportingGlobal = bEnable;}
+    
     SyncNotify( SyncEngine syncEngine ) 
     {
     	m_syncEngine = syncEngine;
     }
     
+    void setFactory(RhoClassFactory factory)throws Exception{ 
+		m_NetRequest = RhoClassFactory.createNetRequest();
+    }
+    
     void addObjectNotify(Integer nSrcID, String strObject)
     {
     	synchronized(m_mxObjectNotify)
@@ -262,8 +274,11 @@ public class SyncNotify {
 
         if ( getSync().getState() == SyncEngine.esStop && src.m_nErrCode != RhoAppAdapter.ERR_NONE )
         {
-            fireSyncNotification(src, true, src.m_nErrCode, "");
-    		fireAllSyncNotifications(true, src.m_nErrCode, src.m_strError );
+        	SyncNotification pSN = getSyncNotifyBySrc(src);
+        	if ( pSN != null )        	
+        		fireSyncNotification(src, true, src.m_nErrCode, "");
+        	else
+        		fireAllSyncNotifications(true, src.m_nErrCode, src.m_strError );
         }
         else
             fireSyncNotification( src, true, src.m_nErrCode, "");
@@ -316,16 +331,11 @@ public class SyncNotify {
     	}
     }
     
-    void enableReporting(boolean bEnable)
-    {
-    	m_bEnableReporting = bEnable;
-    }
-    
     public void reportSyncStatus(String status, int error, String strDetails) 
     {
     	synchronized(m_mxSyncNotifications)
     	{    	
-	    	if (m_syncStatusListener != null && (m_bEnableReporting || error == RhoAppAdapter.ERR_SYNCVERSION) ) {
+	    	if (m_syncStatusListener != null && (isReportingEnabled() || error == RhoAppAdapter.ERR_SYNCVERSION) ) {
 	    		
 	    		if ( error == RhoAppAdapter.ERR_SYNCVERSION )
 	    			status = RhoAppAdapter.getErrorText(error);
@@ -463,6 +473,7 @@ public class SyncNotify {
 				        	
 				        	strBody += "error";				        	
 						    strBody += "&error_code=" + nErrCode;
+						    strBody += "&error_type=" + (src != null ? src.m_strErrorType : "");
 						    
 						    if ( strError != null && strError.length() > 0 )
 						    	strBody += "&error_message=" + URI.urlEncode(strError);

data/platform/bb/RubyVM/src/com/rho/sync/SyncSource.java

@@ -77,6 +77,7 @@ class SyncSource
     boolean m_bGetAtLeastOnePage = false;
     int m_nErrCode = RhoAppAdapter.ERR_NONE;
     String m_strError = "";
+    String m_strErrorType = "";
     
 	//String m_strPushBody = "";
     Vector/*Ptr<CSyncBlob*>*/ m_arSyncBlobs = new Vector();
@@ -210,7 +211,7 @@ class SyncSource
 	    //m_bIsSearch = false;
 	    
 	    try{
-	        if ( isTokenFromDB() && !isEmptyToken() )
+	        if ( isTokenFromDB() && getToken() > 1 )
 	            syncServerChanges();  //sync only server changes, which was paused before
 	        else
 	        {
@@ -314,29 +315,36 @@ class SyncSource
 	        LOG.INFO( "Push client changes to server. Source: " + getName() + "Size :" + strBody.length() );
 	        LOG.TRACE("Push body: " + strBody);		
 
-	        if ( m_arMultipartItems.size() > 0 )
-	        {
-	            MultipartItem oItem = new MultipartItem();
-	            oItem.m_strBody = strBody;
-	            //oItem.m_strContentType = getProtocol().getContentType();
-	            oItem.m_strName = "cud";
-	            m_arMultipartItems.addElement(oItem);
-
-	            NetResponse resp = getNet().pushMultipartData( getProtocol().getClientChangesUrl(), m_arMultipartItems, getSync(), null );
-	            if ( !resp.isOK() )
-	            {
-	                getSync().setState(SyncEngine.esStop);
-	                m_nErrCode = RhoAppAdapter.ERR_REMOTESERVER;
-	            }
-	        }else
-	        {
-	            NetResponse resp = getNet().pushData( getProtocol().getClientChangesUrl(), strBody, getSync());
-	            if ( !resp.isOK() )
-	            {
-	                getSync().setState(SyncEngine.esStop);
-	                m_nErrCode = RhoAppAdapter.ERR_REMOTESERVER;
-	            }
-	        }
+	        try{
+		        if ( m_arMultipartItems.size() > 0 )
+		        {
+		            MultipartItem oItem = new MultipartItem();
+		            oItem.m_strBody = strBody;
+		            //oItem.m_strContentType = getProtocol().getContentType();
+		            oItem.m_strName = "cud";
+		            m_arMultipartItems.addElement(oItem);
+	
+		            NetResponse resp = getNet().pushMultipartData( getProtocol().getClientChangesUrl(), m_arMultipartItems, getSync(), null );
+		            if ( !resp.isOK() )
+		            {
+		                getSync().setState(SyncEngine.esStop);
+		                m_nErrCode = RhoAppAdapter.ERR_REMOTESERVER;
+		            }
+		        }else
+		        {
+		            NetResponse resp = getNet().pushData( getProtocol().getClientChangesUrl(), strBody, getSync());
+		            if ( !resp.isOK() )
+		            {
+		                getSync().setState(SyncEngine.esStop);
+		                m_nErrCode = RhoAppAdapter.ERR_REMOTESERVER;
+		            }
+		        }
+		    }catch(Exception exc)
+		    {
+		    	m_nErrCode = RhoAppAdapter.getNetErrorCode(exc);
+		    	throw exc;
+		    }
+		        
 	    }
 
 	    for( i = 0; i < 3 && getSync().isContinueSync(); i++ )
@@ -503,6 +511,9 @@ class SyncSource
 		    }
 
 	        String szData = resp.getCharData();
+	        //String szData = "[{\"version\":3},{\"token\":\"\"},{\"count\":0},{\"progress_count\":28},{\"total_count\":28},{\"source-error\":{\"login-error\":{\"message\":\"s currently connected from another machine\"}}}]";
+		    //String szData =  "[{\"version\":3},{\"token\":\"\"},{\"count\":0},{\"progress_count\":0},{\"total_count\":0},{\"create-error\":{\"0_broken_object_id\":{\"name\":\"wrongname\",\"an_attribute\":\"error create\"},\"0_broken_object_id-error\":{\"message\":\"error create\"}}}]";
+	        //String szData =  "[{\"version\":3},{\"token\":\"35639160294387\"},{\"count\":3},{\"progress_count\":0},{\"total_count\":3},{\"metadata\":\"{\\\"foo\\\":\\\"bar\\\"}\",\"insert\":{\"1\":{\"price\":\"199.99\",\"brand\":\"Apple\",\"name\":\"iPhone\"}}}]";
 
 	        PROF.START("Parse");
 	        JSONArrayIterator oJsonArr = new JSONArrayIterator(szData);
@@ -510,9 +521,15 @@ class SyncSource
 
 	        processServerResponse_ver3(oJsonArr);
 
+	        if (getSync().getSourceOptions().getBoolProperty(getID(), "pass_through"))
+	        	processToken(0);
+	        
 	        if ( getToken() == 0 )
 	            break;
 	    }
+	    
+	    if ( getSync().isSchemaChanged() )
+	    	getSync().stopSync();	    
 	}
 
 	void processServerResponse_ver3(JSONArrayIterator oJsonArr)throws Exception
@@ -571,14 +588,6 @@ class SyncSource
 	        setTotalCount(oJsonArr.getCurItem().getInt("total_count"));
 	        oJsonArr.next();
 	    }
-	   /* if ( !oJsonArr.isEnd() && oJsonArr.getCurItem().hasName("source-error") )
-	    {
-	        CJSONEntry oJsonErr = oJsonArr.getCurItem().getEntry("source-error");
-	        m_strError = oJsonErr.getString("message");
-	        m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
-	        getSync().stopSync();
-	        return;
-	    }*/
 
 	    //if ( getServerObjectsCount() == 0 )
 	    //    getNotify().fireSyncNotification(this, false, RhoAppAdapter.ERR_NONE, "");
@@ -602,11 +611,51 @@ class SyncSource
 
 	        if ( oCmds.hasName("schema-changed") )
 	        {
-	            getSync().stopSync();    
 	            getSync().setSchemaChanged(true);
+	        }else if ( oCmds.hasName("source-error") )
+	        {
+	            JSONEntry errSrc = oCmds.getEntry("source-error");
+	            JSONStructIterator errIter = new JSONStructIterator(errSrc);
+	            for( ; !errIter.isEnd(); errIter.next() )
+	            {
+	                m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
+	                m_strError = errIter.getCurValue().getString("message");
+	                m_strErrorType = errIter.getCurKey();
+	            }
+	        }else if ( oCmds.hasName("search-error") )
+	        {
+	            JSONEntry errSrc = oCmds.getEntry("search-error");
+	            JSONStructIterator errIter = new JSONStructIterator(errSrc);
+	            for( ; !errIter.isEnd(); errIter.next() )
+	            {
+	                m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
+	                m_strError = errIter.getCurValue().getString("message");
+	                m_strErrorType = errIter.getCurKey();
+	            }
+	        }else if ( oCmds.hasName("create-error") )
+	        {
+	            m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
+	            m_strErrorType = "create-error";
+	        }else if ( oCmds.hasName("update-error") )
+	        {
+	            m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
+	            m_strErrorType = "update-error";
+	        }else if ( oCmds.hasName("delete-error") )
+	        {
+	            m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
+	            m_strErrorType = "delete-error";
 	        }else
 	        {
 		        getDB().startTransaction();
+		        
+	            if (getSync().getSourceOptions().getBoolProperty(getID(), "pass_through"))
+	            {
+	                if ( m_bSchemaSource )
+	                    getDB().executeSQL( "DELETE FROM " + getName() );
+	                else
+	                    getDB().executeSQL( "DELETE FROM object_values WHERE source_id=?", getID() );
+	            }
+		        
 		        if ( oCmds.hasName("metadata") && getSync().isContinueSync() )
 		        {
 		            String strMetadata = oCmds.getString("metadata");