rhodes 1.5.5 → 2.0.0.beta1

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

@@ -0,0 +1,331 @@
+package com.rho;
+
+import javax.microedition.io.HttpConnection;
+
+import com.rho.net.URI;
+
+import rhomobile.*;
+import rhomobile.RhodesApplication.PrimaryResourceFetchThread;
+
+import net.rim.device.api.browser.field.BrowserContent;
+import net.rim.device.api.browser.field.Event;
+import net.rim.device.api.browser.field.RedirectEvent;
+import net.rim.device.api.browser.field.RenderingApplication;
+import net.rim.device.api.browser.field.RenderingException;
+import net.rim.device.api.browser.field.RenderingOptions;
+import net.rim.device.api.browser.field.RenderingSession;
+import net.rim.device.api.browser.field.RequestedResource;
+import net.rim.device.api.browser.field.UrlRequestedEvent;
+import net.rim.device.api.io.http.HttpHeaders;
+import net.rim.device.api.system.Application;
+import net.rim.device.api.system.Display;
+import net.rim.device.api.ui.Field;
+import net.rim.device.api.ui.component.Status;
+
+public class BrowserAdapter implements RenderingApplication, IBrowserAdapter  
+{
+	private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
+		new RhoLogger("BrowserAdapter");
+    private RenderingSession _renderingSession;
+    private RhoMainScreen m_oMainScreen;
+    
+    private RhodesApplication m_app;
+	private HttpConnection m_connResource = null;
+    private boolean m_bLoadImageAsync = false;
+    
+	public BrowserAdapter(RhoMainScreen oMainScreen, RhodesApplication app, boolean bLoadImageAsync) 
+	{
+		m_oMainScreen = oMainScreen;
+		m_app = app;
+		m_bLoadImageAsync = bLoadImageAsync;
+		
+        _renderingSession = RenderingSession.getNewInstance();
+        
+        // enable javascript
+        _renderingSession.getRenderingOptions().setProperty(RenderingOptions.CORE_OPTIONS_GUID, RenderingOptions.JAVASCRIPT_ENABLED, true);
+        _renderingSession.getRenderingOptions().setProperty(RenderingOptions.CORE_OPTIONS_GUID, RenderingOptions.JAVASCRIPT_LOCATION_ENABLED, true);
+        _renderingSession.getRenderingOptions().setProperty(RenderingOptions.CORE_OPTIONS_GUID, RenderingOptions.ENABLE_CSS, true);
+        _renderingSession.getRenderingOptions().setProperty(RenderingOptions.CORE_OPTIONS_GUID, RenderingOptions.DEFAULT_CHARSET_VALUE, "utf-8");
+        _renderingSession.getRenderingOptions().setProperty(RenderingOptions.CORE_OPTIONS_GUID, RenderingOptions.OVERWRITE_CHARSET_MODE, true);
+        _renderingSession.getRenderingOptions().setProperty(RenderingOptions.CORE_OPTIONS_GUID, RenderingOptions.ALLOW_POPUPS, true);
+        _renderingSession.getRenderingOptions().setProperty(RenderingOptions.CORE_OPTIONS_GUID, RenderingOptions.USE_BACKGROUND_IMAGES, true);
+        
+//        _renderingSession.getRenderingOptions().setProperty(RenderingOptions.CORE_OPTIONS_GUID, RenderingOptions.VALUE_THRESHOLD, 100000);
+//        _renderingSession.getRenderingOptions().setProperty(RenderingOptions.CORE_OPTIONS_GUID, RenderingOptions.USE_BACKGROUND_IMAGES, true);
+//        _renderingSession.getRenderingOptions().setProperty(RenderingOptions.CORE_OPTIONS_GUID, RenderingOptions.SHOW_IMAGE_PLACEHOLDERS, false);
+//        _renderingSession.getRenderingOptions().setProperty(RenderingOptions.CORE_OPTIONS_GUID, RenderingOptions.ENABLE_WML, false);
+//        _renderingSession.getRenderingOptions().setProperty(RenderingOptions.CORE_OPTIONS_GUID, RenderingOptions.ENABLE_EMBEDDED_RICH_CONTENT, false);
+//        _renderingSession.getRenderingOptions().setProperty(RenderingOptions.CORE_OPTIONS_GUID, RenderingOptions.ENABLE_IMAGE_EDITING, false);
+//        _renderingSession.getRenderingOptions().setProperty(RenderingOptions.CORE_OPTIONS_GUID, RenderingOptions.NO_SEARCH_MENU_MODE, true);
+        
+	}
+
+	public void setFullBrowser()
+    {
+        //this is the undocumented option to tell the browser to use the 4.6 Rendering Engine
+        _renderingSession.getRenderingOptions().setProperty(RenderingOptions.CORE_OPTIONS_GUID, 17000, true);
+    }
+	
+    public Object eventOccurred(Event event) {
+
+        int eventId = event.getUID();
+
+        switch (eventId) {
+
+            case Event.EVENT_URL_REQUESTED : {
+
+                UrlRequestedEvent urlRequestedEvent = (UrlRequestedEvent) event;
+                String absoluteUrl = urlRequestedEvent.getURL();
+                //if ( !absoluteUrl.startsWith(_httpRoot) )
+                //	absoluteUrl = _httpRoot + absoluteUrl.substring(_httpRoot.length()-5);
+
+                if ( urlRequestedEvent.getPostData() == null ||
+                	 urlRequestedEvent.getPostData().length == 0 )
+                	m_app.addToHistory(absoluteUrl, null );
+
+                PrimaryResourceFetchThread thread = new PrimaryResourceFetchThread(absoluteUrl,
+                                                                                   urlRequestedEvent.getHeaders(),
+                                                                                   urlRequestedEvent.getPostData(),
+                                                                                   event);
+                thread.start();
+
+                break;
+
+            } case Event.EVENT_BROWSER_CONTENT_CHANGED: {
+
+                // browser field title might have changed update title
+                /*BrowserContentChangedEvent browserContentChangedEvent = (BrowserContentChangedEvent) event;
+
+                if (browserContentChangedEvent.getSource() instanceof BrowserContent) {
+                    BrowserContent browserField = (BrowserContent) browserContentChangedEvent.getSource();
+                    String newTitle = browserField.getTitle();
+                    if (newTitle != null) {
+                        synchronized (getAppEventLock())
+                    	//synchronized (Application.getEventLock())
+                        {
+                        	_mainScreen.setTitle(newTitle);
+                        }
+                    }
+                }*/
+
+                break;
+
+            } case Event.EVENT_REDIRECT : {
+
+                    RedirectEvent e = (RedirectEvent) event;
+                    String referrer = e.getSourceURL();
+                    String absoluteUrl = e.getLocation();
+
+                    switch (e.getType()) {
+
+                        case RedirectEvent.TYPE_SINGLE_FRAME_REDIRECT :
+                            // show redirect message
+                            Application.getApplication().invokeAndWait(new Runnable() {
+                                public void run() {
+                                    Status.show("You are being redirected to a different page...");
+                                }
+                            });
+
+                            break;
+
+                        case RedirectEvent.TYPE_JAVASCRIPT :
+                            break;
+                        case RedirectEvent.TYPE_META :
+                            // MSIE and Mozilla don't send a Referer for META Refresh.
+                            referrer = null;
+                            break;
+                        case RedirectEvent.TYPE_300_REDIRECT :
+                            // MSIE, Mozilla, and Opera all send the original
+                            // request's Referer as the Referer for the new
+                            // request.
+                            //if ( !absoluteUrl.startsWith(_httpRoot) )
+                            //	absoluteUrl = _httpRoot + absoluteUrl.substring(_httpRoot.length()-5);
+
+                        	m_app.addToHistory(absoluteUrl,referrer);
+                            Object eventSource = e.getSource();
+                            if (eventSource instanceof HttpConnection) {
+                                referrer = ((HttpConnection)eventSource).getRequestProperty("referer");
+                            }
+                            break;
+
+                    }
+
+                    HttpHeaders requestHeaders = new HttpHeaders();
+                    requestHeaders.setProperty("referer", referrer);
+                    PrimaryResourceFetchThread thread = new PrimaryResourceFetchThread(absoluteUrl, requestHeaders,null, event);
+                    thread.start();
+                    break;
+
+            } case Event.EVENT_CLOSE :
+                // TODO: close the application
+                break;
+
+            case Event.EVENT_SET_HEADER :
+            case Event.EVENT_SET_HTTP_COOKIE : {
+            	/*String cookie = ((SetHttpCookieEvent)event).getCookie();
+        		String response = processAjaxCall(cookie);
+        		if (response != null)
+        			synchronized (pendingResponses) {
+        				pendingResponses.addElement(response);
+        			}
+        		response = null;
+            	cookie = null;*/
+            	break;
+            }
+            case Event.EVENT_HISTORY :           // no history support
+            case Event.EVENT_EXECUTING_SCRIPT :  // no progress bar is supported
+            case Event.EVENT_FULL_WINDOW :       // no full window support
+            case Event.EVENT_STOP :              // no stop loading support
+            default :
+        }
+
+        return null;
+    }
+
+    public void processConnection(HttpConnection connection, Object e) 
+    {
+        BrowserContent browserContent = null;
+
+        try {
+            browserContent = _renderingSession.getBrowserContent(connection, this, (Event)e);
+
+            if (browserContent != null) {
+       			browserContent.finishLoading();
+                
+                Field field = browserContent.getDisplayableContent();
+                if (field != null) {
+                	
+                    synchronized (Application.getEventLock()) 
+                    {
+                    	Field old = m_oMainScreen.getField(0);
+                    	m_oMainScreen.add(field);
+                    	m_oMainScreen.delete(old);
+/*                        
+                        _mainScreen.doPaint();
+                        if ( e == null )
+                        {//This should awake screen in case of long network response
+	                        KeyCodeEvent inject1 = 	new KeyCodeEvent( KeyCodeEvent.KEY_DOWN, (char)Keypad.KEY_ESCAPE, 0);
+	                        KeyCodeEvent inject2 =  new KeyCodeEvent( KeyCodeEvent.KEY_UP, (char)Keypad.KEY_ESCAPE, 0);
+	                        inject1.post();
+	                        inject2.post();
+	                        m_bSkipKeyPress = true;
+                        }*/
+                    }
+                }
+                
+            }
+        } catch (RenderingException re) {
+        	LOG.ERROR("RenderingException", re);
+	    } finally {
+	        SecondaryResourceFetchThread.doneAddingImages();
+	    }
+    }
+    
+	public int getAvailableHeight(BrowserContent browserContent) {
+		return Display.getHeight();
+	}
+
+	public int getAvailableWidth(BrowserContent browserContent) {
+		return Display.getWidth();
+	}
+
+	public String getHTTPCookie(String url) {
+		return null;
+	}
+
+	public int getHistoryPosition(BrowserContent browserContent) {
+		return 0;
+	}
+
+    public HttpConnection getResource( RequestedResource resource, BrowserContent referrer) {
+
+        if (resource == null)
+            return null;
+        
+        String url = resource.getUrl();
+        if (url == null || url.endsWith("/favicon.ico"))
+        	return null;
+        
+        try
+        {
+        	if (referrer == null || !m_bLoadImageAsync) 
+        	{
+	        	boolean bLocalHost = URI.isLocalHost(url);
+	        	if ( bLocalHost && m_connResource!= null)
+	        	{
+	        		com.rho.net.RhoConnection rhoConn = (com.rho.net.RhoConnection)((com.rho.net.bb.NativeBBHttpConnection)m_connResource).getNativeConnection(); 
+	        		rhoConn.resetUrl(url);
+	        		
+	        		Utilities.makeConnection(url, resource.getRequestHeaders(), null, m_connResource);
+	        		return m_connResource;
+	        	}else
+	        	{
+		            HttpConnection connection = Utilities.makeConnection(url, resource.getRequestHeaders(), null, null);
+		            if (bLocalHost)
+		            	m_connResource = connection;
+		            return connection;
+	        	}
+        	}else
+        	{
+        		SecondaryResourceFetchThread.enqueue(resource, referrer);        		
+        	}
+        }catch(Exception exc)
+        {
+        	LOG.ERROR("getResource failed.", exc);
+        }
+        
+        return null;
+        
+/*
+        // check if this is cache-only request
+        if (resource.isCacheOnly()) {
+            // no cache support
+            return null;
+        }
+
+        String url = resource.getUrl();
+
+        if (url == null) {
+            return null;
+        }
+
+        try{
+	        // if referrer is null we must return the connection
+	        if (referrer == null) {
+	            HttpConnection connection = Utilities.makeConnection(url, resource.getRequestHeaders(), null);
+	            return connection;
+	
+	        } else 
+	        {
+	    		if ( URI.isLocalHost(url) || URI.isLocalData(url))
+	    		{
+	                HttpConnection connection = Utilities.makeConnection(url, resource.getRequestHeaders(), null);
+	                return connection;
+	   			}else
+	   			{
+		            // if referrer is provided we can set up the connection on a separate thread
+		            SecondaryResourceFetchThread.enqueue(resource, referrer);
+	   			}
+	        }
+        }catch(Exception exc)
+        {
+        	LOG.ERROR("getResource failed.", exc);
+        }
+        
+        return null;*/
+    }
+
+    public void invokeRunnable(Runnable runnable) {
+        (new Thread(runnable)).start();
+    }
+
+    public boolean navigationMovement(int dx, int dy, int status, int time)
+    {
+    	return false;
+    }
+    
+    public void executeJavascript(String strJavascript)
+    {
+    	
+    }
+}

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

@@ -0,0 +1,28 @@
+package com.rho;
+
+import javax.microedition.io.HttpConnection;
+import rhomobile.RhodesApplication;
+
+public class BrowserAdapter5 implements IBrowserAdapter 
+{
+	public BrowserAdapter5(RhoMainScreen oMainScreen, RhodesApplication app) 
+	{
+	}
+
+	public void setFullBrowser()
+	{
+	}
+	
+    public void processConnection(HttpConnection connection, Object e) 
+    {
+    }
+
+    public void executeJavascript(String strJavascript)
+    {
+    }
+    
+    public boolean navigationMovement(int dx, int dy, int status, int time)
+    {
+    	return false;
+    }
+}

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

@@ -0,0 +1,10 @@
+package com.rho;
+
+import javax.microedition.io.HttpConnection;
+
+public interface IBrowserAdapter {
+	public void processConnection(HttpConnection connection, Object e);
+	public boolean navigationMovement(int dx, int dy, int status, int time);
+	public void executeJavascript(String strJavascript);
+	public void setFullBrowser();
+}

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

@@ -6,4 +6,8 @@ public abstract class RhoMainScreen extends MainScreen {
 	
 	protected abstract void onTouchUnclick();
 	
+	public boolean isTouchScreen()
+	{
+		return false;
+	}	
 };

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

@@ -11,7 +11,7 @@ import rhomobile.NativeBar;
 import rhomobile.RhoPhonebook;
 import rhomobile.RhodesApplication;
 import rhomobile.RingtoneManager;
-import rhomobile.WebView;
+import com.rho.rubyext.WebView;
 import rhomobile.camera.Camera;
 import rhomobile.datetime.DateTimePicker;
 import rhomobile.mapview.MapView;
@@ -19,9 +19,7 @@ import com.rho.rubyext.GeoLocation;
 
 import com.rho.db.HsqlDBStorage;
 import com.rho.db.IDBStorage;
-import com.rho.file.FileAccessBB;
-import com.rho.file.Jsr75RAFileImpl;
-import com.rho.file.PersistRAFileImpl;
+import com.rho.file.*;
 import com.rho.net.SSLSocket;
 import com.rho.net.TCPSocket;
 import com.xruby.runtime.builtin.RubyArray;

data/platform/bb/rhodes/src/com/rho/{Jsr75File.java → file/Jsr75File.java}

@@ -1,4 +1,4 @@
-package com.rho;
+package com.rho.file;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -6,9 +6,10 @@ import java.io.OutputStream;
 import java.util.Enumeration;
 import javax.microedition.io.*;
 import javax.microedition.io.file.*;
-
 import java.util.Vector;
 
+import com.rho.*;
+
 public class Jsr75File implements SimpleFile 
 {
     private FileConnection fconn;
@@ -30,7 +31,19 @@ public class Jsr75File implements SimpleFile
 		System.out.println("FileSystem: " + txt);
 	}
 
-	static void createDir( String strDir  )throws IOException{
+	static void recursiveCreateDir( String strPath  )throws IOException
+	{
+		int nSlash = strPath.indexOf('/', getRhoPath().length() );
+		while (nSlash >=0 )
+		{
+			String strDir = strPath.substring(0, nSlash+1);
+			createDir(strDir);
+			nSlash = strPath.indexOf('/', nSlash+1 );
+		}
+	}
+	
+	static void createDir( String strDir  )throws IOException
+	{
 		log("Dir:"+strDir);
 		FileConnection fdir = null;
 		try{
@@ -132,6 +145,36 @@ public class Jsr75File implements SimpleFile
     	return m_strRhoPath;
     }
 
+    public void copyJarFileToMemory(String strFileName, InputStream jarStream)throws IOException
+    {
+    	//create target directories
+    	String strTargetPath = FilePath.join(getRhoPath(), strFileName);
+    	recursiveCreateDir(strTargetPath);
+    	
+    	FileConnection fMem = null;
+    	OutputStream out = null;
+    	
+    	try{
+	    	fMem = (FileConnection)Connector.open(strTargetPath,Connector.READ_WRITE);
+			if ( !fMem.exists() )
+				fMem.create();
+	    	
+    		int nSize = jarStream.available();
+    		if ( nSize > 0 )
+    		{
+    			out = fMem.openOutputStream();
+	    		byte[] buf = new byte[nSize];
+	    		jarStream.read(buf);
+	    		out.write(buf);
+    		}			
+    	}finally{
+			if ( out != null )
+				out.close();
+			if ( fMem != null )
+				fMem.close();
+    	}
+    }
+    
     public static void copyRhoFileFromDeviceMemory(String strFileName)
     {
     	InputStream in = null;
@@ -345,14 +388,6 @@ public class Jsr75File implements SimpleFile
 			    }
     	}
     }
-    
-    public OutputStream getOutStream(){ return out; }
-    public InputStream getInputStream()throws IOException{
-    	if ( in  == null )
-    		in = fconn.openInputStream();
-    	
-    	return in; 
-   }
    
     public boolean isOpened(){
     	return m_bOpened;
@@ -468,6 +503,37 @@ public class Jsr75File implements SimpleFile
     	}
     }
     
+    public OutputStream getOutStream(){ return out; }
+    
+    public OutputStream getOutStreamEx(long pos)throws IOException
+    { 
+        if (outPos != pos) {                         
+            out.close();
+            out = fconn.openOutputStream(pos);
+            if (pos > fileSize) { 
+                byte[] zeroBuf = new byte[ZERO_BUF_SIZE];
+                do { 
+                    int size = pos - fileSize > ZERO_BUF_SIZE ? ZERO_BUF_SIZE : (int)(pos - fileSize);
+                    out.write(zeroBuf, 0, size);
+                    fileSize += size;
+                    
+                    //BB
+                    //fconn.truncate(fileSize);
+                } while (pos != fileSize);
+            }
+            outPos = pos;
+        }
+    	
+    	return out; 
+    }
+    
+    public InputStream getInputStream()throws IOException{
+    	if ( in  == null )
+    		in = fconn.openInputStream();
+    	
+    	return in; 
+   }
+    
     public void write(long pos, byte[] b)throws IOException
     {
         int len = b.length;
@@ -475,24 +541,12 @@ public class Jsr75File implements SimpleFile
             throw new IOException("Illegal mode");
         }
         int nTry = 0;
-        while (nTry <= 1){
-	        try {
-	            if (outPos != pos) {                         
-	                out.close();
-	                out = fconn.openOutputStream(pos);
-	                if (pos > fileSize) { 
-	                    byte[] zeroBuf = new byte[ZERO_BUF_SIZE];
-	                    do { 
-	                        int size = pos - fileSize > ZERO_BUF_SIZE ? ZERO_BUF_SIZE : (int)(pos - fileSize);
-	                        out.write(zeroBuf, 0, size);
-	                        fileSize += size;
-	                        
-	                        //BB
-	                        //fconn.truncate(fileSize);
-	                    } while (pos != fileSize);
-	                }
-	                outPos = pos;
-	            }
+        while (nTry <= 1)
+        {
+	        try 
+	        {
+	        	getOutStreamEx(pos);
+	        	
 	            out.write(b, 0, len);
 	            outPos += len;
 	            if (outPos > fileSize) { 
@@ -511,13 +565,6 @@ public class Jsr75File implements SimpleFile
 	        		throw exc;
 	        	else{
 	                outPos = -pos;
-	        		
-/*	        		String name = fconn.getURL();
-	        		//boolean bRead = fconn.canRead();
-	        		boolean bWrite = fconn.canWrite();
-	        		
-	        		close();
-	        		open(name, !bWrite, noFlush);*/
 	        	}
 	        		
 	        }