rhodes 1.5.4 → 1.5.5

data/platform/shared/rubyJVM/src/com/rho/net/NetRequest.java

@@ -136,6 +136,7 @@ public class NetRequest
 		try{
 			closeConnection();
 			m_connection = RhoClassFactory.getNetworkAccess().connect(strUrl, m_bIgnoreSuffixOnSim);
+			LOG.INFO("connection done");
 			
 			if ( oSession != null )
 			{
@@ -146,10 +147,11 @@ public class NetRequest
 			}
 			
 			m_connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
-			m_connection.setRequestProperty("Connection", "keep-alive");
+			//m_connection.setRequestProperty("Connection", "keep-alive");
 			//m_connection.setRequestProperty("Accept", "application/x-www-form-urlencoded,application/json,text/html");
 			
 			writeHeaders(headers);
+			LOG.INFO("writeHeaders done");
 			if ( strBody != null && strBody.length() > 0 )
 			{
 				m_connection.setRequestMethod(strMethod);
@@ -158,7 +160,10 @@ public class NetRequest
 			}else
 				m_connection.setRequestMethod(strMethod);
 			
+			LOG.INFO("write body done");
+			
 			is = m_connection.openInputStream();
+			LOG.INFO("openInputStream done");
 			code = m_connection.getResponseCode();
 			
 			LOG.INFO("getResponseCode : " + code);

data/platform/shared/rubyJVM/src/com/rho/sync/SyncSource.java

@@ -677,9 +677,9 @@ class SyncSource
 	        m_nAttribCounter = 0;
 	        for( ; !oJsonObjList.isEnd() && getSync().isContinueSync(); oJsonObjList.next() )
 	        {
-		        if ( getDB().isUnlockDB() )//|| m_nAttribCounter >= 200 )
+		        if ( getDB().isUIWaitDB() )//|| m_nAttribCounter >= 200 )
 		        {
-		        	if ( getDB().isUnlockDB() )
+		        	if ( getDB().isUIWaitDB() )
 		        		LOG.INFO( "Commit transaction because of UI request." );
 		        	
 		            getDB().endTransaction();

data/platform/shared/rubyJVM/src/com/rho/sync/SyncThread.java

@@ -517,7 +517,7 @@ public class SyncThread extends RhoThread
 				protected RubyValue run(RubyValue receiver, RubyBlock block) {
 					try{
 					    DBAdapter db = getDBAdapter();
-					    db.setUnlockDB(true);
+					    db.setUIWaitDB(true);
 					    db.Lock();
 					}catch(Exception e)
 					{
@@ -575,7 +575,7 @@ public class SyncThread extends RhoThread
 					DBAdapter db = getDBAdapter();
 
 					try{
-						db.setUnlockDB(true);
+						db.setUIWaitDB(true);
 					    return getSyncEngine().isLoggedIn() ? 
 					    		ObjectFactory.createInteger(1) : ObjectFactory.createInteger(0);
 					}catch(Exception e)
@@ -584,7 +584,7 @@ public class SyncThread extends RhoThread
 						throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
 					}finally
 					{
-						db.setUnlockDB(false);
+						db.setUIWaitDB(false);
 					}
 				    
 				}
@@ -598,7 +598,7 @@ public class SyncThread extends RhoThread
 					try{
 						stopSync();
 						
-						db.setUnlockDB(true);
+						db.setUIWaitDB(true);
 					    getSyncEngine().logout();
 					}catch(Exception e)
 					{
@@ -606,7 +606,7 @@ public class SyncThread extends RhoThread
 						throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
 					}finally
 					{
-						db.setUnlockDB(false);
+						db.setUIWaitDB(false);
 					}
 					
 				    return RubyConstant.QNIL;

data/platform/shared/sync/SyncSource.cpp

@@ -569,7 +569,7 @@ void CSyncSource::processServerData_Ver1(CJSONArrayIterator& oJsonArr)
         CJSONArrayIterator oJsonObjList(oJsonSource, "ol");
         for( ; !oJsonObjList.isEnd() && getSync().isContinueSync(); oJsonObjList.next() )
         {
-            if ( getDB().isUnlockDB() )
+            if ( getDB().isUIWaitDB() )
             {
 		        LOG(INFO) + "Commit transaction because of UI request.";
                 getDB().endTransaction();

data/platform/shared/sync/SyncThread.cpp

@@ -295,21 +295,14 @@ void rho_sync_login(const char *name, const char *password, const char* callback
 
 int rho_sync_logged_in()
 {
-	rho::db::CDBAdapter& db = CSyncThread::getDBAdapter();
-	db.setUnlockDB(true);
     int nRes = CSyncThread::getSyncEngine().isLoggedIn() ? 1 : 0;
-    db.setUnlockDB(false);
 	return nRes;
 }
 
 void rho_sync_logout()
 {
     rho_sync_stop();
-
-	rho::db::CDBAdapter& db = CSyncThread::getDBAdapter();
-	db.setUnlockDB(true);
     CSyncThread::getSyncEngine().logout();
-    db.setUnlockDB(false);
 }
 
 void rho_sync_set_notification(int source_id, const char *url, char* params)
@@ -349,13 +342,18 @@ int rho_sync_closeDB()
 int rho_db_startUITransaction()
 {
     rho::db::CDBAdapter& db = rho::sync::CSyncThread::getDBAdapter();
-    db.setUnlockDB(true);
     db.startTransaction();
 
     //TODO: get error code from DBException
     return 0;
 }
 
+int rho_db_is_ui_waitfordb()
+{
+    rho::db::CDBAdapter& db = rho::sync::CSyncThread::getDBAdapter();
+    return db.isUIWaitDB() ? 1 :0;
+}
+
 int rho_db_commitUITransaction()
 {
     CSyncThread::getDBAdapter().endTransaction();
@@ -389,7 +387,6 @@ unsigned long rho_sync_get_attrs(int nSrcID)
 void rho_sync_lock()
 {
     rho::db::CDBAdapter& db = rho::sync::CSyncThread::getDBAdapter();
-    db.setUnlockDB(true);
     db.Lock();
 }
 

data/platform/wm/rhodes/Rhodes.cpp

@@ -34,6 +34,7 @@ HREGNOTIFY g_hNotify = NULL;
 #endif
 
 //BOOL EnumRhodesWindowsProc(HWND hwnd,LPARAM lParam);
+extern "C" void rho_clientregister_create(const char* szDevicePin);
 
 class CRhodesModule : public CAtlExeModuleT< CRhodesModule >
 {
@@ -108,6 +109,7 @@ public :
 		rho_logconf_Init(m_strRootPath.c_str());
 		LOG(INFO) + "Rhodes started";
 
+        ::SetThreadPriority(GetCurrentThread(),10);
         // Create the main application window
         m_appWindow.Create(NULL, CWindow::rcDefault, TEXT("Rhodes"), WS_VISIBLE);
         if (NULL == m_appWindow.m_hWnd)
@@ -136,6 +138,8 @@ public :
 			0, 
 			NULL, 
 			&g_hNotify);
+#else
+//        rho_clientregister_create("win32_client");
 #endif
         return S_OK;
     }

data/rakefile.rb

@@ -127,7 +127,7 @@ def add_linker_library(libraryname)
         tmpdir = $startdir + "/platform/iphone/build/rhorunner.build/#{$configuration}-" +
           ( simulator ? "iphonesimulator" : "iphoneos") + "/rhorunner.build"
       end
-  $ldflags << "#{tmpdir}/#{libraryname}\n" unless $ldflags.nil?
+  $ldflags << "#{tmpdir}/lib#{libraryname}.a\n" unless $ldflags.nil?
 end
 
 def set_linker_flags

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 4
-  version: 1.5.4
+  - 5
+  version: 1.5.5
 platform: ruby
 authors: 
 - Rhomobile
@@ -139,6 +139,7 @@ files:
 - lib/extensions/digest/digest/hmac.rb
 - lib/extensions/digest/digest.rb
 - lib/extensions/digest/ext/build
+- lib/extensions/digest/ext/build.bat
 - lib/extensions/digest/ext/defs.h
 - lib/extensions/digest/ext/depend
 - lib/extensions/digest/ext/digest.c
@@ -263,6 +264,15 @@ files:
 - lib/extensions/rholang/rhoerror_ru.rb
 - lib/extensions/rholang/rhomsg_ru.rb
 - lib/extensions/set/set.rb
+- lib/extensions/uri/uri/common.rb
+- lib/extensions/uri/uri/ftp.rb
+- lib/extensions/uri/uri/generic.rb
+- lib/extensions/uri/uri/http.rb
+- lib/extensions/uri/uri/https.rb
+- lib/extensions/uri/uri/ldap.rb
+- lib/extensions/uri/uri/ldaps.rb
+- lib/extensions/uri/uri/mailto.rb
+- lib/extensions/uri/uri.rb
 - lib/framework/bsearch.rb
 - lib/framework/builtinME.rb
 - lib/framework/date/format.rb
@@ -616,11 +626,11 @@ files:
 - platform/bb/rhodes/src/com/rho/net/TCPSocket.java
 - platform/bb/rhodes/src/com/rho/RhoMainScreen.java
 - platform/bb/rhodes/src/com/rho/RhoRubyHelper.java
+- platform/bb/rhodes/src/com/rho/rubyext/Alert.java
 - platform/bb/rhodes/src/com/rho/rubyext/GeoLocation.java
 - platform/bb/rhodes/src/com/rho/rubyext/System.java
 - platform/bb/rhodes/src/com/rho/rubyext/XMLParser.java
 - platform/bb/rhodes/src/com/rho/Version.java
-- platform/bb/rhodes/src/rhomobile/Alert.java
 - platform/bb/rhodes/src/rhomobile/camera/Camera.java
 - platform/bb/rhodes/src/rhomobile/camera/CameraFilesListener.java
 - platform/bb/rhodes/src/rhomobile/camera/CameraScreen.java

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

@@ -1,65 +0,0 @@
-package rhomobile;
-
-import com.xruby.runtime.builtin.RubyArray;
-import com.xruby.runtime.lang.RubyBasic;
-import com.xruby.runtime.lang.RubyBlock;
-import com.xruby.runtime.lang.RubyClass;
-import com.xruby.runtime.lang.RubyConstant;
-import com.xruby.runtime.lang.RubyException;
-import com.xruby.runtime.lang.RubyOneArgMethod;
-import com.xruby.runtime.lang.RubyRuntime;
-import com.xruby.runtime.lang.RubyValue;
-import com.xruby.runtime.lang.RubyVarArgMethod;
-
-public class Alert extends RubyBasic {
-
-	public Alert(RubyClass arg0) {
-		super(arg0);
-	}
-
-	public static RubyValue show_popup(RubyValue arg0) {
-		String message = arg0.toString();
-		RhodesApplication.getInstance().showPopup(message);
-		return RubyConstant.QNIL;
-	}
-	
-	public static RubyValue vibrate(RubyArray args) {
-		String duration = "2500";
-		if ((args != null) && (args.size() > 0))
-			duration = args.get(0).toString();
-		RhodesApplication.getInstance().vibrate(duration);
-		return RubyConstant.QNIL;
-	}
-
-	public static RubyValue play_file(RubyArray args) {
-		if ((args != null) && (args.size() > 0)) {
-			String file_name = args.get(0).toString();
-			String media_type = null;
-			if ((args.size() > 1) && (args.get(1) != RubyConstant.QNIL))
-				media_type = args.get(1).toString();
-			RhodesApplication.getInstance().play_file(file_name,media_type);
-		} else {
-	        throw new RubyException(RubyRuntime.ArgumentErrorClass, "in WebView.play: wrong number of arguments");			
-		}
-		return RubyConstant.QNIL;
-	}
-	
-	public static void initMethods(RubyClass klass) {
-		klass.getSingletonClass().defineMethod("show_popup", new RubyOneArgMethod() {
-			protected RubyValue run(RubyValue receiver, RubyValue arg0, RubyBlock block) {
-				return Alert.show_popup(arg0);
-			}
-		});
-		klass.getSingletonClass().defineMethod("vibrate", new RubyVarArgMethod() {
-			protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block) {
-				return Alert.vibrate(args);
-			}
-		});
-		klass.getSingletonClass().defineMethod("play_file", new RubyVarArgMethod() {
-			protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block) {
-				return Alert.play_file(args);
-			}
-		});
-	}
-	
-}