rhodes 3.4.2 → 3.5.1.12

data/platform/bb/rhodes/platform/5.0/com/rho/RhodesApplicationPlatform.java

@@ -225,7 +225,7 @@ public class RhodesApplicationPlatform extends UiApplication implements PushAppl
 	{
 		if ( com.rho.Capabilities.ENABLE_PUSH )
 		{
-			if ( !rhomobile.PushListeningThread.isPushServiceEnabled() )
+			if ( !com.rho.sync.ClientRegister.isPushServiceEnabled() )
 				return;
 			
 			getUiApplication().invokeLater( new Runnable()

data/platform/bb/rhodes/platform/common/com/rho/rubyext/SignatureCapture.java

@@ -126,25 +126,20 @@ public class SignatureCapture extends MainScreen
 	 */
 	private MenuItem _captureItem = new MenuItem("Capture", 200000, 10) {
 		public void run() {
-			//Create a new instance of the encoder to encode the bitmap into an image
-			PNGEncoder encoder = new PNGEncoder(_bitmap, true);
+	        net.rim.device.api.system.PNGEncodedImage encodedImage = net.rim.device.api.system.PNGEncodedImage.encode(_bitmap);
+			byte[] imageBytes = encodedImage.getData();
 			try {
-				byte[] imageBytes = encoder.encode(true);
-				EncodedImage image = EncodedImage.createEncodedImage(imageBytes, 0, imageBytes.length);
-				try {
-					String fileName = getFilePath();
-					
-					FileConnection fconn = (FileConnection) Connector.open(fileName);
-					if (!fconn.exists())
-						fconn.create();
-					DataOutputStream ds = fconn.openDataOutputStream();
-					ds.write(image.getData());
-					ds.close();
-					fconn.close();
-				} catch (Exception e) {
-					LOG.ERROR("Save signature failed.", e);
-				}
-			} catch (IOException e) {
+				String fileName = getFilePath();
+				
+				FileConnection fconn = (FileConnection) Connector.open(fileName);
+				if (!fconn.exists())
+					fconn.create();
+				java.io.OutputStream outputStream = fconn.openOutputStream();
+				outputStream.write(imageBytes);
+		        outputStream.close();   
+		        
+				fconn.close(); 
+			} catch (Exception e) {
 				LOG.ERROR("Save signature failed.", e);
 			}
 			

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

@@ -245,6 +245,16 @@ public class BrowserAdapter implements RenderingApplication, IBrowserAdapter
 	    } finally {
 	        SecondaryResourceFetchThread.doneAddingImages();
 	    }
+	    
+		try {
+			IRhoRubyHelper helper = RhoClassFactory.createRhoRubyHelper();
+			if (helper != null)
+				helper.wakeUpGeoLocation();
+		}catch(Exception exc)
+		{
+			LOG.ERROR("wakeUpGeoLocation failed", exc);
+		}
+	    
     }
     
 	public int getAvailableHeight(BrowserContent browserContent) {

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

@@ -102,7 +102,7 @@ public class BrowserAdapter5 implements IBrowserAdapter
 			if ( url.startsWith("http:/") && !url.startsWith("http://") )
 				url = RhodesApp.getInstance().getHomeUrl() + url.substring(5);
 				
-    		if ( RhodesApp.getInstance().isRhodesAppUrl(url) ) //|| URI.isLocalData(url) )
+    		//if ( RhodesApp.getInstance().isRhodesAppUrl(url) ) //|| URI.isLocalData(url) )
     		{
                 HttpConnection connection = Utilities.makeConnection(url, request.getHeaders(), null, null);
 
@@ -119,8 +119,8 @@ public class BrowserAdapter5 implements IBrowserAdapter
                 }
                 
                 return connection;
-    		}else
-    			return super.handleResourceRequest(request);
+    		}//else
+    		//	return super.handleResourceRequest(request); 
 		}
 
 		public void setNavigationRequestHandler(String protocol,
@@ -224,6 +224,16 @@ public class BrowserAdapter5 implements IBrowserAdapter
 		    			m_oMainScreen.add(browserField);
 		    		}
 		     	}
+		    	
+				try {
+					IRhoRubyHelper helper = RhoClassFactory.createRhoRubyHelper();
+					if ( helper != null )
+						helper.wakeUpGeoLocation();
+				}catch(Exception exc)
+				{
+					LOG.ERROR("wakeUpGeoLocation failed", exc);
+				}
+		    	
 		     }
 		};
 		m_oBrowserField.addListener( _listener );

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

@@ -302,4 +302,9 @@ public class RhoRubyHelper implements IRhoRubyHelper
 	{
 		com.rho.rubyext.System.unzip_file(strPath);
 	}
+	
+	public void webview_execute_js(String strScript)
+	{
+		RhodesApplication.getInstance().executeJavascript(strScript);
+	}
 }

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

@@ -225,7 +225,7 @@ public class RhodesApplicationPlatform extends UiApplication implements PushAppl
 	{
 		if ( com.rho.Capabilities.ENABLE_PUSH )
 		{
-			if ( !rhomobile.PushListeningThread.isPushServiceEnabled() )
+			if ( !com.rho.sync.ClientRegister.isPushServiceEnabled() )
 				return;
 			
 			getUiApplication().invokeLater( new Runnable()

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

@@ -450,7 +450,12 @@ public class Jsr75File implements SimpleFile
             }
             if ( fconn.exists() )
             {
-            	fileSize = fconn.fileSize();
+            	try{
+            		fileSize = fconn.fileSize();
+            	}catch(Exception exc)
+            	{
+            		fileSize = 0;
+            	}
             	m_bOpened = true;
 	            if (!readOnly) {
 	                //fconn.setWritable(true);	                    

data/platform/bb/rhodes/src/com/rho/file/Jsr75RAFileImpl.java

@@ -85,7 +85,12 @@ public class Jsr75RAFileImpl implements IRAFile {
 					throw new FileNotFoundException("File '" + name + "' not exists");
 	        }
 			
-	        m_fileSize = m_file.fileSize();
+			try{
+				m_fileSize = m_file.fileSize();
+			}catch(Exception exc)
+			{
+				m_fileSize = 0;
+			}
 	        m_nSeekPos = 0;
 		}
 		catch (Exception exc) {

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

@@ -81,12 +81,12 @@ public class GeoLocation extends RhoThread{
 					return;
 				}
 				
-				if( !location.isValid() )
+				/*if( !location.isValid() )
 				{
 					String strExtraInfo = location.getExtraInfo("text/plain");
 					LOG.TRACE("locationUpdated: location invalid.Extra info: " + (strExtraInfo!=null ? strExtraInfo :"") );
 					return;
-				}
+				}*/
 				
 				coord = location.getQualifiedCoordinates();
 				if(coord != null ) 
@@ -216,14 +216,17 @@ public class GeoLocation extends RhoThread{
 						m_lp = null;
 					}
 					
-					if ( getPingTimeoutSec() != -1 )
+					if ( getPingTimeoutSec() != -1 && isCallbackExists() )
 					{
-						m_lp = LocationProvider.getInstance(null);
+		                Criteria criteria = new Criteria();
+		                criteria.setCostAllowed(false);
+						
+						m_lp = LocationProvider.getInstance(criteria);
 						if ( m_lp != null ){
 							m_locListener = new LocationListenerImpl(this);
-							LOG.TRACE("setLocationListener");
-							m_lp.setLocationListener( m_locListener, 
-									m_nDeterminedTime == 0 ? 1 : getPingTimeoutSec(), -1, -1);
+							int nInterval = m_nDeterminedTime == 0 ? 1 : getPingTimeoutSec(); 
+							LOG.TRACE("setLocationListener with interval : " + nInterval);
+							m_lp.setLocationListener( m_locListener, nInterval, -1, -1);
 							m_nDeterminedTime = nNow;
 						}else
 							bErrorNotify = true;
@@ -257,6 +260,18 @@ public class GeoLocation extends RhoThread{
         	m_strParams = strParams; 
         }
         
+        boolean isEmptyCallback()
+        {
+        	if (m_strUrl != null && m_strUrl.length() > 0)
+        	{
+    			LOG.TRACE("isEmptyCallback: " + m_strUrl);
+        		
+        		return false;
+        	}
+        	
+        	return true;
+        }
+        
         void fire(boolean bError)
         {
         	if (m_strUrl != null && m_strUrl.length() == 0)
@@ -295,6 +310,7 @@ public class GeoLocation extends RhoThread{
     {
 		synchronized(sync)
 		{
+			LOG.TRACE("setViewNotification: " + strUrl + ";" + strParams + ";" + nTimeout);
 			m_ViewNotify = new GeoNotification(strUrl, strParams);
 			
 			setPingTimeoutSec(nTimeout);
@@ -335,7 +351,7 @@ public class GeoLocation extends RhoThread{
 
 			try{
 				Location location = LocationProvider.getLastKnownLocation();
-				if ( location != null && location.isValid() )
+				if ( location != null/* && location.isValid()*/ )
 				{
 					long locTime = location.getTimestamp();
 					long curTime = java.lang.System.currentTimeMillis();
@@ -384,6 +400,16 @@ public class GeoLocation extends RhoThread{
 		}		
 	}
 	
+	public boolean isCallbackExists()
+	{
+		if ( m_Notify != null && !m_Notify.isEmptyCallback() )
+			return true;
+		if ( m_ViewNotify != null && !m_ViewNotify.isEmptyCallback() )
+			return true;
+
+		return false;
+	}
+	
 	public static void stop() {
 		if ( m_pInstance != null )
 		{
@@ -393,8 +419,11 @@ public class GeoLocation extends RhoThread{
 	}
 	
 	public static void wakeUp() {
-		if ( m_pInstance != null )
+		if ( m_pInstance != null && m_pInstance.isCallbackExists() )
+		{
+			LOG.TRACE("wakeUp");
 			m_pInstance.stopWait();
+		}
 	}
 	
 	public static boolean isAvailable(){

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

@@ -128,25 +128,20 @@ public class SignatureCapture extends MainScreen
 	 */
 	private MenuItem _captureItem = new MenuItem("Capture", 200000, 10) {
 		public void run() {
-			//Create a new instance of the encoder to encode the bitmap into an image
-			PNGEncoder encoder = new PNGEncoder(_bitmap, true);
+	        net.rim.device.api.system.PNGEncodedImage encodedImage = net.rim.device.api.system.PNGEncodedImage.encode(_bitmap);
+			byte[] imageBytes = encodedImage.getData();
 			try {
-				byte[] imageBytes = encoder.encode(true);
-				EncodedImage image = EncodedImage.createEncodedImage(imageBytes, 0, imageBytes.length);
-				try {
-					String fileName = getFilePath();
-					
-					FileConnection fconn = (FileConnection) Connector.open(fileName);
-					if (!fconn.exists())
-						fconn.create();
-					DataOutputStream ds = fconn.openDataOutputStream();
-					ds.write(image.getData());
-					ds.close();
-					fconn.close();
-				} catch (Exception e) {
-					LOG.ERROR("Save signature failed.", e);
-				}
-			} catch (IOException e) {
+				String fileName = getFilePath();
+				
+				FileConnection fconn = (FileConnection) Connector.open(fileName);
+				if (!fconn.exists())
+					fconn.create();
+				java.io.OutputStream outputStream = fconn.openOutputStream();
+				outputStream.write(imageBytes);
+		        outputStream.close();   
+		        
+				fconn.close(); 
+			} catch (Exception e) {
 				LOG.ERROR("Save signature failed.", e);
 			}
 			

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

@@ -139,7 +139,22 @@ public class WebView
 			protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block) 
 			{
 				try {
-					RhodesApplication.getInstance().executeJavascript(args.get(0).toStr());
+					if ( args.size() >= 3 && args.get(0) != null )
+					{
+						RubyArray vals = (RubyArray)args.get(2);
+						String strFunc = "(";
+						for ( int i = 0; i < vals.size(); i++)
+						{
+							strFunc += vals.get(i).toStr();
+							if ( i + 1 < vals.size() )
+								strFunc += ",";
+						}
+			            strFunc += ");";
+						
+				        RhodesApplication.getInstance().executeJavascript(strFunc);
+					}else
+						RhodesApplication.getInstance().executeJavascript(args.get(0).toStr());
+					
 					//String url = "javascript:"+args.get(0).toStr();
 					//RhodesApplication.getInstance().navigateUrl(url);
 					return RubyConstant.QNIL;

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

@@ -72,26 +72,6 @@ public class PushListeningThread extends Thread {
         }
     }
 
-    public static boolean isMDSPushEnabled()
-    {
-    	if ( !RhoConf.getInstance().isExist("push_options") )
-    		return true;
-    	
-    	String strOptions = RhoConf.getInstance().getString("push_options");
-    	
-    	return strOptions.indexOf("mds") >= 0;
-    }
-
-    public static boolean isPushServiceEnabled()
-    {
-    	if ( !RhoConf.getInstance().isExist("push_options") )
-    		return false;
-    	
-    	String strOptions = RhoConf.getInstance().getString("push_options");
-    	
-    	return strOptions.indexOf("push_service") >= 0;
-    }
-    
     public void run()
     {
 

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

@@ -1416,15 +1416,6 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
         m_oBrowserAdapter.processConnection(connection, e);
         m_bDisableInput = false;
         PROF.STOP("BROWSER_PAGE");
-        
-		try {
-			IRhoRubyHelper helper = RhoClassFactory.createRhoRubyHelper();
-			helper.wakeUpGeoLocation();
-		}catch(Exception exc)
-		{
-			LOG.ERROR("wakeUpGeoLocation failed", exc);
-		}
-        
     }
 
     public static class PrimaryResourceFetchThread {//extends Thread {
@@ -1471,7 +1462,7 @@ final public class RhodesApplication extends RhodesApplicationPlatform implement
     	    	
     	    	if ( com.rho.Capabilities.ENABLE_PUSH  )
     	    	{
-    	    		if ( PushListeningThread.isMDSPushEnabled() )
+    	    		if ( com.rho.sync.ClientRegister.isMDSPushEnabled() )
     	    		{
 		    	    	_pushListeningThread = new PushListeningThread();
 		    	    	_pushListeningThread.start();

data/platform/bb/rhodes/src/rhomobile/camera/CameraScreen.java

@@ -175,41 +175,46 @@ public class CameraScreen extends MainScreen {
 	            file = RhoClassFactory.createFile();	        		
 	        	
 	        	if (fileName != null) {
-	        		String ext = fileName.substring(fileName.lastIndexOf('.'));
-	        		fname = makeFileName(ext);
-					fconnsrc = (FileConnection)Connector.open(fileName, Connector.READ_WRITE);
-					fconndst = (FileConnection)Connector.open(fname, Connector.READ_WRITE);
-					if (fconndst.exists())
-						fconndst.delete();
-					fconndst.create();
-					
-					LOG.TRACE("should be readed " + fconnsrc.fileSize() + " bytes");
-					
-					src = fconnsrc.openInputStream();
-					dst = fconndst.openOutputStream();
-					
-					long fullLength = 0;
-					
-					byte[] buf = new byte[64*1024];
-					int ret;
-					while((ret = src.read(buf)) > 0) {
-						fullLength += ret;
-						dst.write(buf, 0, ret);
-					}
-					dst.flush();
-					
-					LOG.TRACE("readed: " + fullLength + " bytes");
-					
-					try{
-						if ( src != null )
-							src.close();
-						src = null;
-
-						fconnsrc.delete();
-					}catch (Exception exc)
-					{
-						LOG.ERROR("Cannot delete file: " + fileName, exc);
-					}
+	        		int nDotIndex = fileName.lastIndexOf('.');
+	        		if ( nDotIndex >= 0 )
+	        		{
+		        		String ext = fileName.substring(nDotIndex);
+		        		fname = makeFileName(ext);
+						fconnsrc = (FileConnection)Connector.open(fileName, Connector.READ_WRITE);
+						fconndst = (FileConnection)Connector.open(fname, Connector.READ_WRITE);
+						if (fconndst.exists())
+							fconndst.delete();
+						fconndst.create();
+						
+						LOG.TRACE("should be readed " + fconnsrc.fileSize() + " bytes");
+						
+						src = fconnsrc.openInputStream();
+						dst = fconndst.openOutputStream();
+						
+						long fullLength = 0;
+						
+						byte[] buf = new byte[64*1024];
+						int ret;
+						while((ret = src.read(buf)) > 0) {
+							fullLength += ret;
+							dst.write(buf, 0, ret);
+						}
+						dst.flush();
+						
+						LOG.TRACE("readed: " + fullLength + " bytes");
+						
+						try{
+							if ( src != null )
+								src.close();
+							src = null;
+	
+							fconnsrc.delete();
+						}catch (Exception exc)
+						{
+							LOG.ERROR("Cannot delete file: " + fileName, exc);
+						}
+	        		}else
+	        			LOG.ERROR("File name does not contain extension. Skip it:" + fileName );
 				}
 	        	else {
 		            //A null encoding indicates that the camera should