rhodes 2.3.2 → 2.4.0.beta.1

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

@@ -3,8 +3,6 @@ package com.rhomobile.rhodes;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.rhomobile.rhodes.mainview.MainView;
-
 import android.view.Menu;
 import android.view.MenuItem;
 
@@ -60,45 +58,18 @@ public class RhoMenu {
 		
 		Item ri = (Item)obj;
 		
-		RhodesService r = RhodesService.getInstance();
-		MainView mainView = r.getMainView();
-		
 		String type = ri.type;
-		if (type.equalsIgnoreCase("refresh")) {
-			mainView.reload(mainView.activeTab());
-		}
-		else if (type.equalsIgnoreCase("home")) {
-			mainView.navigate(RhodesAppOptions.getStartUrl(), mainView.activeTab());
-		}
-		else if (type.equalsIgnoreCase("back")) {
-			mainView.back(mainView.activeTab());
-		}
-		else if (type.equalsIgnoreCase("forward")) {
-			mainView.forward(mainView.activeTab());
-		}
-		else if (type.equalsIgnoreCase("options")) {
-			mainView.navigate(RhodesAppOptions.getOptionsUrl(), mainView.activeTab());
-		}
-		else if (type.equalsIgnoreCase("sync")) {
-			r.doSyncAllSources(true);
-		}
-		else if (type.equalsIgnoreCase("log")) {
+		if (type.equalsIgnoreCase("log"))
 			RhodesService.showLogView();
-		}
-		else if (type.equalsIgnoreCase("logOptions")) {
+		else if (type.equalsIgnoreCase("logOptions"))
 			RhodesService.showLogOptions();
-		}
-		else if (type.equalsIgnoreCase("close") || type.equalsIgnoreCase("exit")) {
-			RhodesService.exit();
-		}
-		else if (type.equalsIgnoreCase("url")) {
-			String url = ri.url;
-			mainView.navigate(r.normalizeUrl(url), mainView.activeTab());
-		}
 		else {
-			Logger.E(TAG, "Unknown type of menu item: \"" + type + "\"");
-			return false;
+			String url = ri.type;
+			if (url.equalsIgnoreCase("url"))
+				url = ri.url;
+			RhodesService.loadUrl(url);
 		}
+		
 		return true;
 	}
 	

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

@@ -11,8 +11,8 @@ import com.rhomobile.rhodes.webview.RhoWebSettings;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.ServiceConnection;
 import android.graphics.Bitmap;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -33,11 +33,14 @@ public class RhodesActivity extends BaseActivity {
 	
 	private static final boolean DEBUG = false;
 	
+	private static final boolean USE_DELAYED_MAINVIEW_DISPLAY = false;
+	
 	public static boolean ENABLE_LOADING_INDICATION = true;
 	
 	public static int MAX_PROGRESS = 10000;
 	
 	static final String RHO_START_PARAMS_KEY = "RhoStartParams";
+	static final String RHO_URL_START_KEY = "RhoUrlStart";
 	
 	private static RhodesActivity sInstance;
 	
@@ -67,14 +70,31 @@ public class RhodesActivity extends BaseActivity {
 	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
+		
 		super.onCreate(savedInstanceState);
 		
 		Thread ct = Thread.currentThread();
 		//ct.setPriority(Thread.MAX_PRIORITY);
 		uiThreadId = ct.getId();
-
-		//requestWindowFeature(Window.FEATURE_NO_TITLE);
 		
+		Intent intent = getIntent();
+		//intent.putExtra(RHO_URL_START_KEY, "/app/BrowserStart");
+		//intent.putExtra(RHO_URL_PARAMS_KEY, "param1=value1&param2=value2");
+		//Log.d(TAG, "MY URI: " + intent.toUri(Intent.URI_INTENT_SCHEME));
+
+        // Check if we really started through URI
+        if(intent.getData() != null)
+        {
+            //Workaround to get URI string from intent since intent.getData() badly initialized
+            Log.d(TAG, "Application URI: " + intent.toUri(0));
+            RhodesApplication.setStartParameters(intent.toUri(0).toString());
+        }
+
+		if (!RhodesService.isEnableTitle()) {
+			requestWindowFeature(Window.FEATURE_NO_TITLE);
+		}
+		else {
+		}
 		requestWindowFeature(Window.FEATURE_PROGRESS);
 		getWindow().setFeatureInt(Window.FEATURE_PROGRESS, 10000);
 
@@ -166,7 +186,7 @@ public class RhodesActivity extends BaseActivity {
 				return false;
 			
 			MainView v = r.getMainView();
-			v.back(v.activeTab());
+			v.goBack();//back(v.activeTab());
 			return true;
 		}
 		
@@ -235,7 +255,7 @@ public class RhodesActivity extends BaseActivity {
 			}
 		};
 		
-		if (true/*!waitUntilNavigationDone*/) {
+		if (!USE_DELAYED_MAINVIEW_DISPLAY /* || !waitUntilNavigationDone*/) {
 			// Make new MainView visible right now
 			setMainViewVisible.run();
 		}
@@ -337,29 +357,32 @@ public class RhodesActivity extends BaseActivity {
 	public void onServiceConnected(ComponentName name, IBinder service) {
 		super.onServiceConnected(name, service);
 		
-		if (!isValidSecurityToken()) {
+		Bundle startParams = null;
+		Object params = getIntent().getExtras();
+		if (params != null && params instanceof Bundle)
+			startParams = (Bundle)params;
+		
+		String rhoStartParams = null;
+		if (startParams != null)
+			rhoStartParams = startParams.getString(RHO_START_PARAMS_KEY);
+		if (rhoStartParams == null)
+			rhoStartParams = "";
+		
+		if (!RhodesService.canStartApp(rhoStartParams, ", ")) {
 			Logger.E(TAG, "This is hidden app and can be started only with security key.");
 			getRhodesApplication().exit();
 			return;
 		}
 		
+		String urlStart = startParams == null ? null : startParams.getString(RHO_URL_START_KEY);
+		if (urlStart != null) {
+			Logger.D(TAG, "PROCESS URL START: " + urlStart);
+			RhoConf.setString("start_path", Uri.decode(urlStart));
+		}
+		
 		ENABLE_LOADING_INDICATION = !RhoConf.getBool("disable_loading_indication");
 	}
 
-	private boolean isValidSecurityToken() 
-	{
-	    String rho_start_params = "";
-	    
-		Object params = getIntent().getExtras();
-		if (params != null && params instanceof Bundle) 
-		{
-			Bundle startParams = (Bundle)params;
-			rho_start_params = startParams.getString(RHO_START_PARAMS_KEY);
-	    }
-	    
-	    return RhodesService.canStartApp(rho_start_params, ", ");
-	}
-	
 	public static Context getContext() {
 		RhodesActivity ra = RhodesActivity.getInstance();
 		if (ra == null)

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

@@ -14,6 +14,8 @@ public class RhodesApplication extends Application {
 		NativeLibraries.load();
 	}
 	
+	static native void setStartParameters(String uri);
+	
 	@Override
 	public void onCreate() {
 		super.onCreate();

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

@@ -26,6 +26,7 @@ import com.rhomobile.rhodes.ui.AboutDialog;
 import com.rhomobile.rhodes.ui.LogOptionsDialog;
 import com.rhomobile.rhodes.ui.LogViewDialog;
 import com.rhomobile.rhodes.uri.ExternalHttpHandler;
+import com.rhomobile.rhodes.uri.LocalFileHandler;
 import com.rhomobile.rhodes.uri.MailUriHandler;
 import com.rhomobile.rhodes.uri.SmsUriHandler;
 import com.rhomobile.rhodes.uri.TelUriHandler;
@@ -77,6 +78,7 @@ public class RhodesService extends Service {
 	
 	public static int WINDOW_FLAGS = WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN;
 	public static int WINDOW_MASK = WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN;
+	public static boolean ANDROID_TITLE = true;
 	
 	private static final int DOWNLOAD_PACKAGE_ID = 1;
 	
@@ -183,6 +185,9 @@ public class RhodesService extends Service {
 		return sInstance;
 	}
 	
+	public static native boolean isEnableTitle();
+	
+	
 	private void initRootPath() {
 		ApplicationInfo appInfo = getAppInfo();
 		String dataDir = appInfo.dataDir;
@@ -199,6 +204,8 @@ public class RhodesService extends Service {
 		f.mkdirs();
 		f = new File(sqliteJournalsPath);
 		f.mkdirs();
+		f = new File(mRootPath, "tmp");
+		f.mkdirs();
 		
 		String apkPath = appInfo.sourceDir;
 		
@@ -235,6 +242,7 @@ public class RhodesService extends Service {
 	
 	@Override
 	public void onCreate() {
+		
 		if (DEBUG)
 			Log.d(TAG, "+++ onCreate");
 		
@@ -257,17 +265,19 @@ public class RhodesService extends Service {
 		
 		if (Utils.isAppHashChanged()) {
 			try {
-				Log.i(TAG, "Application hash was changed, so remove files");
-				Utils.deleteChildrenIgnoreFirstLevel(new File(getRootPath(), "apps"), "rhoconfig.txt");
-				Utils.deleteRecursively(new File(getRootPath(), "lib"));
-/*				
-				String[] folders = {"apps", "lib"};
-				for (String folder : folders) {
-					File f = new File(getRootPath(), folder);
-					if (!f.exists())
-						continue;
-					Utils.deleteRecursively(f);
-				}*/
+				Log.i(TAG, "Application hash was changed");
+				
+				File libDir = new File(getRootPath(), "lib");
+				File testLib = new File(libDir.getPath(), "rhoframework.iseq");
+				if(libDir.isDirectory() && testLib.isFile())
+				{
+				    Log.i(TAG, "Updating from very old rhodes version, clean filesystem.");
+				    Utils.deleteChildrenIgnoreFirstLevel(new File(getRootPath(), "apps"), "rhoconfig.txt");
+				    Utils.deleteRecursively(libDir);
+				}
+				
+				LocalFileProvider.revokeUriPermissions(context);
+
 				initRootPath();
 				RhoFileApi.init();
 				RhoFileApi.copy("hash");
@@ -319,6 +329,7 @@ public class RhodesService extends Service {
 		
 		// Register custom uri handlers here
 		mUriHandlers.addElement(new ExternalHttpHandler(context));
+		mUriHandlers.addElement(new LocalFileHandler(context));
 		mUriHandlers.addElement(new MailUriHandler(context));
 		mUriHandlers.addElement(new TelUriHandler(context));
 		mUriHandlers.addElement(new SmsUriHandler(context));
@@ -443,10 +454,12 @@ public class RhodesService extends Service {
 				String id = intent.getStringExtra(PushReceiver.INTENT_REGISTRATION_ID);
 				if (id == null)
 					throw new IllegalArgumentException("Empty registration id received in service command");
+				Logger.D(TAG, "Received PUSH registration id: " + id);
 				setPushRegistrationId(id);
 				break;
 			case PushReceiver.INTENT_TYPE_MESSAGE:
 				Bundle extras = intent.getBundleExtra(PushReceiver.INTENT_EXTRAS);
+				Logger.D(TAG, "Received PUSH message: " + extras);
 				handlePushMessage(extras);
 				break;
 			default:
@@ -696,6 +709,14 @@ public class RhodesService extends Service {
 				return new Integer(getScreenWidth());
 			else if (name.equalsIgnoreCase("screen_height"))
 				return new Integer(getScreenHeight());
+			else if (name.equalsIgnoreCase("screen_orientation")) {
+				if (getScreenWidth() <= getScreenHeight()) {
+					return "portrait";
+				}
+				else {
+					return "landscape";
+				}
+			}
 			else if (name.equalsIgnoreCase("has_camera"))
 				return new Boolean(mCameraAvailable);
 			else if (name.equalsIgnoreCase("has_network"))
@@ -1040,22 +1061,31 @@ public class RhodesService extends Service {
 			Logger.E(TAG, "Can't uninstall application " + appName + ": " + e.getMessage());
 		}
 	}
-	
-	public static void openExternalUrl(String url) {
-		try {
-			Context ctx = RhodesService.getContext();
-            Uri uri = Uri.parse(url);			
-            
-		    Intent intent = new Intent(Intent.ACTION_VIEW);
-		    intent.setData(uri);
-		    
-		    ctx.startActivity(Intent.createChooser(intent, "Open in..."));
-		}
-		catch (Exception e) {
-			Logger.E(TAG, "Can't open url :" + url + ": " + e.getMessage());
-		}
-	}
-	
+
+    /** Opens remote or local URL*/
+    public static void openExternalUrl(String url)
+    {
+        try
+        {
+            if(url.charAt(0) == '/')
+                url = "file://" + RhoFileApi.absolutePath(url);
+
+            //FIXME: Use common URI handling
+            Context ctx = RhodesService.getContext();
+            LocalFileHandler fileHandler = new LocalFileHandler(ctx);
+            if(!fileHandler.handle(url))
+            {
+                Logger.D(TAG, "Handling URI: " + url);
+
+                Intent intent = Intent.parseUri(url, 0);
+                ctx.startActivity(Intent.createChooser(intent, "Open in..."));
+            }
+        }
+        catch (Exception e) {
+            Logger.E(TAG, "Can't open url :'" + url + "': " + e.getMessage());
+        }
+    }
+
 	private native void setPushRegistrationId(String id);
 	
 	private native boolean callPushCallback(String data);
@@ -1200,7 +1230,8 @@ public class RhodesService extends Service {
 			PerformOnUiThread.exec( new Runnable() {
 				public void run() {
 					if (wakeLockObject == null) {
-						PowerManager pm = (PowerManager)getInstance().getContext().getSystemService(Context.POWER_SERVICE);
+						getInstance();
+						PowerManager pm = (PowerManager)RhodesService.getContext().getSystemService(Context.POWER_SERVICE);
 						if (pm != null) {
 							wakeLockObject = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP, TAG);
 							wakeLockObject.acquire();
@@ -1279,4 +1310,8 @@ public class RhodesService extends Service {
 		return r;
 	}
 	
+	public static boolean isJQTouch_mode() {
+		return RhoConf.getBool("jqtouch_mode");
+	}
+	
 }

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

@@ -103,8 +103,8 @@ public class Utils {
 				    deleteRecursively(f);
 				else if ( !f.getName().startsWith(strIgnore))    
 				{
-		            if (!target.delete())
-			            throw new IOException("Can not delete " + target.getAbsolutePath());
+		            if (!f.delete())
+			            throw new IOException("Can not delete " + f.getAbsolutePath());
 				}
 			}
 		}

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

@@ -49,10 +49,14 @@ public class WebView {
 	};
 	
 	private static class NavigateBackTask implements Runnable {
+		public NavigateBackTask(int index) {
+			mIndex = index;
+		}
 		public void run() {
 			RhodesService r = RhodesService.getInstance();
-			r.getMainView().goBack();
+			r.getMainView().back(mIndex);
 		}
+		private int mIndex;
 	};
 	
 	private static class RefreshTask implements Runnable {
@@ -95,7 +99,7 @@ public class WebView {
 	
 	public static void navigateBack() {
 		try {
-			PerformOnUiThread.exec(new NavigateBackTask(), false);
+			PerformOnUiThread.exec(new NavigateBackTask(activeTab()), false);
 		}
 		catch (Exception e) {
 			reportFail("navigateBack", e);

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

@@ -20,33 +20,13 @@
  */
 package com.rhomobile.rhodes.alert;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.Map;
-import java.util.Vector;
-
-import android.app.Dialog;
 import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
 import android.media.MediaPlayer;
-import android.net.Uri;
+
 import android.os.Vibrator;
-import android.view.Gravity;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup.LayoutParams;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 
-import com.rhomobile.rhodes.AndroidR;
 import com.rhomobile.rhodes.Capabilities;
 import com.rhomobile.rhodes.Logger;
-import com.rhomobile.rhodes.RhodesActivity;
 import com.rhomobile.rhodes.RhodesService;
 import com.rhomobile.rhodes.file.RhoFileApi;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
@@ -55,260 +35,20 @@ public class Alert {
 	
 	private static final String TAG = "Alert";
 	
-	private static Dialog currentAlert = null;
-	private static TextView s_textView = null;
 	private static MediaPlayer currentMP = 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 t) {
-			id = t;
-			title = t;
-		}
-		
-		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;
-		}
-		
-	};
-
-	private static class ShowStatusDialog implements Runnable 
-	{
-	    private String m_strTitle;
-	    private String m_strMessage;
-        private String m_strHide;
-        
-		public ShowStatusDialog(String strTitle, String strMessage, String strHide) 
-		{
-			m_strMessage = strMessage;
-			m_strHide = strHide;
-			m_strTitle = strTitle;
-		}
-		
-		public void run() 
-		{
-			if ( currentAlert != null )
-			{
-			    s_textView.setText(m_strMessage);
-			    return;
-			}
-			
-			Vector<CustomButton> buttons = new Vector<CustomButton>();
-			buttons.addElement(new CustomButton(m_strHide));
-			
-			makeDialog( m_strTitle, m_strMessage, null, buttons, null);
-        }
-    }
-	
-	private static class ShowDialog implements Runnable {
-		private Object params;
-		
-		public ShowDialog(Object p) {
-			params = p;
-		}
-
-		@SuppressWarnings("unchecked")
-		public void run() {
-			String title = "";//"Alert";
-			String message = null;
-			Drawable icon = null;
-			String callback = null;
-			Vector<CustomButton> buttons = new Vector<CustomButton>();
-			
-			Context ctx = RhodesActivity.getContext();
-			
-			if (params instanceof String) 
-			{
-				message = (String)params;
-				buttons.addElement(new CustomButton("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)) {
-					String iconName = (String)iconObj;
-					if (iconName.equalsIgnoreCase("alert"))
-						icon = ctx.getResources().getDrawable(AndroidR.drawable.alert_alert);
-					else if (iconName.equalsIgnoreCase("question"))
-						icon = ctx.getResources().getDrawable(AndroidR.drawable.alert_question);
-					else if (iconName.equalsIgnoreCase("info"))
-						icon = ctx.getResources().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);
-					}
-				}
-				
-				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;
-						}
-						
-						buttons.addElement(new CustomButton(itemId, itemTitle));
-					}
-				}
-			}
-			
-            makeDialog( title, message, icon, buttons, callback);
-		}
-	};
-
-	private static void makeDialog( String title, String message, Drawable icon, Vector<CustomButton> buttons, String callback)
-	{
-		//if (message == null)
-		//	return;
-
-        Context ctx = RhodesActivity.getInstance();
-        int nTopPadding = 10;
-        
-		Dialog dialog = new Dialog(ctx);
-		if ( title == null || title.length() == 0 )
-		    dialog.requestWindowFeature(dialog.getWindow().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.FILL_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.FILL_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.FILL_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.FILL_PARENT, LayoutParams.WRAP_CONTENT));
-		main.addView(bottom);
-		
-		for (int i = 0, lim = buttons.size(); i < lim; ++i) {
-			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.FILL_PARENT : LayoutParams.WRAP_CONTENT,
-					LayoutParams.WRAP_CONTENT, 1));
-			bottom.addView(button);
-		}
-		
-		dialog.setContentView(main);
-		dialog.show();
-		
-		currentAlert = dialog;
-	}
-	
-	private static class HideDialog implements Runnable {
-		public void run() {
-			if (currentAlert == null)
-				return;
-			currentAlert.dismiss();
-			currentAlert = null;
-		}
-	};
-	
 	private static void reportFail(String name, Exception e) {
 		Logger.E(TAG, "Call of \"" + name + "\" failed: " + e.getMessage());
 	}
 
-	public static void showPopup(Object params) {
+	public static void showPopup(final Object params) {
 		try {
 			Logger.T(TAG, "showPopup");
-			PerformOnUiThread.exec(new ShowDialog(params), false);
+			PerformOnUiThread.exec(new Runnable() {
+				public void run() {
+					PopupActivity.showDialog(params);
+				}
+			}, false);
 		}
 		catch (Exception e) {
 			reportFail("showPopup", e);
@@ -318,17 +58,25 @@ public class Alert {
 	public static void hidePopup() {
 		try {
 			Logger.T(TAG, "hidePopup");
-			PerformOnUiThread.exec(new HideDialog(), false);
+			PerformOnUiThread.exec(new Runnable() {
+				public void run() {
+					PopupActivity.hidePopup();
+				}
+			}, false);
 		}
 		catch (Exception e) {
 			reportFail("hidePopup", e);
 		}
 	}
 
-	public static void showStatusPopup(String title, String message, String hide) {
+	public static void showStatusPopup(final String title, final String message, final String hide) {
 		try {
 			Logger.I(TAG, "showStatusPopup");
-			PerformOnUiThread.exec(new ShowStatusDialog(title, message, hide), false);
+			PerformOnUiThread.exec(new Runnable() {
+				public void run() {
+					PopupActivity.showStatusDialog(title, message, hide);
+				}
+			}, false);
 		}
 		catch (Exception e) {
 			reportFail("showStatusPopup", e);
@@ -364,18 +112,7 @@ public class Alert {
 					return false;
 				}
 			});
-			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);
-			
-			FileInputStream fs = new FileInputStream(f);
-			mp.setDataSource(fs.getFD());
+			mp.setDataSource(RhoFileApi.openFd("apps/" + fileName));
 			
 			mp.prepare();
 			mp.start();