rhodes 2.0.3 → 2.1.0

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

@@ -26,22 +26,22 @@ public class Utils {
 	};
 	
 	public static class AssetsSource extends FileSource {
-
-		private AssetManager amgr;
+		
+		private AssetManager am;
 		
 		public AssetsSource(AssetManager a) {
-			amgr = a;
+			am = a;
 		}
 		
 		String[] list(String dir) throws IOException {
-			return amgr.list(dir);
-		};
+			return am.list(dir);
+		}
 		
 		InputStream open(String file) throws IOException {
-			return amgr.open(file);
+			return am.open(file);
 		}
 		
-	}; 
+	};
 	
 	public static String getContent(InputStream in) throws IOException {
 		String retval = "";
@@ -74,20 +74,20 @@ public class Utils {
 		}
 	}
 	
-	public static boolean deleteRecursively(File target) {
+	public static void deleteRecursively(File target) throws IOException {
 		if (target.isDirectory()) {
 			String[] children = target.list();
 			for(int i = 0; i != children.length; ++i)
-				if (!deleteRecursively(new File(target, children[i])))
-					return false;
+				deleteRecursively(new File(target, children[i]));
 		}
-		return target.delete();
+		if (!target.delete())
+			throw new IOException("Can not delete " + target.getAbsolutePath());
 	}
 	
 	public static void copyRecursively(FileSource fs, String source, File target, boolean remove) throws IOException
 	{
-		if (remove && target.exists() && !deleteRecursively(target))
-			throw new IOException("Can not delete " + target.getAbsolutePath());
+		if (remove && target.exists())
+			deleteRecursively(target);
 		
 		String[] children = fs.list(source);
 		if (children != null && children.length > 0) {
@@ -161,5 +161,21 @@ public class Utils {
 			return null;
 		return new File(filePath).getName();
 	}
-
+	
+	public static boolean isAppHashChanged() {
+		try {
+			RhodesService r = RhodesService.getInstance();
+			File hash = new File(r.getRootPath(), "hash");
+			if (!hash.exists())
+				return true;
+			
+			FileSource as = new AssetsSource(r.getContext().getResources().getAssets());
+			FileSource fs = new FileSource();
+			return !Utils.isContentsEquals(as, "hash", fs, hash.getPath());
+		}
+		catch (IOException e) {
+			return true;
+		}
+	}
+	
 }

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

@@ -20,6 +20,8 @@
  */
 package com.rhomobile.rhodes;
 
+import com.rhomobile.rhodes.util.PerformOnUiThread;
+
 import android.net.Uri;
 import android.webkit.CookieManager;
 
@@ -41,14 +43,14 @@ public class WebView {
 		}
 		
 		public void run() {
-			Rhodes r = RhodesInstance.getInstance();
+			RhodesService r = RhodesService.getInstance();
 			r.getMainView().navigate(url, index);
 		}
 	};
 	
 	private static class NavigateBackTask implements Runnable {
 		public void run() {
-			Rhodes r = RhodesInstance.getInstance();
+			RhodesService r = RhodesService.getInstance();
 			r.getMainView().goBack();
 		}
 	};
@@ -61,23 +63,7 @@ public class WebView {
 		}
 		
 		public void run() {
-			RhodesInstance.getInstance().getMainView().reload(index);
-		}
-	};
-	
-	private static class IntHolder {
-		public int value;
-	};
-	
-	private static class ActiveTabTask implements Runnable {
-		private IntHolder ret;
-		
-		public ActiveTabTask(IntHolder r) {
-			ret = r;
-		}
-		
-		public void run() {
-			ret.value = RhodesInstance.getInstance().getMainView().activeTab();
+			RhodesService.getInstance().getMainView().reload(index);
 		}
 	};
 	
@@ -99,7 +85,7 @@ public class WebView {
 
 	public static void navigate(String url, int index) {
 		try {
-			Rhodes.performOnUiThread(new NavigateTask(url, index), false);
+			PerformOnUiThread.exec(new NavigateTask(url, index), false);
 		}
 		catch (Exception e) {
 			reportFail("navigate", e);
@@ -108,7 +94,7 @@ public class WebView {
 	
 	public static void navigateBack() {
 		try {
-			Rhodes.performOnUiThread(new NavigateBackTask(), false);
+			PerformOnUiThread.exec(new NavigateBackTask(), false);
 		}
 		catch (Exception e) {
 			reportFail("navigateBack", e);
@@ -117,7 +103,7 @@ public class WebView {
 	
 	public static void refresh(int index) {
 		try {
-			Rhodes.performOnUiThread(new RefreshTask(index), false);
+			PerformOnUiThread.exec(new RefreshTask(index), false);
 		}
 		catch (Exception e) {
 			reportFail("refresh", e);
@@ -126,9 +112,7 @@ public class WebView {
 	
 	public static int activeTab() {
 		try {
-			IntHolder v = new IntHolder();
-			Rhodes.performOnUiThread(new ActiveTabTask(v), true);
-			return v.value;
+			return RhodesService.getInstance().getMainView().activeTab();
 		}
 		catch (Exception e) {
 			reportFail("activeTab", e);
@@ -139,7 +123,7 @@ public class WebView {
 	
 	public static void executeJs(String js, int index) {
 		try {
-			Rhodes.performOnUiThread(new NavigateTask("javascript:" + js, index), false);
+			PerformOnUiThread.exec(new NavigateTask("javascript:" + js, index), false);
 		}
 		catch (Exception e) {
 			reportFail("executeJs", e);
@@ -148,7 +132,7 @@ public class WebView {
 	
 	public static void setCookie(String url, String cookie) {
 		try {
-			Rhodes.performOnUiThread(new SetCookieTask(url, cookie), false);
+			PerformOnUiThread.exec(new SetCookieTask(url, cookie), false);
 		}
 		catch (Exception e) {
 			reportFail("setCookie", e);

data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java

@@ -45,8 +45,9 @@ import android.widget.TextView;
 import com.rhomobile.rhodes.AndroidR;
 import com.rhomobile.rhodes.Capabilities;
 import com.rhomobile.rhodes.Logger;
-import com.rhomobile.rhodes.Rhodes;
-import com.rhomobile.rhodes.RhodesInstance;
+import com.rhomobile.rhodes.RhodesService;
+import com.rhomobile.rhodes.file.RhoFileApi;
+import com.rhomobile.rhodes.util.PerformOnUiThread;
 
 public class Alert {
 	
@@ -111,7 +112,7 @@ public class Alert {
 			String callback = null;
 			Vector<CustomButton> buttons = new Vector<CustomButton>();
 			
-			Rhodes r = RhodesInstance.getInstance();
+			Context ctx = RhodesService.getInstance().getContext();
 			
 			if (params instanceof String) {
 				message = (String)params;
@@ -132,14 +133,14 @@ public class Alert {
 				if (iconObj != null && (iconObj instanceof String)) {
 					String iconName = (String)iconObj;
 					if (iconName.equalsIgnoreCase("alert"))
-						icon = r.getResources().getDrawable(AndroidR.drawable.alert_alert);
+						icon = ctx.getResources().getDrawable(AndroidR.drawable.alert_alert);
 					else if (iconName.equalsIgnoreCase("question"))
-						icon = r.getResources().getDrawable(AndroidR.drawable.alert_question);
+						icon = ctx.getResources().getDrawable(AndroidR.drawable.alert_question);
 					else if (iconName.equalsIgnoreCase("info"))
-						icon = r.getResources().getDrawable(AndroidR.drawable.alert_info);
+						icon = ctx.getResources().getDrawable(AndroidR.drawable.alert_info);
 					else {
-						iconName = r.getRootPath() + "/apps/" + iconName;
-						Bitmap bitmap = BitmapFactory.decodeFile(iconName);
+						String iconPath = RhoFileApi.normalizePath("apps/" + iconName);
+						Bitmap bitmap = BitmapFactory.decodeStream(RhoFileApi.open(iconPath));
 						if (bitmap != null)
 							icon = new BitmapDrawable(bitmap);
 					}
@@ -184,17 +185,17 @@ public class Alert {
 			if (message == null)
 				return;
 			
-			Dialog dialog = new Dialog(r);
+			Dialog dialog = new Dialog(ctx);
 			dialog.setTitle(title);
 			dialog.setCancelable(false);
 			dialog.setCanceledOnTouchOutside(false);
 			
-			LinearLayout main = new LinearLayout(r);
+			LinearLayout main = new LinearLayout(ctx);
 			main.setOrientation(LinearLayout.VERTICAL);
 			main.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT));
 			main.setPadding(10, 10, 10, 10);
 			
-			LinearLayout top = new LinearLayout(r);
+			LinearLayout top = new LinearLayout(ctx);
 			top.setOrientation(LinearLayout.HORIZONTAL);
 			top.setGravity(Gravity.CENTER);
 			top.setPadding(10, 10, 10, 10);
@@ -202,20 +203,20 @@ public class Alert {
 			main.addView(top);
 			
 			if (icon != null) {
-				ImageView imgView = new ImageView(r);
+				ImageView imgView = new ImageView(ctx);
 				imgView.setImageDrawable(icon);
 				imgView.setScaleType(ImageView.ScaleType.CENTER);
 				imgView.setPadding(10, 10, 10, 10);
 				top.addView(imgView);
 			}
 			
-			TextView textView = new TextView(r);
+			TextView textView = new TextView(ctx);
 			textView.setText(message);
 			textView.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
 			textView.setGravity(Gravity.CENTER);
 			top.addView(textView);
 			
-			LinearLayout bottom = new LinearLayout(r);
+			LinearLayout bottom = new LinearLayout(ctx);
 			bottom.setOrientation(buttons.size() > 3 ? LinearLayout.VERTICAL : LinearLayout.HORIZONTAL);
 			bottom.setGravity(Gravity.CENTER);
 			bottom.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
@@ -223,7 +224,7 @@ public class Alert {
 			
 			for (int i = 0, lim = buttons.size(); i < lim; ++i) {
 				CustomButton btn = buttons.elementAt(i);
-				Button button = new Button(r);
+				Button button = new Button(ctx);
 				button.setText(btn.title);
 				button.setOnClickListener(new ShowDialogListener(callback, btn.id, btn.title, dialog));
 				button.setLayoutParams(new LinearLayout.LayoutParams(
@@ -255,7 +256,7 @@ public class Alert {
 	public static void showPopup(Object params) {
 		try {
 			Logger.T(TAG, "showPopup");
-			Rhodes.performOnUiThread(new ShowDialog(params), false);
+			PerformOnUiThread.exec(new ShowDialog(params), false);
 		}
 		catch (Exception e) {
 			reportFail("showPopup", e);
@@ -265,7 +266,7 @@ public class Alert {
 	public static void hidePopup() {
 		try {
 			Logger.T(TAG, "hidePopup");
-			Rhodes.performOnUiThread(new HideDialog(), false);
+			PerformOnUiThread.exec(new HideDialog(), false);
 		}
 		catch (Exception e) {
 			reportFail("hidePopup", e);
@@ -277,8 +278,8 @@ public class Alert {
 			if (!Capabilities.VIBRATE_ENABLED)
 				throw new IllegalAccessException("VIBRATE disabled");
 			Logger.T(TAG, "vibrate: " + duration);
-			Rhodes instance = RhodesInstance.getInstance();
-			Vibrator vibrator = (Vibrator)instance.getSystemService(Context.VIBRATOR_SERVICE);
+			Context ctx = RhodesService.getInstance().getContext();
+			Vibrator vibrator = (Vibrator)ctx.getSystemService(Context.VIBRATOR_SERVICE);
 			vibrator.vibrate(duration);
 		}
 		catch (Exception e) {
@@ -296,9 +297,11 @@ public class Alert {
 					return false;
 				}
 			});
-			File f = new File(RhodesInstance.getInstance().getRootPath());
-			f = new File(f, "apps");
+			fileName = RhoFileApi.normalizePath("apps/" + fileName);
+			File f = new File(RhodesService.getInstance().getRootPath());
 			f = new File(f, fileName);
+			if (!f.exists())
+				RhoFileApi.copy(fileName);
 			String source = f.getCanonicalPath();
 			Logger.T(TAG, "Final file name: " + source);
 			mp.setDataSource(source);

data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java

@@ -26,21 +26,21 @@ import android.content.Intent;
 
 import com.rhomobile.rhodes.Capabilities;
 import com.rhomobile.rhodes.Logger;
-import com.rhomobile.rhodes.Rhodes;
-import com.rhomobile.rhodes.RhodesInstance;
+import com.rhomobile.rhodes.RhodesService;
+import com.rhomobile.rhodes.util.PerformOnUiThread;
 
 public class Camera {
 
 	private static final String TAG = "Camera";
 	
-	public static final String INTENT_EXTRA_PREFIX = Rhodes.INTENT_EXTRA_PREFIX + "camera.";
+	public static final String INTENT_EXTRA_PREFIX = RhodesService.INTENT_EXTRA_PREFIX + "camera.";
 	
 	private static void reportFail(String name, Exception e) {
 		Logger.E(TAG, "Call of \"" + name + "\" failed: " + e.getMessage());
 	}
 	
 	private static void init() {
-		File f = new File(Rhodes.getBlobPath());
+		File f = new File(RhodesService.getBlobPath());
 		if (!f.exists())
 			f.mkdirs();
 	}
@@ -70,8 +70,8 @@ public class Camera {
 		
 		public void run() {
 			init();
-			Rhodes r = RhodesInstance.getInstance();
-			Intent intent = new Intent(r, klass);
+			RhodesService r = RhodesService.getInstance();
+			Intent intent = new Intent(r.getContext(), klass);
 			intent.putExtra(INTENT_EXTRA_PREFIX + "callback", url);
 			r.startActivity(intent);
 		}
@@ -81,7 +81,7 @@ public class Camera {
 		try {
 			Runnable runnable = Capabilities.CAMERA_ENABLED ? new Picture(url, ImageCapture.class) :
 				new CameraDisabled(url);
-			Rhodes.performOnUiThread(runnable, false);
+			PerformOnUiThread.exec(runnable, false);
 		}
 		catch (Exception e) {
 			reportFail("takePicture", e);
@@ -90,7 +90,7 @@ public class Camera {
 
 	public static void choosePicture(String url) {
 		try {
-			Rhodes.performOnUiThread(new Picture(url, FileList.class), false);
+			PerformOnUiThread.exec(new Picture(url, FileList.class), false);
 		}
 		catch (Exception e) {
 			reportFail("choosePicture", e);

data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/FileList.java

@@ -27,10 +27,10 @@ import java.util.List;
 
 import com.rhomobile.rhodes.AndroidR;
 import com.rhomobile.rhodes.Logger;
-import com.rhomobile.rhodes.Rhodes;
+import com.rhomobile.rhodes.RhoActivity;
+import com.rhomobile.rhodes.RhodesService;
 import com.rhomobile.rhodes.Utils;
 
-import android.app.Activity;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -46,7 +46,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.AdapterView.OnItemClickListener;
 
-public class FileList extends Activity implements OnClickListener{
+public class FileList extends RhoActivity implements OnClickListener{
 
 	private static final String TAG = "FileList";
 	
@@ -78,7 +78,7 @@ public class FileList extends Activity implements OnClickListener{
 	public void onCreate(Bundle icicle) {
 		super.onCreate(icicle);
 
-		getWindow().setFlags(Rhodes.WINDOW_FLAGS, Rhodes.WINDOW_MASK);
+		getWindow().setFlags(RhodesService.WINDOW_FLAGS, RhodesService.WINDOW_MASK);
 		setContentView(AndroidR.layout.directory_list);
 		
 		Bundle extras = getIntent().getExtras();
@@ -134,7 +134,7 @@ public class FileList extends Activity implements OnClickListener{
 		try {
 			String dst = null;
 			if (file != null && file.length() > 0) {
-				dst = Rhodes.getBlobPath() + "/" + Utils.getBaseName(file);
+				dst = RhodesService.getBlobPath() + "/" + Utils.getBaseName(file);
 				Utils.copy(file, dst);
 			}
 			com.rhomobile.rhodes.camera.Camera.doCallback(callbackUrl, dst == null ? "" : dst);

data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java

@@ -26,9 +26,9 @@ import java.util.Date;
 
 import com.rhomobile.rhodes.AndroidR;
 import com.rhomobile.rhodes.Logger;
-import com.rhomobile.rhodes.Rhodes;
+import com.rhomobile.rhodes.RhoActivity;
+import com.rhomobile.rhodes.RhodesService;
 
-import android.app.Activity;
 import android.content.ContentValues;
 import android.graphics.PixelFormat;
 import android.hardware.Camera;
@@ -45,7 +45,8 @@ import android.view.WindowManager;
 import android.view.View.OnClickListener;
 import android.widget.ImageButton;
 
-public class ImageCapture extends Activity implements SurfaceHolder.Callback, OnClickListener {
+public class ImageCapture extends RhoActivity implements SurfaceHolder.Callback, OnClickListener, Camera.AutoFocusCallback
+ {
 	
 	private static final String TAG = "ImageCapture";
 	
@@ -58,6 +59,8 @@ public class ImageCapture extends Activity implements SurfaceHolder.Callback, On
 	private SurfaceHolder surfaceHolder;
 	private ImageButton cameraButton;
 
+	boolean mIsActive = true;
+
 	// private Uri target = Media.EXTERNAL_CONTENT_URI;
 
 	@Override
@@ -90,6 +93,7 @@ public class ImageCapture extends Activity implements SurfaceHolder.Callback, On
 		public void onPictureTaken(byte[] data, Camera c) {
 			Logger.D(TAG, "PICTURE CALLBACK RAW");
 			camera.startPreview();
+			startAutoFocusIfExist();
 		}
 	};
 
@@ -144,6 +148,7 @@ public class ImageCapture extends Activity implements SurfaceHolder.Callback, On
 			camera.setParameters(p);
 			camera.setPreviewDisplay(holder);
 			camera.startPreview();
+			startAutoFocusIfExist();
 			isPreviewRunning = true;
 		} catch (Exception e) {
 			Logger.E(TAG, e.getMessage());
@@ -161,10 +166,15 @@ public class ImageCapture extends Activity implements SurfaceHolder.Callback, On
 	public void onClick(View v) {
 		if (v.getId() == AndroidR.id.cameraButton) {
 			takePicture();
+			cameraButton.setVisibility(View.INVISIBLE);
+			
 		}
 	}
 	
 	private void takePicture() {
+		if (!mIsActive) {
+			return;
+		}
 		ImageCaptureCallback iccb = null;
 		try {
 			String filename = "Image_" + timeStampFormat.format(new Date());
@@ -177,14 +187,26 @@ public class ImageCapture extends Activity implements SurfaceHolder.Callback, On
 
 			Uri uri = getContentResolver().insert(Media.EXTERNAL_CONTENT_URI, values);
 			// String filename = timeStampFormat.format(new Date());
-			String dir = Rhodes.getBlobPath();
+			String dir = RhodesService.getBlobPath();
 			
 			OutputStream osCommon = getContentResolver().openOutputStream(uri);
-			iccb = new ImageCaptureCallback(callbackUrl, osCommon, dir + "/" + filename + ".jpg");
+			iccb = new ImageCaptureCallback(this, callbackUrl, osCommon, dir + "/" + filename + ".jpg");
 		} catch (Exception ex) {
 			Logger.E(TAG, ex.getMessage());
 		}
 		
 		camera.takePicture(mShutterCallback, mPictureCallbackRaw, iccb);
+		mIsActive = false;
+	}
+
+                        private void startAutoFocusIfExist() {
+		//this only from API v.5 and higher
+		//String focus_mode = camera.getParameters().getFocusMode();
+		//if ((focus_mode != Camera.Parameters.FOCUS_MODE_FIXED) && (focus_mode != Camera.Parameters.FOCUS_MODE_INFINITY)) {
+			camera.autoFocus(this);
+		//}
+                        }
+
+	public void onAutoFocus (boolean success, Camera camera) {
 	}
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCaptureCallback.java

@@ -32,11 +32,13 @@ public class ImageCaptureCallback implements PictureCallback {
 	
 	private static final String TAG = "ImageCapture";
 
+	private ImageCapture mOwner;
 	private String callbackUrl;
 	private OutputStream osCommon;
 	private String filePath;
 
-	public ImageCaptureCallback(String u, OutputStream o, String f) {
+	public ImageCaptureCallback(ImageCapture owner, String u, OutputStream o, String f) {
+		mOwner = owner;
 		callbackUrl = u;
 		osCommon = o;
 		filePath = f;
@@ -56,6 +58,7 @@ public class ImageCaptureCallback implements PictureCallback {
 			osOwn.close();
 
 			com.rhomobile.rhodes.camera.Camera.doCallback(callbackUrl, filePath);
+			mOwner.finish();
 
 		} catch (Exception e) {
 			Logger.E(TAG, e);

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

@@ -23,14 +23,13 @@ package com.rhomobile.rhodes.datetime;
 import android.content.Intent;
 
 import com.rhomobile.rhodes.Logger;
-import com.rhomobile.rhodes.Rhodes;
-import com.rhomobile.rhodes.RhodesInstance;
+import com.rhomobile.rhodes.RhodesService;
 
 public class DateTimePicker {
 	
 	private static final String TAG = "DateTimePicker";
 	
-	public static final String INTENT_EXTRA_PREFIX = Rhodes.INTENT_EXTRA_PREFIX + "datetime.";
+	public static final String INTENT_EXTRA_PREFIX = RhodesService.INTENT_EXTRA_PREFIX + "datetime.";
 	
 	private static void reportFail(String name, Exception e) {
 		Logger.E(TAG, "Call of \"" + name + "\" failed: " + e.getMessage());
@@ -38,8 +37,8 @@ public class DateTimePicker {
 
 	public static void choose(String callback, String title, long init, int v, byte[] opaque) {
 		try {
-			Rhodes r = RhodesInstance.getInstance();
-			Intent intent = new Intent(r, DateTimePickerScreen.class);
+			RhodesService r = RhodesService.getInstance();
+			Intent intent = new Intent(r.getContext(), DateTimePickerScreen.class);
 			intent.putExtra(INTENT_EXTRA_PREFIX + "callback", callback);
 			intent.putExtra(INTENT_EXTRA_PREFIX + "title", title);
 			intent.putExtra(INTENT_EXTRA_PREFIX + "init", init);

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

@@ -24,9 +24,9 @@ import java.util.Date;
 
 import com.rhomobile.rhodes.AndroidR;
 import com.rhomobile.rhodes.Logger;
-import com.rhomobile.rhodes.Rhodes;
+import com.rhomobile.rhodes.RhoActivity;
+import com.rhomobile.rhodes.RhodesService;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -34,7 +34,7 @@ import android.widget.Button;
 import android.widget.DatePicker;
 import android.widget.TimePicker;
 
-public class DateTimePickerScreen extends Activity {
+public class DateTimePickerScreen extends RhoActivity {
 	
 	private static final String TAG = "DateTimePicker";
 	
@@ -76,7 +76,7 @@ public class DateTimePickerScreen extends Activity {
 		super.onCreate(icicle);
 		Logger.D(TAG, "onCreate");
 		
-		getWindow().setFlags(Rhodes.WINDOW_FLAGS, Rhodes.WINDOW_MASK);
+		getWindow().setFlags(RhodesService.WINDOW_FLAGS, RhodesService.WINDOW_MASK);
 		setContentView(AndroidR.layout.datetime);
 		
 		Bundle extras = this.getIntent().getExtras();