rhodes 3.3.3.beta.4 → 3.3.3

data/platform/android/build/androidcommon.rb

@@ -240,7 +240,8 @@ def cc_run(command, args, chdir = nil)
   FileUtils.cd chdir unless chdir.nil?
   argv = [command]
   argv += args
-  cmdstr = argv.map! { |x| x.to_s }.map! { |x| x =~ / / ? '"' + x + '"' : x }.join(' ')
+  #cmdstr = argv.map! { |x| x.to_s }.map! { |x| x =~ / / ? '"' + x + '"' : x }.join(' ')
+  cmdstr = argv.map! { |x| x.to_s }.map! { |x| x =~ / / ? '' + x + '' : x }.join(' ')
   puts cmdstr
   $stdout.flush
   argv = cmdstr if RUBY_VERSION =~ /^1\.[89]/
@@ -271,9 +272,9 @@ def cc_compile(filename, objdir, additional = nil)
   args << "-Wno-unused"
   args += additional if additional.is_a? Array and not additional.empty?
   args << "-c"
-  args << filename
+  args << '"' + filename+ '"'
   args << "-o"
-  args << objname
+  args << '"' + objname + '"'
   cmdline = ccbin + ' ' + args.join(' ')
   cc_run(ccbin, args)
 end
@@ -346,7 +347,7 @@ def cc_link(outname, objects, additional = nil, deps = nil)
   args << "--sysroot"
   args << $ndksysroot
   args << "-o"
-  args << outname
+  args << ('"'+outname+'"')
   args += objects
   args += additional if additional.is_a? Array and not additional.empty?
   unless USE_OWN_STLPORT
@@ -378,17 +379,30 @@ end
 def java_compile(outpath, classpath, srclists)
     javac = $config["env"]["paths"]["java"] + "/javac" + $exe_ext
 
-    fullsrclist = Tempfile.new 'RhodesSRC_build'
-    srclists.each do |srclist|
-      lines = []
-      File.open(srclist, "r") do |f|
-        while line = f.gets
-          line.chomp!
-          fullsrclist.write "#{line}\n"
+    #puts '@@@@@@@@@@@@@@   BEGIN'
+    if srclists.count == 1
+      fullsrclist = srclists.first
+      #  File.open(fullsrclist, "r") do |f|
+      #    while line = f.gets
+      #      puts line
+      #    end
+      #  end
+    else
+      fullsrclist = Tempfile.new 'RhodesSRC_build'
+      srclists.each do |srclist|
+        lines = []
+        File.open(srclist, "r") do |f|
+          while line = f.gets
+            line.chomp!
+            #puts line
+            fullsrclist.write "#{line}\n"
+          end
         end
       end
+      fullsrclist.close
+      fullsrclist = fullsrclist.path
     end
-    fullsrclist.close
+    #puts '@@@@@@@@@@@@@@   END'
 
     args = []
     args << "-g"
@@ -403,7 +417,7 @@ def java_compile(outpath, classpath, srclists)
     args << "latin1"
     args << "-classpath"
     args << classpath
-    args << "@#{fullsrclist.path}"
+    args << "@#{fullsrclist}"
     puts Jake.run(javac, args)
     unless $?.success?
         puts "Error compiling java code"

data/platform/bb/RubyVM/src/com/rho/file/SimpleFile.java

@@ -33,7 +33,7 @@ import java.io.OutputStream;
 /**
  * Interface of simple file. Simple file can be automaticaslly opened by database given file path and access mode.
  */
-public interface SimpleFile extends IFile { 
+public interface SimpleFile {// extends IFile { 
     /**
      * Open the file
      * @param path path to the file
@@ -73,4 +73,30 @@ public interface SimpleFile extends IFile {
     public abstract void renameOverwrite(String oldName, String newName);
     
     public abstract void copyJarFileToMemory(String strFileName, InputStream jarStream)throws IOException;
+    
+    void write(long pos, byte[] buf)throws IOException;
+
+    /**
+     * Read data from the file
+     * @param pos offset in the file
+     * @param buf array to receive readen data (size is always equal to database page size)
+     * @return number of bytes actually readen
+     */
+    int read(long pos, byte[] buf)throws IOException;
+
+    /**
+     * Flush all fiels changes to the disk
+     */
+    void sync()throws IOException;
+
+    /**
+     * Close file
+     */
+    void close()throws IOException;
+
+    /**
+     * Length of the file
+     */
+    //long length();
+    
 }

data/platform/bb/RubyVM/src/j2me/io/File.java

@@ -36,7 +36,7 @@ public class File {
 	
     private String _path;
     private transient int prefixLength = 0;
-    private IRAFile m_raFile;
+    //private IRAFile m_raFile;
     private String m_strFullPath;
     
     public File(String path) 
@@ -50,8 +50,6 @@ public class File {
             if ( m_strFullPath != null && m_strFullPath.length() > 0 && !m_strFullPath.startsWith("file:")) 
             	m_strFullPath = FilePath.join(RhoClassFactory.createFile().getDirPath(""), m_strFullPath);
         	
-        	m_raFile = RhoClassFactory.createFSRAFile();
-            m_raFile.open(m_strFullPath);
         }catch(Exception exc)
         {
         }
@@ -67,8 +65,6 @@ public class File {
             if ( m_strFullPath != null && m_strFullPath.length() > 0 && !m_strFullPath.startsWith("file:")) 
             	m_strFullPath = FilePath.join(RhoClassFactory.createFile().getDirPath(""), m_strFullPath);
         	
-        	m_raFile = RhoClassFactory.createFSRAFile();
-            m_raFile.open(m_strFullPath, mode);
         }catch(Exception exc)
         {
         }
@@ -108,12 +104,40 @@ public class File {
     
     public boolean exists() 
     {
-    	return m_raFile != null && m_raFile.exists();
+    	IRAFile raFile = null;
+    	try
+    	{
+        	raFile = RhoClassFactory.createFSRAFile();
+    		raFile.open(m_strFullPath, "r");
+    	
+    		return raFile.exists();
+    	}catch(Exception exc)
+    	{
+    		return false;
+    	}finally
+    	{
+    		if (raFile!= null)
+    			try{ raFile.close(); } catch(Exception exc){}
+    	}
     }
 
     public boolean isDirectory() 
     {
-    	return m_raFile != null && m_raFile.isDirectory();    	
+    	IRAFile raFile = null;
+    	try
+    	{
+        	raFile = RhoClassFactory.createFSRAFile();
+    		raFile.open(m_strFullPath, "r");
+    	
+    		return raFile.isDirectory();
+    	}catch(Exception exc)
+    	{
+    		return false;
+    	}finally
+    	{
+    		if (raFile!= null)
+    			try{ raFile.close(); } catch(Exception exc){}
+    	}
     }
 
     public File[] listFiles() {
@@ -123,23 +147,31 @@ public class File {
     
     public Vector list() 
     {
-    	if ( m_raFile == null )
-    		return new Vector();
-
     	Vector res = new Vector();
+
+    	IRAFile raFile = null;
+    	try
+    	{
+        	raFile = RhoClassFactory.createFSRAFile();
+    		raFile.open(m_strFullPath, "r");
     	
-    	try{
-	    	Enumeration eFiles = m_raFile.list();
+	    	Enumeration eFiles = raFile.list();
 	    	while( eFiles != null && eFiles.hasMoreElements() )
 	    	{
 	    		res.addElement(eFiles.nextElement());
 	    	}
-    	}catch(IOException exc)
+	    	
+	    	return res;
+    	}catch(Exception exc)
     	{
-    		
+    		return res;
+    	}finally
+    	{
+    		if (raFile!= null)
+    			try{ raFile.close(); } catch(Exception exc){}
     	}
-    	return res;
     }
+    
     public String getAbsolutePath() 
     {
     	return m_strFullPath;
@@ -147,35 +179,61 @@ public class File {
     
     public boolean mkdir() 
     {
-    	if ( m_raFile != null )
-    		return m_raFile.mkdir();
+    	IRAFile raFile = null;
+    	try
+    	{
+        	raFile = RhoClassFactory.createFSRAFile();
+    		raFile.open(m_strFullPath, "dw");
     	
-    	return false;
+    		return raFile.mkdir();
+    	}catch(Exception exc)
+    	{
+    		return false;
+    	}finally
+    	{
+    		if (raFile!= null)
+    			try{ raFile.close(); } catch(Exception exc){}
+    	}
     }
     
     public boolean delete() 
     {
+    	IRAFile raFile = null;
     	try
     	{
-	    	if ( m_raFile != null )
-	    	{
-	    		m_raFile.close();
-	    		m_raFile.open(m_strFullPath, "w");
-	    		m_raFile.delete();
-	    		m_raFile.close();
-	    		m_raFile = null;
-	    		return true;
-	    	}
-    	}catch(IOException exc)
-    	{
+        	raFile = RhoClassFactory.createFSRAFile();
+
+    		raFile.open(m_strFullPath, "w");
+    		raFile.delete();
     		
+    		return true;
+    	}catch(Exception exc)
+    	{
+    		return false;
+    	}finally
+    	{
+    		if (raFile!= null)
+    			try{ raFile.close(); } catch(Exception exc){}
     	}
-    	
-    	return false;
     }
     
-    public boolean isFile() {
-    	return m_raFile != null && m_raFile.isFile();    	
+    public boolean isFile() 
+    {
+    	IRAFile raFile = null;
+    	try
+    	{
+        	raFile = RhoClassFactory.createFSRAFile();
+    		raFile.open(m_strFullPath, "r");
+    	
+    		return raFile.isFile();
+    	}catch(Exception exc)
+    	{
+    		return false;
+    	}finally
+    	{
+    		if (raFile!= null)
+    			try{ raFile.close(); } catch(Exception exc){}
+    	}
     }
     
     public boolean canWrite() {
@@ -195,13 +253,21 @@ public class File {
     }
     public long length() 
     {
-    	try{
-	    	if ( m_raFile != null )
-	    		return m_raFile.size();
-    	}catch(IOException exc)
+    	IRAFile raFile = null;
+    	try
+    	{
+        	raFile = RhoClassFactory.createFSRAFile();
+    		raFile.open(m_strFullPath, "r");
+    	
+    		return raFile.size();
+    	}catch(Exception exc)
+    	{
+    		return 0;
+    	}finally
     	{
+    		if (raFile!= null)
+    			try{ raFile.close(); } catch(Exception exc){}
     	}
-    	return 0;
     }
     
     public boolean renameTo(File dest) {

data/platform/bb/build/bb.rake

@@ -1077,6 +1077,7 @@ namespace "run" do
         stopmds
     end  
 
+    desc "Run application on RhoSimulator"    
     task :rhosimulator => ["config:set_bb_platform", "config:common", "config:read_bb_version"] do
     
         if $bb6

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

@@ -387,7 +387,11 @@ public class System {
     		return ObjectFactory.createBoolean(com.rho.Capabilities.USE_SQLITE);
     	if ( strPropName.equalsIgnoreCase("webview_framework") ) {
     		Version.SoftVersion ver = Version.getSoftVersion();
-    		return ObjectFactory.createString((ver.nMajor < 6 ? "BB" : "WEBKIT")+"/"+DeviceInfo.getSoftwareVersion() ); 
+    		
+    		if ( rhomobile.RhodesApplication.isFullBrowser() )
+    			return ObjectFactory.createString( "WEBKIT"+"/"+DeviceInfo.getSoftwareVersion() );
+    		
+    		return ObjectFactory.createString( "BB" +"/"+DeviceInfo.getSoftwareVersion() ); 
     	}
         if (strPropName.equalsIgnoreCase("security_token_not_passed"))
         	return ObjectFactory.createBoolean(RHODESAPP().isSecurityTokenNotPassed());

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

@@ -124,9 +124,9 @@ public class PushListeningThread extends Thread {
                 {
                     
                     // NOTE: the following will block until data is received.
-                	LOG.TRACE("Block push thread until data is recieved");
+                	LOG.INFO("Block push thread until data is recieved");
                     stream = _notify.acceptAndOpen();
-                	LOG.TRACE("Recieved push data");
+                	LOG.INFO("Recieved push data");
                     
                     try 
                     {

data/platform/iphone/Classes/AppManager/AppManager.m

@@ -673,6 +673,7 @@ static const double RHO_IPHONE_PPI = 163.0;
 static const double RHO_IPHONE4_PPI = 326.0;
 // http://www.apple.com/ipad/specs/
 static const double RHO_IPAD_PPI = 132.0;
+static const double RHO_NEW_IPAD_PPI = 264.0;
 
 static float get_scale() {
     float scales = 1;//[[UIScreen mainScreen] scale];
@@ -737,7 +738,12 @@ int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
              strcasecmp("ppi_y", szPropName) == 0) {
 #ifdef __IPHONE_3_2
         if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
-            *resValue = rho_ruby_create_double(RHO_IPAD_PPI);
+            if (get_scale() > 1.2) {
+                *resValue = rho_ruby_create_double(RHO_NEW_IPAD_PPI);
+            }
+            else {
+                *resValue = rho_ruby_create_double(RHO_IPAD_PPI);
+            }
             return 1;
         }
 #endif

data/platform/iphone/Classes/Camera/PickImageDelegate.h

@@ -34,13 +34,18 @@
 
 #define CAMERA_SETTINGS_TYPE_MAIN 1
 #define CAMERA_SETTINGS_TYPE_FRONT 2
+#define CAMERA_SETTINGS_TYPE_CHOOSE_IMAGE 3
 
+#define CAMERA_SETTINGS_FORMAT_NOT_SETTED 0
 #define CAMERA_SETTINGS_FORMAT_JPG 1
 #define CAMERA_SETTINGS_FORMAT_PNG 2
 
 #define CAMERA_SETTINGS_COLOR_MODEL_RGB 1
 #define CAMERA_SETTINGS_COLOR_MODEL_GRAY 2
 
+#define CAMERA_SETTINGS_EDITING_NOT_SETTED 0
+#define CAMERA_SETTINGS_EDITING_ENABLE 1
+#define CAMERA_SETTINGS_EDITING_DISABLE 2
 
 
 @interface RhoCameraSettings : NSObject {
@@ -52,6 +57,8 @@
     int width;
     int height;
     int enable_editing;
+    int enable_editing_setted;
+    bool save_to_shared_gallery;
 }
 
 @property (retain) NSString* callback_url;
@@ -61,6 +68,8 @@
 @property (assign) int width;
 @property (assign) int height;
 @property (assign) int enable_editing;
+@property (assign) int enable_editing_setted;
+@property (assign) bool save_to_shared_gallery;
 
 - (id)init:(void*)data url:(NSString*)url;