rhodes 2.2.3 → 2.2.4.beta.1

data/platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java

@@ -7,6 +7,7 @@ import android.content.Context;
 import android.content.res.AssetManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebView;
@@ -17,14 +18,37 @@ public class SplashScreen {
 	private static final String LOADING_PNG = "apps/app/loading.png";
 	private static final String LOADING_PAGE = "apps/app/loading.html";
 	
+	private static final String TAG = "RhoSplashScreen";	
+	
 	private View view;
 	
 	private native void nativeStart();
 	private native void nativeHide();
 	
+	public class SplashImageView extends ImageView {
+		private boolean setupExecuted = false;
+		
+		public SplashImageView(Context ctx) {
+			super(ctx);
+		}
+		
+		protected void onDraw (Canvas canvas) {
+			RhodesService.platformLog(TAG, "Splash Screen Image REAL DRAWING !");
+			super.onDraw(canvas);
+			if (!setupExecuted) {
+				Rhodes.runPosponedSetup();
+				setupExecuted = true;
+			}
+		}
+		
+		
+	}
+	
+
 	public SplashScreen(Context ctx) {
+		RhodesService.platformLog(TAG, "SplashScreen()");
 		AssetManager am = ctx.getResources().getAssets();
-		RhodesService r = RhodesService.getInstance();
+		//RhodesService r = RhodesService.getInstance();
 		//boolean bc = r.isBundleChanged();
 		
 		String file = LOADING_PNG;
@@ -35,13 +59,14 @@ public class SplashScreen {
 			bitmap = BitmapFactory.decodeStream(is);
 			is.close();
 			
-			ImageView v = new ImageView(ctx);
+			ImageView v = new SplashImageView(ctx);
 			v.setImageBitmap(bitmap);
+			v.setAdjustViewBounds(false);
 			v.setId(RhodesService.RHO_SPLASH_VIEW);
 			view = v;
 		}
 		catch (IOException e) {
-			WebView v = r.createWebView();
+			WebView v = RhodesService.createLoadingWebView(ctx);
 			
 			String page = LOADING_PAGE;
 			
@@ -72,11 +97,17 @@ public class SplashScreen {
 	public void start(ViewGroup outer) {
 		outer.removeAllViews();
 		outer.addView(view);
+		RhodesService.platformLog(TAG, " view was showed on screen");
+	}
+	
+	public void rho_start() {
 		nativeStart();
+		RhodesService.platformLog(TAG, " rho native loading splash screen started");
 	}
 	
 	public void hide(ViewGroup outer) {
 		nativeHide();
 		outer.removeView(view);
+		RhodesService.platformLog(TAG, " splash screen closed");
 	}
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManager.java

@@ -57,23 +57,27 @@ public class RhoBluetoothManager {
 	   
 	public static IRhoBluetoothManager sharedInstance() {
 		if (ourInstance == null) {
-			String className = "RhoBluetoothManagerNew";
-			int sdkVersion = Integer.parseInt(Build.VERSION.SDK);
-			if (sdkVersion < Build.VERSION_CODES.ECLAIR) {
-				if(D) Log.d(TAG, "sharedInstance - old version of System - NO Bluetooth !");
-				className = "RhoBluetoothManagerOld";
-			}
-			try {
-				String pkgname = RhoBluetoothManager.class.getPackage().getName();
-				String fullName = pkgname + "." + className;
-				Class<? extends IRhoBluetoothManager> klass =
-					Class.forName(fullName).asSubclass(IRhoBluetoothManager.class);
-				ourInstance = klass.newInstance();
-				ourInstance.init();
-			}
-			catch (Exception e) {
-				throw new IllegalStateException(e);
-			}
+			PerformOnUiThread.exec( new Runnable() {
+				public void run() {
+					String className = "RhoBluetoothManagerNew";
+					int sdkVersion = Integer.parseInt(Build.VERSION.SDK);
+					if (sdkVersion < Build.VERSION_CODES.ECLAIR) {
+						if(D) Log.d(TAG, "sharedInstance - old version of System - NO Bluetooth !");
+						className = "RhoBluetoothManagerOld";
+					}
+					try {
+						String pkgname = RhoBluetoothManager.class.getPackage().getName();
+						String fullName = pkgname + "." + className;
+						Class<? extends IRhoBluetoothManager> klass =
+							Class.forName(fullName).asSubclass(IRhoBluetoothManager.class);
+						ourInstance = klass.newInstance();
+						ourInstance.init();
+					}
+					catch (Exception e) {
+						throw new IllegalStateException(e);
+					}
+				}
+		   },true);
 		}
 		return ourInstance;
 	}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePickerScreen.java

@@ -20,7 +20,9 @@
  */
 package com.rhomobile.rhodes.datetime;
 
+import java.util.Calendar;
 import java.util.Date;
+import java.util.GregorianCalendar;
 
 import com.rhomobile.rhodes.AndroidR;
 import com.rhomobile.rhodes.Logger;
@@ -82,7 +84,29 @@ public class DateTimePickerScreen extends RhoActivity {
 		Bundle extras = this.getIntent().getExtras();
 		
 		_callback = extras.getString(INTENT_EXTRA_PREFIX + "callback");
-		_init = new Date(extras.getLong(INTENT_EXTRA_PREFIX + "init")*1000);
+		
+		long milliseconds = extras.getLong(INTENT_EXTRA_PREFIX + "init")*((long)1000);
+		
+		_init = new Date(milliseconds);
+
+		Calendar c = new GregorianCalendar();
+		c.setTimeInMillis(milliseconds);
+
+		int year = c.get(Calendar.YEAR);
+		int month = c.get(Calendar.MONTH);
+		int day = c.get(Calendar.DAY_OF_MONTH);
+		int hours = c.get(Calendar.HOUR_OF_DAY);
+		int minutes = c.get(Calendar.MINUTE);
+		int seconds = c.get(Calendar.SECOND);
+		
+		_init.setYear(year);
+		_init.setMonth(month);
+		_init.setDate(day);
+		_init.setHours(hours);
+		_init.setMinutes(minutes);
+		
+		
+		
 		_fmt = extras.getInt(INTENT_EXTRA_PREFIX + "fmt");
 		_opaque = extras.getByteArray(INTENT_EXTRA_PREFIX + "opaque");
 		
@@ -96,9 +120,9 @@ public class DateTimePickerScreen extends RhoActivity {
 		_okButton.setOnClickListener(mOkListener);
 		_cancelButton.setOnClickListener(mCancelListener);
 		
-		_datePicker.init(_init.getYear() + 1900, _init.getMonth(), _init.getDay(), null);
-		_timePicker.setCurrentHour(_init.getHours());
-		_timePicker.setCurrentMinute(_init.getMinutes());
+		_datePicker.init(year, month, day, null);
+		_timePicker.setCurrentHour(hours);
+		_timePicker.setCurrentMinute(minutes);
 		
 		switch (_fmt) {
 		case FORMAT_DATE:
@@ -121,7 +145,7 @@ public class DateTimePickerScreen extends RhoActivity {
 	
 	private void sendResult(String callback, Date result, byte[] opaque) {
 		this.setFieldsEnabled(false);
-		long res = result == null ? 0 : result.getTime()/1000;
+		long res = result == null ? 0 : result.getTime()/((long)1000);
 		Logger.D(TAG, "Return result: " + res);
 		DateTimePicker.callback(callback, res, opaque, result == null);
 		finish();

data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java

@@ -34,9 +34,11 @@ import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
+import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.webkit.WebView;
 import android.widget.Button;
 import android.widget.ImageButton;
@@ -165,6 +167,10 @@ public class SimpleMainView implements MainView {
 		else if (action.equalsIgnoreCase("separator"))
 			return null;
 		
+		DisplayMetrics metrics = new DisplayMetrics();
+		WindowManager wm = (WindowManager)RhodesService.getInstance().getContext().getSystemService(Context.WINDOW_SERVICE);
+		wm.getDefaultDisplay().getMetrics(metrics);
+		
 		Object iconObj = hash.get("icon");
 		if (iconObj != null) {
 			if (!(iconObj instanceof String))
@@ -174,6 +180,7 @@ public class SimpleMainView implements MainView {
 			Bitmap bitmap = BitmapFactory.decodeStream(RhoFileApi.open(iconPath));
 			if (bitmap == null)
 				throw new IllegalArgumentException("Can't find icon: " + iconPath);
+			bitmap.setDensity(metrics.DENSITY_MEDIUM);
 			icon = new BitmapDrawable(bitmap);
 		}
 		

data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/ExternalHttpHandler.java

@@ -0,0 +1,37 @@
+package com.rhomobile.rhodes.uri;
+
+import com.rhomobile.rhodes.Logger;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+
+public class ExternalHttpHandler implements UriHandler {
+	
+	private static final String TAG = "ExternalHttpHandler";
+	private Context ctx;
+	
+	public ExternalHttpHandler(Context c) {
+		ctx = c;
+	}
+
+	public boolean handle(String url) {
+		Uri uri = Uri.parse(url);
+		String scheme = uri.getScheme();
+		if (!scheme.equals("http") && !scheme.equals("https"))
+			return false;
+		
+		String target = uri.getQueryParameter("rho_open_target");
+		if (target == null || !target.equals("_blank"))
+			return false;
+		
+		Logger.D(TAG, "This is external 'http' uri, handle it");
+		
+		Intent intent = new Intent(Intent.ACTION_VIEW);
+		intent.setData(uri);
+		
+		ctx.startActivity(Intent.createChooser(intent, "Open in..."));
+		return true;
+	}
+
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/MailUriHandler.java

@@ -27,7 +27,6 @@ import com.rhomobile.rhodes.Logger;
 import android.content.Context;
 import android.content.Intent;
 import android.net.MailTo;
-import android.net.Uri;
 
 public class MailUriHandler implements UriHandler {
 	

data/platform/android/build/RhodesSRC_build.files

@@ -1,5 +1,23 @@
-platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/AndroidR.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/HttpLog.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/Logger.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/NavBar.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkConnectivityListener.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkStateTracker.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/PushReceiver.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/PushService.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoActivity.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoConf.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoLogConf.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/Utils.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/IRhoBluetoothManager.java 
 platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothDeviceListActivity.java 
 platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManager.java 
@@ -9,64 +27,47 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothSession.j
 platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/UUIDHelper.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/camera/FileList.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCaptureCallback.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCaptureCallback.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePicker.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePickerScreen.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/event/Event.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/event/EventStore.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/file/RhoFileApi.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/HttpLog.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/Logger.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/MainView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/Annotation.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/AnnotationsOverlay.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoNativeViewManager.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/NavBar.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkConnectivityListener.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkStateTracker.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessor.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorNew.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorOld.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactField.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Phonebook.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/PushReceiver.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/PushService.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhoActivity.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhoConf.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhoLogConf.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/signature/ImageCapture.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/signature/Signature.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/signature/SignatureView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSockAddr.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocketImpl.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocket.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocketImpl.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/socket/SSLImpl.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/ui/AboutDialog.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogOptionsDialog.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogViewDialog.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/uri/ExternalHttpHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/MailUriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/SmsUriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/TelUriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/UriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/VideoUriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/util/PerformOnUiThread.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/Utils.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientNew.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientOld.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettings.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsNew.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsOld.java

data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBStorage.java

@@ -39,6 +39,12 @@ public class HsqlDBStorage implements IDBStorage, Session.IDBCallback{
 		return strDbName;
 	}
 	
+	public boolean isDbFileExists(String strPath)
+	{
+		String strDbName = getNameNoExt(strPath);
+		return m_fs.exists(strDbName + ".data");
+	}
+	
 	public void open(String strPath, String strSqlScript) throws DBException 
 	{
 		try{

data/platform/bb/RubyVM/src/com/rho/RhoLogger.java

@@ -2,8 +2,11 @@ package com.rho;
 
 import java.util.Calendar;
 
+import net.rim.device.api.system.EventLogger;
+
 public class RhoLogger {
 	public static final boolean RHO_STRIP_LOG = false;
+	public static final long EVENT_GUID = 0x4c9c8411d87982f2L;
 
 	private static final int L_TRACE = 0;
 	private static final int L_INFO = 1;
@@ -30,6 +33,11 @@ public class RhoLogger {
 		return m_oLogConf;
 	}
 	
+	static
+	{
+	    EventLogger.register(EVENT_GUID, "RHODESAPP", EventLogger.VIEWER_STRING);
+	}
+	
 	public String getLogCategory(){ return m_category; }
 	public void setLogCategory(String category){ m_category = category; }
 	
@@ -145,14 +153,20 @@ public class RhoLogger {
 		if (m_strMessage.length() > 0 || m_strMessage.charAt(m_strMessage.length() - 1) != '\n')
 			m_strMessage += '\n';
 			
-	    synchronized( m_SinkLock ){
-	    	getLogConf().sinkLogMessage( m_strMessage, bOutputOnly );
-		    if ( (isSimulator() || m_severity == L_FATAL) && e != null ){
-				//TODO: redirect printStackTrace to our log
-				//e.printStackTrace();
+		if ( bOutputOnly )
+		{
+			System.out.print(m_strMessage);
+			System.out.flush();
+		}else
+		{
+		    synchronized( m_SinkLock ){
+		    	getLogConf().sinkLogMessage( m_strMessage, bOutputOnly );
+			    if ( (isSimulator() || m_severity == L_FATAL) && e != null ){
+					//TODO: redirect printStackTrace to our log
+					//e.printStackTrace();
+			    }
 		    }
-	    }
-
+		}
 	    if ( m_severity == L_FATAL )
 	    	processFatalError();
 	}
@@ -167,7 +181,6 @@ public class RhoLogger {
     		throw new RuntimeException();
     	
     	System.exit(0);
-		
 	}
 	
 	public void TRACE(String message) {
@@ -182,10 +195,14 @@ public class RhoLogger {
 	}
 	
 	public void INFO_OUT(String message) {
-		//logMessage( L_INFO, message, null, true);
-		//TODO: INFO_OUT
-		System.out.print(m_category + ": " + message + "\n");
-		System.out.flush();
+		logMessage( L_INFO, message, null, true);
+	}
+
+	public void INFO_EVENT(String message) 
+	{
+    	EventLogger.logEvent(EVENT_GUID, (m_category + ": " + message).getBytes());
+		
+		INFO_OUT(message);
 	}
 	
 	public void WARNING(String message) {
@@ -201,14 +218,21 @@ public class RhoLogger {
 		logMessage( L_ERROR, message, e );
 	}
 	public void ERROR_OUT(String message,Throwable e) {
-		//logMessage( L_ERROR, message, e, true );
-		System.out.print(m_category + ": " + message + ". " + ( e != null ? e.getClass().getName() : "Exception") + 
-				(e != null ? e.getMessage() : "" ) +"\n");
+		logMessage( L_ERROR, message, e, true );
+		//System.out.print(m_category + ": " + message + ". " + ( e != null ? e.getClass().getName() : "Exception") + 
+		//		(e != null ? e.getMessage() : "" ) +"\n");
 		if ( e != null )
 			e.printStackTrace();
 		
 		System.out.flush();
 	}
+
+	public void ERROR_EVENT(String message,Throwable e) 
+	{
+		ERROR_OUT(message, e);
+		
+    	EventLogger.logEvent(EVENT_GUID, m_strMessage.getBytes());
+	}
 	
 	public void FATAL(String message) {
 		logMessage( L_FATAL, message);
@@ -239,12 +263,11 @@ public class RhoLogger {
 	    }
 	}
 	
-    public static void InitRhoLog()throws Exception{
-    	
+    public static void InitRhoLog()throws Exception
+    {
     	m_sysInfo = RhoClassFactory.createRhoRubyHelper();
-    	
         RhoConf.InitRhoConf();
-    	
+        
         //Set defaults
     	m_oLogConf.setLogPrefix(true);		
     	
@@ -270,7 +293,6 @@ public class RhoLogger {
     	//
     	//m_oLogConf.saveToFile("");
     	//
-	    	
     	RhoConf.getInstance().loadConf();
     	m_oLogConf.loadFromConf(RhoConf.getInstance());
     }