rhodes 2.3.2 → 2.4.0.beta.1

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

@@ -0,0 +1,354 @@
+package com.rhomobile.rhodes.alert;
+
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.Vector;
+
+import com.rhomobile.rhodes.AndroidR;
+import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.RhodesService;
+import com.rhomobile.rhodes.file.RhoFileApi;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.View;
+import android.view.WindowManager;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup.LayoutParams;
+import android.view.Window;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+public class PopupActivity extends Activity {
+	
+	private static final String TAG = PopupActivity.class.getSimpleName();
+	
+	private static final String INTENT_EXTRA_PREFIX = RhodesService.INTENT_EXTRA_PREFIX + ".popup";
+	
+	private static Dialog currentAlert = null;
+	private static TextView s_textView = null;
+	
+	private static native void doCallback(String url, String id, String title);
+	
+	private static class CustomButton {
+		
+		public String id;
+		public String title;
+		
+		public CustomButton(String i, String t) {
+			id = i;
+			title = t;
+		}
+	};
+	
+	private static class ShowDialogListener implements OnClickListener {
+
+		private String callback;
+		private String id;
+		private String title;
+		private Dialog dialog;
+		
+		public ShowDialogListener(String c, String i, String t, Dialog d) {
+			callback = c;
+			id = i;
+			title = t;
+			dialog = d;
+		}
+		
+		public void onClick(View arg0) {
+			if (callback != null) {
+				doCallback(callback, Uri.encode(id), Uri.encode(title));
+			}
+			dialog.dismiss();
+			currentAlert = null;
+		}
+		
+	};
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		
+		Window window = getWindow();
+		WindowManager.LayoutParams lp = window.getAttributes();
+		lp.type = WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG;
+		window.setAttributes(lp);
+		window.addFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+		
+		Bundle extras = getIntent().getExtras();
+		if (extras == null) {
+			Log.e(TAG, "No data passed to popup activity");
+			finish();
+			return;
+		}
+		
+		String title = extras.getString(INTENT_EXTRA_PREFIX + ".title");
+		String message = extras.getString(INTENT_EXTRA_PREFIX + ".message");
+		String iconName = extras.getString(INTENT_EXTRA_PREFIX + ".icon");
+		String callback = extras.getString(INTENT_EXTRA_PREFIX + ".callback");
+		
+		ArrayList<String> buttonIds = new ArrayList<String>();
+		Object idsObj = extras.get(INTENT_EXTRA_PREFIX + ".buttons.ids");
+		if (idsObj != null) {
+			if (idsObj instanceof String[]) {
+				String[] ids = (String[])idsObj; 
+				for (int i = 0; i < ids.length; ++i)
+					buttonIds.add(ids[i]);
+			}
+			else if (idsObj instanceof ArrayList<?>) {
+				ArrayList<?> ids = (ArrayList<?>)idsObj;
+				for (Object idObj : ids)
+					buttonIds.add(idObj.toString());
+			}
+		}
+		ArrayList<String> buttonTitles = new ArrayList<String>();
+		Object titlesObj = extras.get(INTENT_EXTRA_PREFIX + ".buttons.titles");
+		if (titlesObj != null) {
+			if (titlesObj instanceof String[]) {
+				String[] titles = (String[])titlesObj;
+				for (int i = 0; i < titles.length; ++i)
+					buttonTitles.add(titles[i]);
+			}
+			else if (titlesObj instanceof ArrayList<?>) {
+				ArrayList<?> titles = (ArrayList<?>)titlesObj;
+				for (Object titleObj : titles)
+					buttonTitles.add(titleObj.toString());
+			}
+		}
+		
+		Vector<CustomButton> buttons = new Vector<CustomButton>();
+		if (buttonIds.size() != buttonTitles.size()) {
+			Log.e(TAG, "Corrupted data passed to popup activity");
+			finish();
+			return;
+		}
+		
+		for (int i = 0; i < buttonIds.size(); ++i)
+			buttons.addElement(new CustomButton(buttonIds.get(i), buttonTitles.get(i)));
+		
+		Resources res = getResources();
+		Drawable icon = null;
+		if (iconName != null) {
+			if (iconName.equalsIgnoreCase("alert"))
+				icon = res.getDrawable(AndroidR.drawable.alert_alert);
+			else if (iconName.equalsIgnoreCase("question"))
+				icon = res.getDrawable(AndroidR.drawable.alert_question);
+			else if (iconName.equalsIgnoreCase("info"))
+				icon = res.getDrawable(AndroidR.drawable.alert_info);
+			else {
+				String iconPath = RhoFileApi.normalizePath("apps/" + iconName);
+				Bitmap bitmap = BitmapFactory.decodeStream(RhoFileApi.open(iconPath));
+				if (bitmap != null)
+					icon = new BitmapDrawable(bitmap);
+			}
+		}
+		
+		createDialog(title, message, icon, buttons, callback);
+	}
+	
+	private void createDialog(String title, String message, Drawable icon, Vector<CustomButton> buttons, String callback) {
+		Context ctx = this;
+		
+		int nTopPadding = 10;
+        
+		Dialog dialog = new Dialog(ctx);
+		if ( title == null || title.length() == 0 ) {
+			dialog.getWindow();
+			dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+		} else    
+		{
+		    dialog.setTitle(title);
+		    nTopPadding = 0;
+		}
+		
+		dialog.setCancelable(false);
+		dialog.setCanceledOnTouchOutside(false);
+		
+		LinearLayout main = new LinearLayout(ctx);
+		main.setOrientation(LinearLayout.VERTICAL);
+		main.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.FILL_PARENT));
+		main.setPadding(10, nTopPadding, 10, 10);
+		
+		LinearLayout top = new LinearLayout(ctx);
+		top.setOrientation(LinearLayout.HORIZONTAL);
+		top.setGravity(Gravity.CENTER);
+		top.setPadding(10, nTopPadding, 10, 10);
+		top.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
+		main.addView(top);
+		
+		if (icon != null) {
+			ImageView imgView = new ImageView(ctx);
+			imgView.setImageDrawable(icon);
+			imgView.setScaleType(ImageView.ScaleType.CENTER);
+			imgView.setPadding(10, nTopPadding, 10, 10);
+			top.addView(imgView);
+		}
+		
+		if ( message != null )
+		{
+		    TextView textView = new TextView(ctx);
+		    s_textView = textView;
+		    textView.setText(message);
+		    textView.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
+		    textView.setGravity(Gravity.CENTER);
+		    top.addView(textView);
+        }
+		
+		LinearLayout bottom = new LinearLayout(ctx);
+		bottom.setOrientation(buttons.size() > 3 ? LinearLayout.VERTICAL : LinearLayout.HORIZONTAL);
+		bottom.setGravity(Gravity.CENTER);
+		bottom.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
+		main.addView(bottom);
+		
+		for (int i = 0, lim = buttons.size(); i < lim; ++i) {
+			final CustomButton btn = buttons.elementAt(i);
+			Button button = new Button(ctx);
+			button.setText(btn.title);
+			button.setOnClickListener(new ShowDialogListener(callback, btn.id, btn.title, dialog));
+			button.setLayoutParams(new LinearLayout.LayoutParams(
+					lim > 3 ? LayoutParams.MATCH_PARENT : LayoutParams.WRAP_CONTENT,
+					LayoutParams.WRAP_CONTENT, 1));
+			bottom.addView(button);
+		}
+		
+		dialog.setContentView(main);
+		
+		dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
+			@Override
+			public void onCancel(DialogInterface dialog) {
+				finish();
+			}
+		});
+		dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+			@Override
+			public void onDismiss(DialogInterface dialog) {
+				finish();
+			}
+		});
+		
+		dialog.show();
+		
+		currentAlert = dialog;
+	}
+	
+	public static void showDialog(Object params) {
+		showDialog(RhodesService.getInstance(), params);
+	}
+	
+	@SuppressWarnings("unchecked")
+	public static void showDialog(Context ctx, Object params) {
+		String title = "";
+		String message = null;
+		String icon = null;
+		String callback = null;
+		ArrayList<String> buttonIds = new ArrayList<String>();
+		ArrayList<String> buttonTitles = new ArrayList<String>();
+		
+		if (params instanceof String) {
+			message = (String)params;
+			buttonIds.add("OK");
+			buttonTitles.add("OK");
+		}
+		else if (params instanceof Map<?,?>) {
+			Map<Object, Object> hash = (Map<Object, Object>)params;
+			
+			Object titleObj = hash.get("title");
+			if (titleObj != null && (titleObj instanceof String))
+				title = (String)titleObj;
+			
+			Object messageObj = hash.get("message");
+			if (messageObj != null && (messageObj instanceof String))
+				message = (String)messageObj;
+			
+			Object iconObj = hash.get("icon");
+			if (iconObj != null && (iconObj instanceof String))
+				icon = (String)iconObj;
+			
+			Object callbackObj = hash.get("callback");
+			if (callbackObj != null && (callbackObj instanceof String))
+				callback = (String)callbackObj;
+			
+			Object buttonsObj = hash.get("buttons");
+			if (buttonsObj != null && (buttonsObj instanceof Vector<?>)) {
+				Vector<Object> btns = (Vector<Object>)buttonsObj;
+				for (int i = 0; i < btns.size(); ++i) {
+					String itemId = null;
+					String itemTitle = null;
+					
+					Object btnObj = btns.elementAt(i);
+					if (btnObj instanceof String) {
+						itemId = (String)btnObj;
+						itemTitle = (String)btnObj;
+					}
+					else if (btnObj instanceof Map<?,?>) {
+						Map<Object, Object> btnHash = (Map<Object, Object>)btnObj;
+						Object btnIdObj = btnHash.get("id");
+						if (btnIdObj != null && (btnIdObj instanceof String))
+							itemId = (String)btnIdObj;
+						Object btnTitleObj = btnHash.get("title");
+						if (btnTitleObj != null && (btnTitleObj instanceof String))
+							itemTitle = (String)btnTitleObj;
+					}
+					
+					if (itemId == null || itemTitle == null) {
+						Logger.E(TAG, "Incomplete button item");
+						continue;
+					}
+					
+					buttonIds.add(itemId);
+					buttonTitles.add(itemTitle);
+				}
+			}
+		}
+		
+		Intent intent = new Intent(ctx, PopupActivity.class);
+		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NO_USER_ACTION);
+		intent.putExtra(INTENT_EXTRA_PREFIX + ".title", title);
+		intent.putExtra(INTENT_EXTRA_PREFIX + ".message", message);
+		intent.putExtra(INTENT_EXTRA_PREFIX + ".icon", icon);
+		intent.putExtra(INTENT_EXTRA_PREFIX + ".callback", callback);
+		intent.putExtra(INTENT_EXTRA_PREFIX + ".buttons.ids", buttonIds);
+		intent.putExtra(INTENT_EXTRA_PREFIX + ".buttons.titles", buttonTitles);
+		ctx.startActivity(intent);
+	}
+
+	public static void showStatusDialog(String title, String message, String hide) {
+		showStatusDialog(RhodesService.getInstance(), title, message, hide);
+	}
+	
+	public static void showStatusDialog(Context ctx, String title, String message, String hide) {
+		if (currentAlert != null) {
+			s_textView.setText(message);
+			return;
+		}
+		
+		Intent intent = new Intent(ctx, PopupActivity.class);
+		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NO_USER_ACTION);
+		intent.putExtra(INTENT_EXTRA_PREFIX + ".title", title);
+		intent.putExtra(INTENT_EXTRA_PREFIX + ".message", message);
+		intent.putExtra(INTENT_EXTRA_PREFIX + ".buttons.ids", new String[] {hide});
+		intent.putExtra(INTENT_EXTRA_PREFIX + ".buttons.titles", new String[] {hide});
+		ctx.startActivity(intent);
+	}
+	
+	public static void hidePopup() {
+		if (currentAlert == null)
+			return;
+		currentAlert.dismiss();
+		currentAlert = null;
+	}
+}

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

@@ -151,6 +151,10 @@ public class DateTimePickerScreen extends BaseActivity {
 	
 	private OnClickListener mOkListener = new OnClickListener() {
 		public void onClick(View arg0) {
+			//These force values from internal edit fields being parsed.
+			_datePicker.clearFocus();
+			_timePicker.clearFocus();
+			
 			_init.set(Calendar.YEAR, _datePicker.getYear());
 			_init.set(Calendar.MONTH, _datePicker.getMonth());
 			_init.set(Calendar.DAY_OF_MONTH, _datePicker.getDayOfMonth());

data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/EventStore.java

@@ -12,7 +12,6 @@ import android.os.Build;
 
 import com.rhomobile.rhodes.Capabilities;
 import com.rhomobile.rhodes.Logger;
-import com.rhomobile.rhodes.RhodesActivity;
 import com.rhomobile.rhodes.RhodesService;
 
 public class EventStore {
@@ -305,7 +304,7 @@ public class EventStore {
 			}
 			else {
 				Logger.D(TAG, " use new delete scheme");
-				int idn = Integer.decode(id).intValue();
+				//int idn = Integer.decode(id).intValue();
 				Uri du = Uri.withAppendedPath(EVENTS_URI, id);
 				rows = r.delete(du, null, null);
 				//rows = r.delete(EVENTS_URI, "_id=?", new String[] {id});

data/platform/android/Rhodes/src/com/rhomobile/rhodes/file/RhoFileApi.java

@@ -2,6 +2,7 @@ package com.rhomobile.rhodes.file;
 
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileDescriptor;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -9,14 +10,18 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
 
+import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.RhodesService;
 
 import android.content.res.AssetManager;
+import android.os.ParcelFileDescriptor;
 
 public class RhoFileApi {
 	
-	//private static final String TAG = "RhoFileApiJava";
+	private static final String TAG = RhoFileApi.class.getSimpleName();
 	
 	private static final int MAX_SIZE = 2*1024*1024;
 	
@@ -26,8 +31,9 @@ public class RhoFileApi {
 	private static native void updateStatTable(String path, String type, long size, long mtime);
 	
 	public static native String normalizePath(String path);
+    public static native String absolutePath(String path);
 	
-	private static native boolean needJavaWay(String path);
+	private static native boolean needEmulate(String path);
 	private static native String makeRelativePath(String path);
 	
 	private static void fillStatTable() throws IOException
@@ -120,7 +126,7 @@ public class RhoFileApi {
 	public static InputStream open(String path)
 	{
 		//Log.d(TAG, "open: " + path);
-		if (needJavaWay(path)) {
+		if (needEmulate(path)) {
 			String relPath = makeRelativePath(path);
 			//Log.d(TAG, "open: (1): " + relPath);
 			return openInPackage(relPath);
@@ -133,7 +139,42 @@ public class RhoFileApi {
 			return null;
 		}
 	}
-	
+
+    private static void forceFile(String path)
+    {
+        String relPath = makeRelativePath(path);
+        if(copy(relPath))
+            Logger.D(TAG, "File extracted from package to file system: " + path);
+    }
+
+    public static FileDescriptor openFd(String path)
+    {
+        forceFile(path);
+        try {
+            Logger.D(TAG, "Opening file from file system: " + absolutePath(path));
+
+            FileInputStream fs = new FileInputStream(absolutePath(path));
+            return fs.getFD();
+        } catch (Exception e) {
+            Logger.E(TAG, "Can not open file descriptor: " + e.getMessage());
+            return null;
+        }
+    }
+
+    public static ParcelFileDescriptor openParcelFd(String path)
+    {
+        forceFile(path);
+        try {
+            Logger.D(TAG, "Opening file from file system: " + absolutePath(path));
+
+            File file = new File(path);
+            return ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY);
+        } catch (FileNotFoundException e) {
+            Logger.E(TAG, "Can not open ParcelFileDescriptor" + e.getMessage());
+            return null;
+        }
+    }
+
 	public static InputStream openInPackage(String path)
 	{
 		try {
@@ -142,7 +183,7 @@ public class RhoFileApi {
 			is.mark(MAX_SIZE);
 			return is;
 		}
-		catch (Exception e) {
+		catch (IOException e) {
 			//Log.e(TAG, "Can not open " + path);
 			return null;
 		}
@@ -187,4 +228,29 @@ public class RhoFileApi {
 		}
 	}
 	
+	public static String[] getChildren(String path) {
+		try {
+			// Merge children from both packed assets and file system 
+			String[] list1 = am.list(path);
+			File f = new File(RhodesService.getInstance().getRootPath(), path);
+			String[] list2 = f.list();
+			
+			List<String> list = new ArrayList<String>();
+			if (list1 != null)
+				for (String child : list1)
+					list.add(child);
+			if (list2 != null)
+				for (String child : list2) {
+					if (list.contains(child))
+						continue;
+					list.add(child);
+				}
+			
+			return list.toArray(new String[] {});
+		}
+		catch (IOException e) {
+			return null;
+		}
+	}
+	
 }