rhodes 1.5.5 → 2.0.0.beta1

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

@@ -20,6 +20,7 @@
  */
 package com.rhomobile.rhodes.geolocation;
 
+import com.rhomobile.rhodes.Capabilities;
 import com.rhomobile.rhodes.Logger;
 
 public class GeoLocation {
@@ -31,6 +32,11 @@ public class GeoLocation {
 		Logger.E(TAG, "Call of \"" + name + "\" failed: " + e.getMessage());
 	}
 	
+	private static void checkState() throws IllegalAccessException {
+		if (!Capabilities.GPS_ENABLED)
+			throw new IllegalAccessException("GPS disabled");
+	}
+	
 	private static void init() {
 		if (locImpl != null)
 			return;
@@ -43,6 +49,7 @@ public class GeoLocation {
 	
 	public static boolean isAvailable() {
 		try {
+			checkState();
 			Logger.T(TAG, "isAvailable");
 			init();
 			return locImpl.isAvailable();
@@ -56,6 +63,7 @@ public class GeoLocation {
 	
 	public static double getLatitude() {
 		try {
+			checkState();
 			Logger.T(TAG, "getLatitude");
 			init();
 			return locImpl.GetLatitude();
@@ -69,6 +77,7 @@ public class GeoLocation {
 
 	public static double getLongitude() {
 		try {
+			checkState();
 			Logger.T(TAG, "getLongitude");
 			init();
 			return locImpl.GetLongitude();
@@ -82,6 +91,7 @@ public class GeoLocation {
 
 	public static boolean isKnownPosition() {
 		try {
+			checkState();
 			Logger.T(TAG, "isKnownPosition");
 			init();
 			return locImpl.isKnownPosition();

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

@@ -29,6 +29,9 @@ public interface MainView {
 	public void back(int index);
 	public void forward(int index);
 	
+	// Browser native 'back'
+	public void goBack();
+	
 	public void navigate(String url, int index);
 	public void reload(int index);
 	

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

@@ -82,38 +82,27 @@ public class SimpleMainView implements MainView {
 	};
 
 	private class ActionCustomRunnable implements Runnable {
-		private boolean callback;
+		
 		private String url;
-		public ActionCustomRunnable(boolean c, String u) {
-			callback = c;
+		
+		public ActionCustomRunnable(String u) {
 			url = u;
 		}
 		
 		public void run() {
-			if (callback)
-				RhodesInstance.getInstance().doRequest(url);
-			else
-				navigate(url, 0);
+			Rhodes.loadUrl(url);
 		}
 	};
 	
 	private class ActionCustom implements View.OnClickListener {
-		private static final String scheme = "callback:";
 		private String url;
-		private boolean callback;
 		
 		public ActionCustom(String u) {
-			callback = false;
 			url = u;
-			if (url.startsWith(scheme)) {
-				url = url.substring(scheme.length());
-				callback = true;
-			}
-			url = RhodesInstance.getInstance().normalizeUrl(url);
 		}
 		
 		public void onClick(View v) {
-			Rhodes.performOnUiThread(new ActionCustomRunnable(callback, url), false);
+			Rhodes.performOnUiThread(new ActionCustomRunnable(url), false);
 		}
 	};
 	
@@ -264,11 +253,11 @@ public class SimpleMainView implements MainView {
 	}
 	
 	public void back(int index) {
-		String backUrl = RhodesInstance.getInstance().getAppBackUrl();
-		if (backUrl == null || backUrl.length() == 0)
-			webView.goBack();
-		else
-			navigate(backUrl, index);
+		Rhodes.navigateBack();
+	}
+	
+	public void goBack() {
+		webView.goBack();
 	}
 
 	public void forward(int index) {

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

@@ -33,7 +33,6 @@ import android.graphics.drawable.BitmapDrawable;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
-import android.webkit.WebView;
 import android.widget.FrameLayout;
 import android.widget.TabHost;
 import android.widget.TabWidget;
@@ -46,7 +45,7 @@ public class TabbedMainView implements MainView {
 	private Vector<TabData> tabs;
 	
 	private static class TabData {
-		public WebView view;
+		public MainView view;
 		public String url;
 		public boolean reload;
 		public boolean loaded;
@@ -65,12 +64,12 @@ public class TabbedMainView implements MainView {
 		}
 		
 		public View createTabContent(String tag) {
-			return data.view;
+			return data.view.getView();
 		}
 		
 	};
 	
-	private WebView getWebView(int index) {
+	private MainView getView(int index) {
 		TabData data = tabs.elementAt(index);
 		return data.view;
 	}
@@ -109,7 +108,7 @@ public class TabbedMainView implements MainView {
 					int index = Integer.parseInt(tabId);
 					TabData data = tabs.elementAt(index);
 					if (data.reload || !data.loaded) {
-						getWebView(index).loadUrl(data.url);
+						getView(index).navigate(data.url, index);
 						data.loaded = true;
 					}
 				}
@@ -166,7 +165,7 @@ public class TabbedMainView implements MainView {
 				spec.setIndicator(label, drawable);
 			
 			// Set view factory
-			WebView view = r.createWebView();
+			SimpleMainView view = new SimpleMainView();
 			TabData data = new TabData();
 			data.view = view;
 			data.url = action;
@@ -185,23 +184,23 @@ public class TabbedMainView implements MainView {
 	}
 	
 	public void back(int index) {
-		getWebView(index).goBack();
+		getView(index).back(0);
 	}
 	
 	public void forward(int index) {
-		getWebView(index).goForward();
+		getView(index).forward(0);
 	}
 	
 	public void navigate(String url, int index) {
-		getWebView(index).loadUrl(url);
+		getView(index).navigate(url, 0);
 	}
 	
 	public void reload(int index) {
-		getWebView(index).reload();
+		getView(index).reload(0);
 	}
 	
 	public String currentLocation(int index) {
-		return getWebView(index).getUrl();
+		return getView(index).currentLocation(0);
 	}
 
 	public void switchTab(int index) {
@@ -212,8 +211,12 @@ public class TabbedMainView implements MainView {
 		return host.getCurrentTab();
 	}
 
+	public void goBack() {
+		getView(activeTab()).goBack();
+	}
+
 	public void loadData(String data, int index) {
-		getWebView(index).loadData(data, "text/html", "utf-8");
+		getView(index).loadData(data, 0);
 	}
 
 }

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

@@ -37,11 +37,15 @@ import android.provider.Contacts.Organizations;
 import android.provider.Contacts.People;
 import android.provider.Contacts.Phones;
 
+import com.rhomobile.rhodes.Capabilities;
+import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.RhodesInstance;
 
 //@RubyLevelClass(name="Phonebook")
 public class Phonebook {
 
+	private static final String TAG = "Phonebook";
+	
 	private Map<String, Contact> contactList = new HashMap<String, Contact>();
 	private Activity activity;
 	private ContentResolver cr;
@@ -63,7 +67,20 @@ public class Phonebook {
 		return m.find() ? m.group(1) : "";
 	}
 	
+	private boolean checkState() {
+		if (!Capabilities.PIM_ENABLED)
+			Logger.E(TAG, "Can not execute: PIM disabled");
+		return Capabilities.PIM_ENABLED;
+	}
+	
 	public Phonebook() {
+		if (!checkState())
+			return;
+		
+		fill();
+	}
+	
+	private void fill() {
 
 		idPattern = Pattern.compile("\\{([0-9]+)\\}");
 		activity = RhodesInstance.getInstance(); 
@@ -194,22 +211,37 @@ public class Phonebook {
 	}
 
 	public void close() {
+		if (!checkState())
+			return;
+		
 		this.contactList.clear();
 	}
 	
 	public void moveToBegin() {
+		if (!checkState())
+			return;
+		
 		iter = contactList.values().iterator();
 	}
 	
 	public boolean hasNext() {
+		if (!checkState())
+			return false;
+		
 		return iter.hasNext();
 	}
 	
 	public Object next() {
+		if (!checkState())
+			return null;
+		
 		return iter.next();
 	}
 	
 	public Contact getFirstRecord() {
+		if (!checkState())
+			return null;
+		
 		moveToBegin();
 		if (!iter.hasNext())
 			return null;
@@ -217,14 +249,23 @@ public class Phonebook {
 	}
 	
 	public Contact getNextRecord() {
+		if (!checkState())
+			return null;
+		
 		return iter.next();
 	}
 	
 	public Contact getRecord(String id) {
+		if (!checkState())
+			return null;
+		
 		return contactList.get(id);
 	}
 
 	public void removeContact(Contact contact) throws Exception {
+		if (!checkState())
+			return;
+		
 		Uri uri = People.CONTENT_URI;
 
 		String id = getId(contact);
@@ -232,6 +273,9 @@ public class Phonebook {
 	}
 
 	public void saveContact(Contact contact) throws Exception {
+		if (!checkState())
+			return;
+		
 		String rbID = getId(contact);
 		Uri uri = null;
 

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

@@ -3,9 +3,17 @@ package com.rhomobile.rhodes.socket;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
 
+import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
 
 import com.rhomobile.rhodes.Logger;
 
@@ -13,6 +21,8 @@ public class SSLImpl {
 	
 	private static final String TAG = "SSLImplJava";
 	
+	private static SSLSocketFactory factory = null;
+	
 	private SSLSocket sock;
 	private int sockfd;
 	
@@ -21,17 +31,51 @@ public class SSLImpl {
 	
 	public native RhoSockAddr getRemoteSockAddr(int sockfd);
 	
+	private static class MyTrustManager implements X509TrustManager {
+		
+		public void checkClientTrusted(X509Certificate[] chain, String authType)
+				throws CertificateException {
+			// Nothing
+			Logger.T(TAG, "checkClientTrusted");
+		}
+
+		public void checkServerTrusted(X509Certificate[] chain, String authType)
+				throws CertificateException {
+			// Nothing
+			Logger.T(TAG, "checkServerTrusted");
+		}
+
+		public X509Certificate[] getAcceptedIssuers() {
+			Logger.T(TAG, "getAcceptedIssuers");
+			return new X509Certificate[0];
+		}
+		
+	};
+	
 	private static void reportFail(String name, Exception e) {
 		Logger.E(TAG, "Call of \"" + name + "\" failed: " + e.getMessage());
 	}
 	
-	public boolean connect(int fd) {
+	private static SSLSocketFactory getFactory(boolean verify) throws NoSuchAlgorithmException, KeyManagementException {
+		if (verify)
+			return (SSLSocketFactory)SSLSocketFactory.getDefault();
+		
+		if (factory == null) {
+			SSLContext context = SSLContext.getInstance("TLS");
+			TrustManager[] managers = {new MyTrustManager()};
+			context.init(null, managers, new SecureRandom());
+			factory = context.getSocketFactory();
+		}
+		return factory;
+	}
+	
+	public boolean connect(int fd, boolean sslVerifyPeer) {
 		try {
 			sockfd = fd;
-			SSLSocketFactory factory = (SSLSocketFactory)SSLSocketFactory.getDefault();
 			RhoSockAddr remote = getRemoteSockAddr(sockfd);
 			Socket s = new RhoSocket(sockfd, remote);
-			sock = (SSLSocket)factory.createSocket(s, remote.host.toString(), remote.port, true);
+			SSLSocketFactory f = getFactory(sslVerifyPeer);
+			sock = (SSLSocket)f.createSocket(s, remote.host.toString(), remote.port, true);
 			sock.setUseClientMode(true);
 			os = sock.getOutputStream();
 			is = sock.getInputStream();

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

@@ -20,6 +20,8 @@
  */
 package com.rhomobile.rhodes.uri;
 
+import com.rhomobile.rhodes.Logger;
+
 import android.content.Context;
 import android.content.Intent;
 import android.net.MailTo;
@@ -27,18 +29,22 @@ import android.net.Uri;
 
 public class MailUriHandler implements UriHandler {
 	
+	private static final String TAG = "MailUriHandler";
+	
 	private Context ctx;
 	
 	public MailUriHandler(Context c) {
 		ctx = c;
 	}
 	
-	public String scheme() {
-		return "mailto";
-	}
-
-	public void handle(Uri uri) {
-		MailTo muri = MailTo.parse(uri.toString());
+	public boolean handle(String url) {
+		Uri uri = Uri.parse(url);
+		if (!uri.getScheme().equals("mailto"))
+			return false;
+	
+		Logger.D(TAG, "This is 'mailto' uri, handle it");
+		
+		MailTo muri = MailTo.parse(url);
 		
 		Intent intent = new Intent(Intent.ACTION_SEND);
 		intent.setType("message/rfc882");
@@ -53,6 +59,7 @@ public class MailUriHandler implements UriHandler {
 		if (s != null) intent.putExtra(Intent.EXTRA_TEXT, s);
 		
 		ctx.startActivity(Intent.createChooser(intent, "Send e-mail..."));
+		return true;
 	}
 
 }

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

@@ -20,27 +20,33 @@
  */
 package com.rhomobile.rhodes.uri;
 
+import com.rhomobile.rhodes.Logger;
+
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 
 public class TelUriHandler implements UriHandler {
 	
+	private static final String TAG = "TelUriHandler";
 	private Context ctx;
 	
 	public TelUriHandler(Context c) {
 		ctx = c;
 	}
 	
-	public String scheme() {
-		return "tel";
-	}
-
-	public void handle(Uri uri) {
+	public boolean handle(String url) {
+		Uri uri = Uri.parse(url);
+		if (!uri.getScheme().equals("tel"))
+			return false;
+		
+		Logger.D(TAG, "This is 'tel' uri, handle it");
+		
 		Intent intent = new Intent(Intent.ACTION_DIAL);
 		intent.setData(uri);
 		
 		ctx.startActivity(Intent.createChooser(intent, "Dial..."));
+		return true;
 	}
 
 }