rhodes 1.5.4 → 1.5.5

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

@@ -49,23 +49,24 @@ public class GeoLocation extends RhoThread{
 			try{
 				if ( location == null )
 				{
-					LOG.TRACE("GetLocation - locationUpdated: location is null.");
+					LOG.TRACE("locationUpdated: location is null.");
 					return;
 				}
 				
 				if( !location.isValid() )
 				{
-					LOG.TRACE("GetLocation - locationUpdated: location invalid.");
+					String strExtraInfo = location.getExtraInfo("text/plain");
+					LOG.TRACE("locationUpdated: location invalid.Extra info: " + (strExtraInfo!=null ? strExtraInfo :"") );
 					return;
 				}
 				
 				coord = location.getQualifiedCoordinates();
 				if(coord != null ) 
 				{
-					LOG.TRACE("GetLocation - latitude: " + Double.toString(m_parent.m_lat));
-					LOG.TRACE("GetLocation - longitude: " + Double.toString(m_parent.m_lon));
+					LOG.TRACE("locationUpdated - latitude: " + Double.toString(coord.getLatitude()));
+					LOG.TRACE("locationUpdated - longitude: " + Double.toString(coord.getLongitude()));
 				}else
-					LOG.TRACE("GetLocation - getQualifiedCoordinates: return null.");
+					LOG.TRACE("locationUpdated - getQualifiedCoordinates: return null.");
 				
 			}catch(Exception exc)
 			{
@@ -212,6 +213,8 @@ public class GeoLocation extends RhoThread{
 			{
 				if (bErrorNotify)
 					onLocationError();
+				else
+					checkKnownPosition();
 			}
 		}
 	}
@@ -295,6 +298,40 @@ public class GeoLocation extends RhoThread{
 		}
     }
     
+    void checkKnownPosition()
+    {
+		synchronized(sync)
+		{
+			if ( m_bDetermined )
+				return;
+
+			try{
+				Location location = LocationProvider.getLastKnownLocation();
+				if ( location != null && location.isValid() )
+				{
+					long locTime = location.getTimestamp();
+					long curTime = java.lang.System.currentTimeMillis();
+					long ageInMitutes = (curTime - locTime)/60000;  
+					LOG.TRACE("getLastKnownLocation return valid location. Age in minutes from now: " + ageInMitutes);
+					Coordinates coord = location.getQualifiedCoordinates();
+					if(coord != null ) 
+					{
+						LOG.TRACE("getLastKnownLocation - latitude: " + Double.toString(coord.getLatitude()));
+						LOG.TRACE("getLastKnownLocation - longitude: " + Double.toString(coord.getLongitude()));
+						
+						if ( ageInMitutes <= 10 )
+							updateLocation(coord.getLatitude(), coord.getLongitude());
+					}else
+						LOG.TRACE("getLastKnownLocation - getQualifiedCoordinates: return null.");
+				}
+			}catch(Exception exc)
+			{
+				LOG.ERROR("getLastKnownLocation failed.", exc);
+			}
+		}
+		
+    }
+    
 	private void updateLocation( double dLatitude, double dLongitude )
 	{
 		synchronized(sync)

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

@@ -10,7 +10,6 @@ import com.rho.RhoLogger;
 import com.rho.sync.SyncThread;
 import com.rho.RhoConf;
 
-import net.rim.device.api.system.*;
 import net.rim.device.api.util.*;
 import net.rim.device.api.io.http.*;
 
@@ -208,15 +207,15 @@ public class PushListeningThread extends Thread {
     }
     
     private void showPopup(String message) {
-    	RhodesApplication.getInstance().showPopup(message);
+    	com.rho.rubyext.Alert.showPopup(message);
 	}
     
     private void vibrate(String duration) {
-    	RhodesApplication.getInstance().vibrate(duration);
+    	com.rho.rubyext.Alert.vibrate(duration);
     }
 
     private void play_file(String file_name, String media_type) {
-    	RhodesApplication.getInstance().play_file(file_name, media_type);
+    	com.rho.rubyext.Alert.play_file(file_name, media_type);
     }
    
     private void processPushMessage(final byte[] data, int nLen)

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

@@ -295,17 +295,29 @@ final public class RhodesApplication extends UiApplication implements RenderingA
 		return false;
     }
    
-    void back(){
+    void back()
+    {
     	String url = m_strAppBackUrl;
     	if ( url.length() == 0)
     	{
 	    	if ( _history.size() <= 1 )
+	    	{
+	    		if ( RhoConf.getInstance().getBool("bb_disable_closebyback"))
+	    			return;
+
+	    		this._mainScreen.close();
 	    		return;
-	
+	    	}
+	    	
 	    	int nPos = _history.size()-2;
 	    	url = (String)_history.elementAt(nPos);
 	    	_history.removeElementAt(nPos+1);
-    	}else
+    	}else if ( url.equalsIgnoreCase("close"))
+    	{
+    		this._mainScreen.close();
+    		return;
+    	}
+    	else
     		addToHistory(url,null);
     	
     	saveCurrentLocation(url);
@@ -410,99 +422,6 @@ final public class RhodesApplication extends UiApplication implements RenderingA
         
         return false;
     }
-
-    public void showPopup(final String message) {
-    	Application.getApplication().invokeLater(new Runnable() {
-            public void run() {    	
-            	String[] choices = { "Ok" };
-            	requestForeground();
-            	Dialog.ask(message,choices,0);
-            }
-    	});
-    }
-    
-    public void vibrate(final String duration) {
-    	Application.getApplication().invokeLater(new Runnable() {
-            public void run() {    	
-		    	int dt = 2500;
-		    	try {
-		    		dt = Integer.parseInt(duration);
-		    	} catch (NumberFormatException e) {    		
-		    	}
-		    	
-		    	if (dt > 25500) dt = 25500;
-		    	
-		    	if (dt > 0) {
-		    		Alert.startVibrate(dt);
-		    	}
-            }
-    	});
-    }
-
-    private static final String[][] filetypes = { {"mp3", "audio/mpeg"}, {"wav","audio/x-wav"} };
-    private String getTypeFromExt(String file_name) {
-    	int pt = file_name.lastIndexOf('.');
-    	if (pt<0) {
-    		return filetypes[0][1];
-    	}
-    	String ext = file_name.substring(pt+1);
-    	for (int cnt = filetypes.length - 1; cnt >= 0; --cnt) {
-    		if(filetypes[cnt][0].equals(ext)) {
-    			return filetypes[cnt][1];
-    		}
-    	}
-    	return null;
-    }
-    
-    public void play_file(final String file_name, final String media_type) {
-    	Application.getApplication().invokeLater(new Runnable() {
-            public void run() {            	
-            	String type = media_type == null ? getTypeFromExt(file_name) : media_type;
-            	if (type != null) {
-            		LOG.INFO("File type: " + type);
-            	} else {
-            		LOG.ERROR("Error - can't play unknown file type");
-            		return;
-            	}
-            	
-            	String types[] = 
-            		javax.microedition.media.Manager.getSupportedContentTypes(null);
-            	for (int cnt = types.length - 1; cnt >= 0; --cnt) {
-            		if (type.equals(types[cnt])) {
-            			LOG.INFO( "Playing file " + file_name + " of type: " + types[cnt]);
-            			
-            			SimpleFile file = null;
-            			try {
-            				//retrieve the file
-            				Class clazz = Class.forName("rhomobile.RhodesApplication");
-            				file = RhoClassFactory.createFile();
-            				String strClassName = file_name;
-            				if ( !strClassName.startsWith("/apps") )
-            					strClassName = "/apps" + file_name;
-            				
-            				InputStream is = file.getResourceAsStream(clazz.getClass(), strClassName);
-            				//create an instance of the player from the InputStream
-            				Player player = javax.microedition.media.Manager.createPlayer(is,type);
-            				player.realize();
-            				player.prefetch();
-            				//start the player
-            				player.start();
-            	        } catch (Exception ex) { 
-            	        	LOG.ERROR("Error playing " + file_name + " :" + ex.getMessage());
-                        } finally {
-                			try{
-                				if ( file != null )
-                					file.close();
-                			}catch(Exception exc){}         	
-                        }
-            			return;
-            		}
-            	}
-            	
-            	LOG.ERROR("Error - media type " + type + " isn't supported.");
-            }
-    	});
-    }
     
 	private static final String REFERER = "referer";
 
@@ -974,15 +893,17 @@ final public class RhodesApplication extends UiApplication implements RenderingA
     	    } else {
     	    	if ( label.equalsIgnoreCase("back") )
     	    		m_strAppBackUrl = value;
-    	    	
-				MenuItem itemToAdd = new MenuItem(label, 200000, 10) {
-					public void run() {
-				    	String val = getPathForMenuItem(value);
-						addToHistory(val, null );
-						navigateUrl(val);
-					}
-				};
-				menuItems.addElement(itemToAdd);
+    	    	else
+    	    	{
+					MenuItem itemToAdd = new MenuItem(label, 200000, 10) {
+						public void run() {
+					    	String val = getPathForMenuItem(value);
+							addToHistory(val, null );
+							navigateUrl(val);
+						}
+					};
+					menuItems.addElement(itemToAdd);
+    	    	}
     	    }
 		}
 
@@ -1063,7 +984,7 @@ final public class RhodesApplication extends UiApplication implements RenderingA
 		    	if (splash.isFlag(SplashScreen.VCENTER) )
 		    		nFlags |= Field.FIELD_VCENTER;
 
-		    	int scaleX = 1, scaleY = 1;
+		    	int scaleX = 65536, scaleY = 65536;
 				int currentWidthFixed32 = Fixed32.toFP(img.getWidth());
 				int currentHeightFixed32 = Fixed32.toFP(img.getHeight());
 				int screenWidthFixed32 = Fixed32.toFP(Display.getWidth());
@@ -1071,11 +992,16 @@ final public class RhodesApplication extends UiApplication implements RenderingA
 				
 		    	if (splash.isFlag(SplashScreen.VZOOM) )
 		    		scaleY = Fixed32.div(currentHeightFixed32, screenHeightFixed32);
+		    	else
+		    		scaleY = Fixed32.div(currentHeightFixed32, currentHeightFixed32);
+		    	
 		    	if (splash.isFlag(SplashScreen.HZOOM) )
 		    		scaleX = Fixed32.div(currentWidthFixed32, screenWidthFixed32);
+		    	else
+		    		scaleX = Fixed32.div(currentWidthFixed32, currentWidthFixed32);
 		    	
 		    	EncodedImage img2 = img;
-		    	if ( scaleX != 1 || scaleY != 1)
+		    	if ( scaleX != 65536 || scaleY != 65536)
 		    		img2 = img.scaleImage32(scaleX, scaleY);
 		    	Bitmap bitmap = img2.getBitmap();
 		    	

data/platform/iphone/Classes/RhoRunnerAppDelegate.m

@@ -453,6 +453,8 @@
 	appStarted = false;
     splashDisplayed = false;
     
+    [NSThread setThreadPriority:1.0];
+    
     //Create local server and start it
     //serverHost = [[ServerHost alloc] init];
 	serverHost = [ServerHost sharedInstance];

data/platform/iphone/Info.plist

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

data/platform/iphone/rbuild/iphone.rake

@@ -132,6 +132,7 @@ namespace "build" do
 
       ENV["ARCHS"] ||= simulator ? "i386" : "armv6"
 
+      ENV['RHO_ROOT'] = $startdir
 
       $app_config["extensions"].each do |ext|
         rhoextpath = "lib/extensions/" + ext + "/ext"
@@ -147,7 +148,6 @@ namespace "build" do
           extpath = rhoextpath
         end
 
-
         puts Jake.run('./build', [], extpath) if File.executable? File.join(extpath, 'build')
         exit 1 unless $? == 0
         

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

@@ -170,8 +170,12 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = rhoextlib_Prefix.pch;
+				GCC_VERSION = 4.2;
 				INSTALL_PATH = /usr/local/lib;
+				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = rhoextlib;
+				SDKROOT = iphonesimulator3.0;
+				VALID_ARCHS = armv6;
 			};
 			name = Release;
 		};

data/platform/shared/common/RhoMutexLock.h

@@ -86,7 +86,14 @@ private:
 static int __g_mutex_init_##name = 0;\
 pthread_mutex_t __g_mutex_##name = PTHREAD_MUTEX_INITIALIZER;
 
-#define RHO_LOCK(name) {if(!__g_mutex_init_##name){pthread_mutex_init(&__g_mutex_##name, NULL);__g_mutex_init_##name=1;} pthread_mutex_lock(&__g_mutex_##name);}
+#define RHO_LOCK(name) {if(!__g_mutex_init_##name){\
+  pthread_mutexattr_t attr;\
+  pthread_mutexattr_init(&attr);\
+  pthread_mutexattr_settype(&attr,PTHREAD_MUTEX_RECURSIVE);\
+  pthread_mutex_init(&__g_mutex_##name, &attr);\
+  pthread_mutexattr_destroy(&attr);\
+  __g_mutex_init_##name=1;\
+} pthread_mutex_lock(&__g_mutex_##name);}
 #define RHO_UNLOCK(name) pthread_mutex_unlock(&__g_mutex_##name);
 
 #else

data/platform/shared/common/RhodesApp.cpp

@@ -614,7 +614,7 @@ String CRhodesApp::addCallbackObject(ICallbackObject* pCallbackObject, String st
 
 unsigned long CRhodesApp::getCallbackObject(int nIndex)
 {
-    if ( nIndex < 0 || nIndex > m_arCallbackObjects.size() )
+    if ( nIndex < 0 || nIndex > (int)m_arCallbackObjects.size() )
         return rho_ruby_get_NIL();
 
     ICallbackObject* pCallbackObject = m_arCallbackObjects.elementAt(nIndex);

data/platform/shared/db/DBAdapter.cpp

@@ -5,6 +5,7 @@
 #include "common/RhoFilePath.h"
 #include "common/RhoConf.h"
 #include "common/RhodesApp.h"
+#include "ruby/ext/rho/rhoruby.h"
 
 namespace rho{
 namespace db{
@@ -498,9 +499,9 @@ void CDBAdapter::close()
 DBResultPtr CDBAdapter::prepareStatement( const char* szSt )
 {
     if ( m_dbHandle == null )
-        return new CDBResult(m_mxDB);
+        return new CDBResult();
 
-	DBResultPtr res = new CDBResult(0,m_bInsideTransaction ? m_mxTransDB : m_mxDB);
+	DBResultPtr res = new CDBResult(0,this);
     sqlite3_stmt* st = m_mapStatements.get(szSt);
     if ( st != null )
 	{
@@ -547,13 +548,32 @@ DBResultPtr CDBAdapter::executeStatement(DBResultPtr& res)
     return res;
 }
 
+void CDBAdapter::Lock()
+{ 
+    if ( m_mxRuby.isMainRubyThread() )
+        m_bUIWaitDB = true;
+
+    m_mxRuby.Lock();
+    m_mxDB.Lock(); 
+
+    if ( m_mxRuby.isMainRubyThread() )
+        m_bUIWaitDB = false;
+}
+
+void CDBAdapter::Unlock()
+{ 
+    m_mxDB.Unlock();
+    m_mxRuby.Unlock();
+}
+
 void CDBAdapter::startTransaction()
 {
     Lock();
-	m_bInsideTransaction=true;
+	m_nTransactionCounter++;
+
     char *zErr = 0;
     int rc = 0;
-	if ( m_dbHandle )
+	if ( m_dbHandle && m_nTransactionCounter == 1)
     {
 		rc = sqlite3_exec(m_dbHandle, "BEGIN IMMEDIATE;",0,0,&zErr);
         checkDbError(rc);
@@ -565,14 +585,14 @@ void CDBAdapter::endTransaction()
     char *zErr = 0;
     int rc = 0;
 
-	if (m_dbHandle)
+	m_nTransactionCounter--;
+	if (m_dbHandle && m_nTransactionCounter == 0)
     {
         getAttrMgr().save(*this);
 		rc = sqlite3_exec(m_dbHandle, "END;",0,0,&zErr);
         checkDbError(rc);
     }
 
-	m_bInsideTransaction=false;
     Unlock();
 }
 
@@ -580,15 +600,64 @@ void CDBAdapter::rollback()
 {
     char *zErr = 0;
     int rc = 0;
-	if (m_dbHandle)
+
+	m_nTransactionCounter--;
+	if (m_dbHandle && m_nTransactionCounter == 0)
     {
 		rc = sqlite3_exec(m_dbHandle, "ROLLBACK;",0,0,&zErr);
         checkDbError(rc);
     }
 
-	m_bInsideTransaction=false;
     Unlock();
 }
 
 }
 }
+
+namespace rho{
+namespace common{
+
+CRubyMutex::CRubyMutex() : m_nLockCount(0), m_valThread(0), m_valMutex(null)
+{
+}
+
+CRubyMutex::~CRubyMutex()
+{
+    rho_ruby_destroy_mutex(m_valMutex);
+}
+
+boolean CRubyMutex::isMainRubyThread()
+{
+    return rho_ruby_main_thread() == rho_ruby_current_thread();
+}
+
+void CRubyMutex::Lock()
+{
+    unsigned long curThread = rho_ruby_current_thread();
+    if ( curThread == null )
+        return;
+
+    if ( m_valThread != curThread )
+    {
+        if ( m_valMutex == null )
+            m_valMutex = rho_ruby_create_mutex();
+
+        rho_ruby_lock_mutex(m_valMutex);
+        m_valThread = curThread;
+        m_nLockCount = 1;
+    }else
+        m_nLockCount += 1;
+}
+
+void CRubyMutex::Unlock()
+{
+    m_nLockCount--;
+    if ( m_nLockCount == 0 )
+    {
+        m_valThread = null;
+        rho_ruby_unlock_mutex(m_valMutex);
+    }
+}
+
+}
+}