rhodes 1.5.5 → 2.0.0.beta1

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

@@ -26,7 +26,11 @@ public final class AndroidR {
     public static final class attr {
     }
     public static final class drawable {
+    	public static final int alert_alert=R.drawable.alert_alert;
+    	public static final int alert_info=R.drawable.alert_info;
+    	public static final int alert_question=R.drawable.alert_question;
         public static final int back=R.drawable.back;
+        public static final int camera=R.drawable.camera;
         public static final int exit=R.drawable.exit;
         public static final int home=R.drawable.home;
         public static final int icon=R.drawable.icon;
@@ -38,34 +42,25 @@ public final class AndroidR {
         public static final int sync=R.drawable.sync;
     }
     public static final class id {
-        public static final int about=R.id.about;
         public static final int buttonLayout=R.id.buttonLayout;
+        public static final int cameraButton=R.id.cameraButton;
         public static final int cancelButton=R.id.cancelButton;
         public static final int excludeClasses=R.id.excludeClasses;
-        public static final int exit=R.id.exit;
         public static final int filesList=R.id.filesList;
         public static final int includeClasses=R.id.includeClasses;
         public static final int logcontent=R.id.logcontent;
         public static final int loglevel=R.id.loglevel;
-        public static final int logoptions=R.id.logoptions;
         public static final int logoptsCloseButton=R.id.logoptsCloseButton;
         public static final int logoptsSaveButton=R.id.logoptsSaveButton;
-        public static final int logview=R.id.logview;
         public static final int logviewClearButton=R.id.logviewClearButton;
         public static final int logviewSendButton=R.id.logviewSendButton;
         public static final int logviewCloseButton=R.id.logviewCloseButton;
         public static final int logviewRefreshButton=R.id.logviewRefreshButton;
         public static final int lookIn=R.id.lookIn;
-        public static final int navigation_back=R.id.navigation_back;
-        public static final int navigation_forward=R.id.navigation_forward;
-        public static final int navigation_home=R.id.navigation_home;
         public static final int okButton=R.id.okButton;
-        public static final int options=R.id.options;
         public static final int preview=R.id.preview;
-        public static final int refresh=R.id.refresh;
         public static final int scrollview=R.id.scrollview;
         public static final int surface=R.id.surface;
-        public static final int sync=R.id.sync;
         public static final int text=R.id.text;
         public static final int text1=R.id.text1;
         public static final int widget28=R.id.widget28;

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

@@ -0,0 +1,12 @@
+package com.rhomobile.rhodes;
+
+public class Capabilities {
+	
+	public static boolean CAMERA_ENABLED = true;
+	public static boolean GPS_ENABLED = true;
+	public static boolean NETWORK_STATE_ENABLED = true;
+	public static boolean PHONE_ENABLED = true;
+	public static boolean PIM_ENABLED = true;
+	public static boolean VIBRATE_ENABLED = true;
+	
+}

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

@@ -0,0 +1,105 @@
+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;
+
+public class RhoMenu {
+	
+	private static final String TAG = "Menu";
+	
+	private static class Item
+	{
+		public String type;
+		public String url;
+		
+		public Item(String t, String u) {
+			type = t;
+			url = u;
+		}
+	};
+	
+	private Map<MenuItem, Item> items;
+
+	private native long allocMenu();
+	private native void deallocMenu(long menu);
+	
+	private native int getMenuSize(long menu);
+	private native String getMenuItemLabel(long menu, int index);
+	private native String getMenuItemType(long menu, int index);
+	private native String getMenuItemUrl(long menu, int index);
+	
+	public RhoMenu(Menu menu) {
+		menu.clear();
+		items = new HashMap<MenuItem, Item>();
+		
+		long m = allocMenu();
+		for (int i = 0, lim = getMenuSize(m); i < lim; ++i) {
+			String type = getMenuItemType(m, i);
+			String url = getMenuItemUrl(m, i);
+			String label = getMenuItemLabel(m, i);
+			if (type.equalsIgnoreCase("unknown"))
+				continue;
+			
+			MenuItem item = menu.add(label);
+			items.put(item, new Item(type, url));
+		}
+		deallocMenu(m);
+	}
+	
+	public boolean onMenuItemSelected(MenuItem item) {
+		Object obj = items.get(item);
+		if (obj == null || !(obj instanceof Item)) {
+			Logger.E(TAG, "Unknown MenuItem");
+			return false;
+		}
+		
+		Item ri = (Item)obj;
+		
+		Rhodes r = RhodesInstance.getInstance();
+		MainView mainView = r.getMainView();
+		
+		String type = ri.type;
+		if (type.equalsIgnoreCase("refresh")) {
+			mainView.reload(mainView.activeTab());
+		}
+		else if (type.equalsIgnoreCase("home")) {
+			mainView.navigate(r.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(r.getOptionsUrl(), mainView.activeTab());
+		}
+		else if (type.equalsIgnoreCase("sync")) {
+			r.doSyncAllSources(true);
+		}
+		else if (type.equalsIgnoreCase("log")) {
+			Rhodes.showLogView();
+		}
+		else if (type.equalsIgnoreCase("logOptions")) {
+			Rhodes.showLogOptions();
+		}
+		else if (type.equalsIgnoreCase("close") || type.equalsIgnoreCase("exit")) {
+			Rhodes.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;
+		}
+		return true;
+	}
+	
+}

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

@@ -22,8 +22,9 @@ package com.rhomobile.rhodes;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Hashtable;
+import java.util.Enumeration;
 import java.util.Locale;
+import java.util.Vector;
 
 import com.rhomobile.rhodes.Utils.AssetsSource;
 import com.rhomobile.rhodes.Utils.FileSource;
@@ -35,26 +36,25 @@ import com.rhomobile.rhodes.ui.LogViewDialog;
 import com.rhomobile.rhodes.uri.MailUriHandler;
 import com.rhomobile.rhodes.uri.TelUriHandler;
 import com.rhomobile.rhodes.uri.UriHandler;
+import com.rhomobile.rhodes.uri.VideoUriHandler;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.telephony.TelephonyManager;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Display;
 import android.view.KeyEvent;
 import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.Window;
@@ -82,6 +82,9 @@ public class Rhodes extends Activity {
 	
 	private static int MAX_PROGRESS = 10000;
 	
+	private static final String INSTALLING_PAGE = "apps/app/installing.html";
+	private static final String LOADING_PAGE = "apps/app/loading.html";
+	
 	private long uiThreadId;
 	public long getUiThreadId() {
 		return uiThreadId;
@@ -92,6 +95,9 @@ public class Rhodes extends Activity {
 	private static int screenWidth;
 	private static int screenHeight;
 	
+	private static float screenPpiX;
+	private static float screenPpiY;
+	
 	private static boolean isCameraAvailable;
 
 	private FrameLayout outerFrame;
@@ -99,10 +105,13 @@ public class Rhodes extends Activity {
 	
 	private SplashScreen splashScreen = null;
 	
-	private Hashtable<String, UriHandler> uriHandlers = new Hashtable<String, UriHandler>();
 	private Boolean contentChanged = null;
 	
-	private String sdCardError = "Application can not access the SD card while it's mounted. Please unmount the device and stop the adb server before launching the app.";
+	private Vector<UriHandler> uriHandlers = new Vector<UriHandler>();
+
+	//private String sdCardError = "Application can not access the SD card while it's mounted. Please unmount the device and stop the adb server before launching the app.";
+	
+	private RhoMenu appMenu = null;
 		
 	private String rootPath = null;
 	
@@ -110,7 +119,7 @@ public class Rhodes extends Activity {
 	public native void startRhodesApp();
 	public native void stopRhodesApp();
 	
-	private native void doSyncAllSources(boolean v);
+	public native void doSyncAllSources(boolean v);
 	
 	public native String getOptionsUrl();
 	public native String getStartUrl();
@@ -119,24 +128,29 @@ public class Rhodes extends Activity {
 	
 	public native String normalizeUrl(String url);
 	
+	public static native void loadUrl(String url);
+	
+	public static native void navigateBack();
+	
 	public native void doRequest(String url);
 	
 	public native static void makeLink(String src, String dst);
 	
 	private void initRootPath() {
-		//rootPath = phoneMemoryRootPath();
-		rootPath = sdcardRootPath();
+		Log.d(TAG, "Check if the SD card is mounted...");
+		String state = Environment.getExternalStorageState();
+		Log.d(TAG, "Storage state: " + state);
+		boolean hasSDCard = Environment.MEDIA_MOUNTED.equals(state);
+		rootPath = hasSDCard ? sdcardRootPath() : phoneMemoryRootPath();
 	}
 	
 	public String getRootPath() {
 		return rootPath;
 	}
 	
-	/*
 	private String phoneMemoryRootPath() {
 		return "/data/data/" + getPackageName() + "/data/";
 	}
-	*/
 	
 	private String sdcardRootPath() {
 		return Environment.getExternalStorageDirectory() + "/rhomobile/" + getPackageName() + "/";
@@ -146,7 +160,8 @@ public class Rhodes extends Activity {
 	public RhoLogConf getLogConf() {
 		return m_rhoLogConf;
 	}
-	
+
+	/*
 	private boolean checkSDCard() {
 		Log.d(TAG, "Check if the SD card is mounted...");
 		String state = Environment.getExternalStorageState();
@@ -169,6 +184,7 @@ public class Rhodes extends Activity {
 		Log.d(TAG, "SD card check passed, going on");
 		return true;
 	}
+	*/
 	
 	private void copyFromBundle(String file) throws IOException {
 		File target = new File(sdcardRootPath(), file);
@@ -188,7 +204,7 @@ public class Rhodes extends Activity {
 		*/
 	}
 	
-	public boolean isNameChanged() {
+	private boolean isNameChanged() {
 		try {
 			FileSource as = new AssetsSource(getResources().getAssets());
 			FileSource fs = new FileSource();
@@ -199,7 +215,7 @@ public class Rhodes extends Activity {
 		}
 	}
 	
-	public boolean isBundleChanged() {
+	private boolean isBundleChanged() {
 		if (contentChanged == null) {
 			try {
 				String rp = getRootPath();
@@ -233,10 +249,9 @@ public class Rhodes extends Activity {
 				String items[] = {"apps", "lib", "db", "hash", "name"};
 				for (int i = 0; i != items.length; ++i) {
 					String item = items[i];
-					//File phf = new File(phRootPath, item);
-					File sdf = new File(rp, item);
-					Logger.D(TAG, "Copy '" + item + "' to '" + sdf + "'");
-					Utils.copyRecursively(as, item, sdf, nameChanged);
+					File f = new File(rp, item);
+					Logger.D(TAG, "Copy '" + item + "' to '" + f.getAbsolutePath() + "'");
+					Utils.copyRecursively(as, item, f, nameChanged);
 					/*
 					String src = sdf.getAbsolutePath();
 					String dst = phf.getAbsolutePath();
@@ -245,11 +260,6 @@ public class Rhodes extends Activity {
 					*/
 				}
 				
-				File dbfiles = new File(rootPath + "apps/public/db-files");
-				if (!dbfiles.exists())
-					dbfiles.mkdirs();
-				dbfiles = null;
-				
 				contentChanged = new Boolean(true);
 				Logger.D(TAG, "All files copied");
 			}
@@ -262,13 +272,19 @@ public class Rhodes extends Activity {
 	}
 	
 	private boolean handleUrlLoading(String url) {
-		Uri uri = Uri.parse(url);
-		UriHandler handler = uriHandlers.get(uri.getScheme());
-		if (handler == null)
-			return false;
+		Enumeration<UriHandler> e = uriHandlers.elements();
+		while (e.hasMoreElements()) {
+			UriHandler handler = e.nextElement();
+			try {
+				if (handler.handle(url))
+					return true;
+			}
+			catch (Exception ex) {
+				continue;
+			}
+		}
 		
-		handler.handle(uri);
-		return true;
+		return false;
 	}
 	
 	public WebView createWebView() {
@@ -286,11 +302,13 @@ public class Rhodes extends Activity {
 
 		w.setVerticalScrollBarEnabled(true);
 		w.setHorizontalScrollBarEnabled(true);
+		w.setVerticalScrollbarOverlay(true);
+		w.setHorizontalScrollbarOverlay(true);
 
 		w.setWebViewClient(new WebViewClient() {
-			
-			private boolean splashHidden = false;
 
+			private boolean realPageLoaded = false;
+			
 			@Override
 			public boolean shouldOverrideUrlLoading(WebView view, String url) {
 				return handleUrlLoading(url);
@@ -304,10 +322,18 @@ public class Rhodes extends Activity {
 			
 			@Override
 			public void onPageFinished(WebView view, String url) {
-				if (!splashHidden && url.startsWith("http://")) {
+				// Clear page until we get real page loaded
+				if (!(realPageLoaded || url.equals(LOADING_PAGE)))
+					realPageLoaded = true;
+				if (!realPageLoaded)
+					view.clearHistory();
+				// Set title
+				Rhodes r = RhodesInstance.getInstance();
+				String title = view.getTitle();
+				r.setTitle(title);
+				// Hide splash screen
+				if (url.startsWith("http://"))
 					hideSplashScreen();
-					splashHidden = true;
-				}
 				getWindow().setFeatureInt(Window.FEATURE_PROGRESS, MAX_PROGRESS);
 				super.onPageFinished(view, url);
 			}
@@ -394,8 +420,8 @@ public class Rhodes extends Activity {
 		}
 	}
 	
-	private void showSplashScreen() {
-		splashScreen = new SplashScreen(this, "apps/app/loading.png");
+	private void showSplashScreen(String file) throws IOException {
+		splashScreen = new SplashScreen(this, file);
 		splashScreen.start(outerFrame);
 	}
 	
@@ -409,19 +435,57 @@ public class Rhodes extends Activity {
 		view.requestFocus();
 	}
 	
+	private void showLoadingPage() {
+		try {
+			boolean hasInstalling = false;
+			try {
+				getResources().getAssets().open("apps/app/installing.png").close();
+				hasInstalling = true;
+			}
+			catch (IOException e) {}
+			showSplashScreen("apps/app/" + (hasInstalling && isBundleChanged() ? "installing.png" : "loading.png"));
+		}
+		catch (Exception e) {
+			MainView v = new SimpleMainView();
+			
+			boolean bc = isBundleChanged();
+			String page = bc ? INSTALLING_PAGE : LOADING_PAGE;
+			
+			boolean hasNeededPage;
+			try {
+				getResources().getAssets().open(page).close();
+				hasNeededPage = true;
+			}
+			catch (IOException e1) {
+				hasNeededPage = false;
+			}
+			
+			if (hasNeededPage) {
+				v.navigate("file:///android_asset/" + page, 0);
+			}
+			else {
+				StringBuffer p = new StringBuffer();
+				p.append("<html><title>");
+				p.append(bc ? "Installing" : "Loading");
+				p.append("</title><body>");
+				p.append(bc ? "Installing" : "Loading");
+				p.append("...</body></html>");
+				v.loadData(p.toString(), 0);
+			}
+			
+			setMainView(v);
+		}
+	}
+	
 	/** Called when the activity is first created. */
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		
-		if (!checkSDCard()) {
-			finish();
-			return;
-		}
-		
 		Thread ct = Thread.currentThread();
 		ct.setPriority(Thread.MAX_PRIORITY);
 		uiThreadId = ct.getId();
+
 		RhodesInstance.setInstance(this);
 		
 		initRootPath();
@@ -432,7 +496,7 @@ public class Rhodes extends Activity {
 			finish();
 			return;
 		}
-		createRhodesApp(rootPath);
+		createRhodesApp(getRootPath());
 		
 		boolean fullScreen = true;
 		if (RhoConf.isExist("full_screen"))
@@ -453,7 +517,7 @@ public class Rhodes extends Activity {
 		this.setContentView(outerFrame, new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT));
 		
 		Logger.I("Rhodes", "Loading...");
-		showSplashScreen();
+		showLoadingPage();
 		
 		// Increase WebView rendering priority
 		WebView w = new WebView(this);
@@ -466,16 +530,18 @@ public class Rhodes extends Activity {
 		screenHeight = d.getHeight();
 		screenWidth = d.getWidth();
 		
+		DisplayMetrics metrics = new DisplayMetrics();
+		d.getMetrics(metrics);
+		screenPpiX = metrics.xdpi;
+		screenPpiY = metrics.ydpi;
+		
 		// TODO: detect camera availability
 		isCameraAvailable = true;
 		
 		// Register custom uri handlers here
-		UriHandler[] handlers = {
-				new MailUriHandler(this),
-				new TelUriHandler(this)
-		};
-		for (int i = 0; i < handlers.length; ++i)
-			uriHandlers.put(handlers[i].scheme(), handlers[i]);
+		uriHandlers.addElement(new MailUriHandler(this));
+		uriHandlers.addElement(new TelUriHandler(this));
+		uriHandlers.addElement(new VideoUriHandler(this));
 		
 		Thread init = new Thread(new Runnable() {
 
@@ -510,19 +576,11 @@ public class Rhodes extends Activity {
 		super.onDestroy();
 	}
 	
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		super.onCreateOptionsMenu(menu);
-		MenuInflater mi = new MenuInflater(getApplication());
-		mi.inflate(AndroidR.menu.options, menu);
-		return true;
-	}
-
 	@Override
 	public boolean onKeyDown(int keyCode, KeyEvent event) {
 		switch (keyCode) {
 		case KeyEvent.KEYCODE_BACK:
-			goBack();
+			mainView.back(mainView.activeTab());
 			return true;
 		case KeyEvent.KEYCODE_HOME:
 			stopSelf();
@@ -531,65 +589,31 @@ public class Rhodes extends Activity {
 		
 		return super.onKeyDown(keyCode, event);
 	}
+	
+	@Override
+	public boolean onPrepareOptionsMenu(Menu menu) {
+		super.onPrepareOptionsMenu(menu);
+		appMenu = new RhoMenu(menu);
+		return true;
+	}
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-		case AndroidR.id.about:
-			AboutDialog aboutDialog = new AboutDialog(this);
-			aboutDialog.setTitle("About");
-			aboutDialog.setCanceledOnTouchOutside(true);
-			aboutDialog.setCancelable(true);
-			aboutDialog.show();
-			return true;
-			
-		case AndroidR.id.navigation_back:
-			goBack();
-			return true;
-			
-		case AndroidR.id.navigation_forward:
-			goForward();
-			return true;
-
-		case AndroidR.id.navigation_home:
-			mainView.navigate(getStartUrl(), mainView.activeTab());
-			return true;
-
-		case AndroidR.id.options:
-			String curUrl = getOptionsUrl();
-			mainView.navigate(curUrl, mainView.activeTab());
-			return true;
-
-		case AndroidR.id.refresh:
-			mainView.reload(mainView.activeTab());
-			return true;
-			
-		case AndroidR.id.sync:
-			doSyncAllSources(true);
-			return true;
-			
-		case AndroidR.id.logview:
-			showLogView();
-			return true;
-			
-		case AndroidR.id.logoptions:
-			showLogOptions();
-			return true;	
-
-		case AndroidR.id.exit:
-			stopSelf();
-			return true;
-		}
-
-		return false;
-	}
-	
-	private void goBack() {
-		mainView.back(mainView.activeTab());
+		if (appMenu == null)
+			return false;
+		return appMenu.onMenuItemSelected(item);
 	}
 	
-	private void goForward() {
-		mainView.forward(mainView.activeTab());
+	public static void showAboutDialog() {
+		performOnUiThread(new Runnable() {
+			public void run() {
+				final AboutDialog aboutDialog = new AboutDialog(RhodesInstance.getInstance());
+				aboutDialog.setTitle("About");
+				aboutDialog.setCanceledOnTouchOutside(true);
+				aboutDialog.setCancelable(true);
+				aboutDialog.show();
+			}
+		}, false);
 	}
 	
 	public static void showLogView() {
@@ -621,11 +645,12 @@ public class Rhodes extends Activity {
 			Utils.deleteRecursively(new File(folder, children[i]));
 	}
 	
-	public static void showNetworkIndicator(boolean v) {
-		// No GUI indicator
-	}
-	
 	private static boolean hasNetwork() {
+		if (!Capabilities.NETWORK_STATE_ENABLED) {
+			Logger.E(TAG, "Capability NETWORK_STATE disabled");
+			return false;
+		}
+		
 		Context ctx = RhodesInstance.getInstance();
 		ConnectivityManager conn = (ConnectivityManager)ctx.getSystemService(Context.CONNECTIVITY_SERVICE);
 		if (conn == null)
@@ -671,25 +696,35 @@ public class Rhodes extends Activity {
 			return new Boolean(isCameraAvailable);
 		else if (name.equalsIgnoreCase("has_network"))
 			return hasNetwork();
+		else if (name.equalsIgnoreCase("ppi_x"))
+			return new Float(screenPpiX);
+		else if (name.equalsIgnoreCase("ppi_y"))
+			return new Float(screenPpiY);
 		else if (name.equalsIgnoreCase("phone_number")) {
 			TelephonyManager manager = (TelephonyManager)RhodesInstance.getInstance().
 				getSystemService(Context.TELEPHONY_SERVICE);
 			String number = manager.getLine1Number();
 			return number;
 		}
+		else if (name.equalsIgnoreCase("device_name")) {
+			return Build.DEVICE;
+		}
+		else if (name.equalsIgnoreCase("os_version")) {
+			return Build.VERSION.RELEASE;
+		}
 		
 		return null;
 	}
 	
-	public void stopSelf() {
-		stopRhodesApp();
-		Process.killProcess(Process.myPid());
-	}
-	
 	public static void exit() {
 		RhodesInstance.getInstance().stopSelf();
 	}
 	
+	private void stopSelf() {
+		//stopRhodesApp();
+		Process.killProcess(Process.myPid());
+	}
+	
 	static {
 		// Load native implementation of rhodes
 		System.loadLibrary("rhodes");