rhodes 2.0.3 → 2.1.0

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

@@ -24,14 +24,17 @@ import java.util.Map;
 import java.util.Vector;
 
 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 android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
+import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.View;
+import android.view.WindowManager;
 import android.view.ViewGroup.LayoutParams;
 import android.webkit.WebView;
 import android.widget.FrameLayout;
@@ -44,6 +47,7 @@ public class TabbedMainView implements MainView {
 	
 	private TabHost host;
 	private Vector<TabData> tabData;
+	private int tabIndex;
 	
 	private static class TabData {
 		public MainView view;
@@ -71,13 +75,16 @@ public class TabbedMainView implements MainView {
 	};
 	
 	private MainView getView(int index) {
+		if (index == -1)
+			index = activeTab();
 		TabData data = tabData.elementAt(index);
 		return data.view;
 	}
 	
 	@SuppressWarnings("unchecked")
 	public TabbedMainView(Object params) {
-		Rhodes r = RhodesInstance.getInstance();
+		RhodesService r = RhodesService.getInstance();
+		Context ctx = r.getContext();
 		
 		Vector<Object> tabs = null;
 		if (params instanceof Vector<?>)
@@ -95,23 +102,24 @@ public class TabbedMainView implements MainView {
 		
 		int size = tabs.size();
 		
-		host = new TabHost(r);
-		host.setId(Rhodes.RHO_MAIN_VIEW);
+		host = new TabHost(ctx);
+		host.setId(RhodesService.RHO_MAIN_VIEW);
 		
 		tabData = new Vector<TabData>(size);
+		tabIndex = 0;
 		
-		TabWidget tabWidget = new TabWidget(r);
+		TabWidget tabWidget = new TabWidget(ctx);
 		tabWidget.setId(android.R.id.tabs);
 		TabHost.LayoutParams lpt = new TabHost.LayoutParams(LayoutParams.FILL_PARENT,
 				LayoutParams.WRAP_CONTENT, Gravity.TOP);
 		host.addView(tabWidget, lpt);
-		
-		FrameLayout frame = new FrameLayout(r);
+
+		FrameLayout frame = new FrameLayout(ctx);
 		frame.setId(android.R.id.tabcontent);
 		FrameLayout.LayoutParams lpf = new FrameLayout.LayoutParams(LayoutParams.FILL_PARENT,
 				LayoutParams.FILL_PARENT, Gravity.BOTTOM);
 		// TODO: detect tab widget height and use it here instead of hardcoded value
-		lpf.setMargins(0, 64, 0, 0);
+		//lpf.setMargins(0, 128, 0, 0);
 		host.addView(frame, lpf);
 		
 		host.setup();
@@ -120,10 +128,10 @@ public class TabbedMainView implements MainView {
 			
 			public void onTabChanged(String tabId) {
 				try {
-					int index = Integer.parseInt(tabId);
-					TabData data = tabData.elementAt(index);
+					tabIndex = Integer.parseInt(tabId);
+					TabData data = tabData.elementAt(tabIndex);
 					if (data.reload || !data.loaded) {
-						getView(index).navigate(data.url, index);
+						getView(tabIndex).navigate(data.url, tabIndex);
 						data.loaded = true;
 					}
 				}
@@ -134,9 +142,10 @@ public class TabbedMainView implements MainView {
 		});
 		
 		TabHost.TabSpec spec;
+		DisplayMetrics metrics = new DisplayMetrics();
+		WindowManager wm = (WindowManager)RhodesService.getInstance().getContext().getSystemService(Context.WINDOW_SERVICE);
+		wm.getDefaultDisplay().getMetrics(metrics);
 		
-		String rootPath = RhodesInstance.getInstance().getRootPath() + "/apps/";
-
 		for (int i = 0; i < size; ++i) {
 			Object param = tabs.elementAt(i);
 			if (!(param instanceof Map<?,?>))
@@ -159,7 +168,7 @@ public class TabbedMainView implements MainView {
 			
 			Object iconObj = hash.get("icon");
 			if (iconObj != null && (iconObj instanceof String))
-				icon = rootPath + (String)iconObj;
+				icon = "apps/" + (String)iconObj;
 			
 			Object reloadObj = hash.get("reload");
 			if (reloadObj != null && (reloadObj instanceof String))
@@ -170,9 +179,12 @@ public class TabbedMainView implements MainView {
 			// Set label and icon
 			BitmapDrawable drawable = null;
 			if (icon != null) {
-				Bitmap bitmap = BitmapFactory.decodeFile(icon);
+				String iconPath = RhoFileApi.normalizePath(icon);
+				Bitmap bitmap = BitmapFactory.decodeStream(RhoFileApi.open(iconPath));
 				if (bitmap != null)
+					bitmap.setDensity(metrics.DENSITY_MEDIUM);//Bitmap.DENSITY_NONE);
 					drawable = new BitmapDrawable(bitmap);
+					drawable.setTargetDensity(metrics);
 			}
 			if (drawable == null)
 				spec.setIndicator(label);
@@ -192,11 +204,28 @@ public class TabbedMainView implements MainView {
 			tabData.addElement(data);
 			host.addTab(spec);
 		}
+		
+		host.requestLayout();
+		
+		tabWidget.measure(host.getWidth(), host.getHeight());
+		int hh = tabWidget.getMeasuredHeight();
+		if (hh < 64) {
+			hh = 64;
+		}
+		lpf.setMargins(0, hh, 0, 0);
+		host.updateViewLayout(frame, lpf);
+		
+	
+	
 	}
 
 	public View getView() {
 		return host;
 	}
+
+	public WebView getWebView(int tab_index) {
+		return getView(tab_index).getWebView(-1);
+	}
 	
 	public WebView detachWebView() {
 		return getView(activeTab()).detachWebView();
@@ -224,10 +253,11 @@ public class TabbedMainView implements MainView {
 
 	public void switchTab(int index) {
 		host.setCurrentTab(index);
+		tabIndex = index;
 	}
 	
 	public int activeTab() {
-		return host.getCurrentTab();
+		return tabIndex;
 	}
 
 	public void goBack() {

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

@@ -18,15 +18,15 @@ import com.google.android.maps.MapActivity;
 import com.google.android.maps.MapController;
 import com.rhomobile.rhodes.AndroidR;
 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 MapView extends MapActivity {
 
 	private static final String TAG = "MapView";
 	
-	private static final String SETTINGS_PREFIX = Rhodes.INTENT_EXTRA_PREFIX + "settings.";
-	private static final String ANNOTATIONS_PREFIX = Rhodes.INTENT_EXTRA_PREFIX + "annotations.";
+	private static final String SETTINGS_PREFIX = RhodesService.INTENT_EXTRA_PREFIX + "settings.";
+	private static final String ANNOTATIONS_PREFIX = RhodesService.INTENT_EXTRA_PREFIX + "annotations.";
 	
 	private static MapView mc = null;
 	
@@ -62,7 +62,7 @@ public class MapView extends MapActivity {
 		
 		mc = this;
 		
-		getWindow().setFlags(Rhodes.WINDOW_FLAGS, Rhodes.WINDOW_MASK);
+		getWindow().setFlags(RhodesService.WINDOW_FLAGS, RhodesService.WINDOW_MASK);
 		
 		RelativeLayout layout = new RelativeLayout(this);
 		setContentView(layout, new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT));
@@ -112,7 +112,7 @@ public class MapView extends MapActivity {
 			ann.subtitle = extras.getString(prefix + "subtitle");
 			ann.url = extras.getString(prefix + "url");
 			if (ann.url != null)
-				ann.url = RhodesInstance.getInstance().normalizeUrl(ann.url);
+				ann.url = RhodesService.getInstance().normalizeUrl(ann.url);
 			annotations.addElement(ann);
 		}
 		
@@ -192,6 +192,18 @@ public class MapView extends MapActivity {
 		geocoding.start();
 	}
 	
+	@Override
+	protected void onStart() {
+		super.onStart();
+		RhodesService.getInstance().activityStarted();
+	}
+	
+	@Override
+	protected void onStop() {
+		RhodesService.getInstance().activityStopped();
+		super.onStop();
+	}
+	
 	private void doGeocoding() {
 		for (int i = 0, lim = annotations.size(); i < lim; ++i) {
 			Annotation ann = annotations.elementAt(i);
@@ -207,7 +219,7 @@ public class MapView extends MapActivity {
 			if (ann.address == null)
 				continue;
 			
-			Geocoder gc = new Geocoder(RhodesInstance.getInstance());
+			Geocoder gc = new Geocoder(RhodesService.getInstance().getContext());
 			try {
 				List<Address> addrs = gc.getFromLocationName(ann.address, 1);
 				if (addrs.size() == 0)
@@ -230,7 +242,7 @@ public class MapView extends MapActivity {
 				Logger.E(TAG, "GeoCoding request failed: " + e.getMessage());
 			}
 			
-			Rhodes.performOnUiThread(new Runnable() {
+			PerformOnUiThread.exec(new Runnable() {
 				public void run() {
 					view.invalidate();
 				}
@@ -246,7 +258,7 @@ public class MapView extends MapActivity {
 	@SuppressWarnings("unchecked")
 	public static void create(String gapiKey, Map<String, Object> params) {
 		try {
-			Intent intent = new Intent(RhodesInstance.getInstance(), MapView.class);
+			Intent intent = new Intent(RhodesService.getInstance().getContext(), MapView.class);
 			intent.putExtra(SETTINGS_PREFIX + "api_key", gapiKey);
 			
 			Object settings = params.get("settings");
@@ -343,7 +355,7 @@ public class MapView extends MapActivity {
 				}
 			}
 			
-			RhodesInstance.getInstance().startActivity(intent);
+			RhodesService.getInstance().startActivity(intent);
 		}
 		catch (Exception e) {
 			reportFail("create", e);
@@ -352,7 +364,7 @@ public class MapView extends MapActivity {
 	
 	public static void close() {
 		try {
-			Rhodes.performOnUiThread(new Runnable() {
+			PerformOnUiThread.exec(new Runnable() {
 				public void run() {
 					if (mc != null) {
 						mc.finish();

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

@@ -0,0 +1,14 @@
+package com.rhomobile.rhodes.nativeview;
+
+
+import android.view.View;
+import android.webkit.WebView;
+import com.rhomobile.rhodes.RhodesService;
+
+class RhoNativeViewManager {
+
+	public static WebView getWebViewObject(int tab_index) {
+		return RhodesService.getInstance().getMainView().getWebView(tab_index);
+	}
+
+}

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

@@ -3,14 +3,14 @@ package com.rhomobile.rhodes.phonebook;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.rhomobile.rhodes.Rhodes;
-import com.rhomobile.rhodes.RhodesInstance;
+import com.rhomobile.rhodes.RhodesService;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;
+import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.ContactsContract.CommonDataKinds.Email;
@@ -38,9 +38,9 @@ public class ContactAccessorNew implements ContactAccessor {
 	private String accType;
 	
 	public ContactAccessorNew() throws Exception {
-		Rhodes r = RhodesInstance.getInstance();
+		Context ctx = RhodesService.getInstance().getContext();
 		
-		Account[] accounts = AccountManager.get(r).getAccounts();
+		Account[] accounts = AccountManager.get(ctx).getAccounts();
 		if (accounts.length == 0) {
 			accName = "rhodes@rhomobile.com";
 			accType = "com.rhomobile";
@@ -51,7 +51,7 @@ public class ContactAccessorNew implements ContactAccessor {
 			accType = acnt.type;
 		}
 		
-		cr = r.getContentResolver();
+		cr = ctx.getContentResolver();
 	}
 	
 	private void fillName(String id, Contact contact) {

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

@@ -3,7 +3,6 @@ package com.rhomobile.rhodes.phonebook;
 import java.util.HashMap;
 import java.util.Map;
 
-import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;
@@ -14,7 +13,7 @@ import android.provider.Contacts.Organizations;
 import android.provider.Contacts.People;
 import android.provider.Contacts.Phones;
 
-import com.rhomobile.rhodes.RhodesInstance;
+import com.rhomobile.rhodes.RhodesService;
 
 @SuppressWarnings("deprecation")
 public class ContactAccessorOld implements ContactAccessor {
@@ -30,12 +29,10 @@ public class ContactAccessorOld implements ContactAccessor {
 	private static final String PB_EMAIL_ADDRESS = Phonebook.PB_EMAIL_ADDRESS;
 	private static final String PB_COMPANY_NAME = Phonebook.PB_COMPANY_NAME;
 	
-	private Activity activity;
 	private ContentResolver cr;
 	
 	public ContactAccessorOld() {
-		activity = RhodesInstance.getInstance(); 
-		cr = activity.getContentResolver();
+		cr = RhodesService.getInstance().getContext().getContentResolver();
 	}
 	
 	private void fillPhones(String id, Contact contact) {
@@ -108,7 +105,7 @@ public class ContactAccessorOld implements ContactAccessor {
 						Contacts.Organizations.CONTENT_DIRECTORY);
 	
 				String[] organizationProjection = new String[] { Organizations.COMPANY };
-				Cursor organizationCursor = activity.managedQuery(orgUri,
+				Cursor organizationCursor = cr.query(orgUri,
 						organizationProjection, "person=?", new String[] {id}, null);
 				try {
 					int organizationCursorCount = organizationCursor.getCount();
@@ -130,7 +127,7 @@ public class ContactAccessorOld implements ContactAccessor {
 						Contacts.ContactMethods.KIND,
 						Contacts.ContactMethods.DATA };
 	
-				Cursor contactCursor = activity.managedQuery(
+				Cursor contactCursor = cr.query(
 						Contacts.ContactMethods.CONTENT_URI,
 						contactProjection, "person=?", new String[] {id}, null);
 				try {

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

@@ -61,7 +61,8 @@ public class Phonebook {
 			className = "ContactAccessorNew";
 		
 		try {
-			String fullName = "com.rhomobile.rhodes.phonebook." + className;
+			String pkgname = ContactAccessor.class.getPackage().getName();
+			String fullName = pkgname + "." + className;
 			Class<? extends ContactAccessor> klass =
 				Class.forName(fullName).asSubclass(ContactAccessor.class);
 			return klass.newInstance();

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

@@ -0,0 +1,182 @@
+/*
+ ============================================================================
+ Author	    : Dmitry Soldatenkov
+ Version	: 1.5
+ Copyright  : Copyright (C) 2010 Rhomobile. All rights reserved.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ============================================================================
+ */
+package com.rhomobile.rhodes.signature;
+
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.rhomobile.rhodes.AndroidR;
+import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.RhoActivity;
+import com.rhomobile.rhodes.RhodesService;
+
+import android.content.ContentValues;
+import android.graphics.PixelFormat;
+import android.graphics.Bitmap;
+import android.hardware.Camera;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.MediaStore.Images.Media;
+import android.view.KeyEvent;
+import android.view.SurfaceHolder;
+import android.view.View;
+import android.view.Window;
+import android.view.View.OnClickListener;
+import android.widget.ImageButton;
+
+public class ImageCapture extends RhoActivity implements OnClickListener
+ {
+	
+	private static final String TAG = "ImageCapture";
+	
+	private String callbackUrl;
+	private String imageFormat;
+	private Camera camera;
+	private boolean isPreviewRunning = false;
+	private SimpleDateFormat timeStampFormat = new SimpleDateFormat("yyyyMMddHHmmssSS");
+
+	private SignatureView surfaceView;
+	private SurfaceHolder surfaceHolder;
+	private ImageButton cancelButton;
+	private ImageButton clearButton;
+	private ImageButton okButton;
+
+	@Override
+	public void onCreate(Bundle icicle) {
+		super.onCreate(icicle);
+		//Logger.D(TAG, "$$$$$$$$$$$$$$$$$$$$$$$$  onCreate");
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
+		//getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		getWindow().setFormat(PixelFormat.TRANSLUCENT);
+		setContentView(AndroidR.layout.signature);
+		
+		Bundle extras = getIntent().getExtras();
+		callbackUrl = extras.getString(com.rhomobile.rhodes.signature.Signature.INTENT_EXTRA_PREFIX + "callback");
+		imageFormat = extras.getString(com.rhomobile.rhodes.signature.Signature.INTENT_EXTRA_PREFIX + "format");
+		
+		surfaceView = (SignatureView) findViewById(AndroidR.id.signature_view);
+		surfaceHolder = surfaceView.getHolder();
+		surfaceHolder.setType(SurfaceHolder.SURFACE_TYPE_NORMAL);
+		
+		cancelButton = (ImageButton)findViewById(AndroidR.id.sig_cancelButton);
+		cancelButton.setOnClickListener(this);
+		clearButton = (ImageButton)findViewById(AndroidR.id.sig_clearButton);
+		clearButton.setOnClickListener(this);
+		okButton = (ImageButton)findViewById(AndroidR.id.sig_okButton);
+		okButton.setOnClickListener(this);
+	}
+
+	@Override
+	protected void onRestoreInstanceState(Bundle savedInstanceState) {
+		Logger.D(TAG, "onRestoreInstanceState");
+		super.onRestoreInstanceState(savedInstanceState);
+		surfaceView.onRestoreInstanceState(savedInstanceState);
+	}
+
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		switch (keyCode) {
+		case KeyEvent.KEYCODE_BACK:
+			return super.onKeyDown(keyCode, event);
+		default:
+			return false;
+		}
+	}
+
+	protected void onResume() {
+		Logger.D(TAG, "onResume");
+		super.onResume();
+	}
+
+	protected void onSaveInstanceState(Bundle outState) {
+		Logger.D(TAG, "onSaveInstanceState");
+		surfaceView.onSaveInstanceState(outState);
+		super.onSaveInstanceState(outState);
+	}
+
+	protected void onStop() {
+		Logger.D(TAG, "onStop");
+		super.onStop();
+	}
+
+	public void onClick(View v) {
+		if (v.getId() == AndroidR.id.sig_cancelButton) {
+			Signature.doCallback(callbackUrl, "");
+			finish();
+		}
+		if (v.getId() == AndroidR.id.sig_clearButton) {
+			surfaceView.doClear();
+		}
+		if (v.getId() == AndroidR.id.sig_okButton) {
+			takeSignature();
+			finish();
+		}
+	}
+	
+
+	
+	private void takeSignature() {
+		try {
+			String file_ext = "jpg";
+			String file_type = "image/jpeg";
+			Bitmap.CompressFormat compress_format = Bitmap.CompressFormat.JPEG;
+			if (imageFormat.equals("png")) {
+				file_ext = "png";
+				file_type = "image/png";
+				compress_format = Bitmap.CompressFormat.PNG;
+			}
+			String filename = "Image_" + timeStampFormat.format(new Date());
+			ContentValues values = new ContentValues(5);
+			values.put(Media.TITLE, filename);
+			values.put(Media.DISPLAY_NAME, filename);
+			values.put(Media.DATE_TAKEN, new Date().getTime());
+			values.put(Media.MIME_TYPE, file_type);
+			values.put(Media.DESCRIPTION, "Handwrited Signature");
+	
+			Uri uri = getContentResolver().insert(Media.EXTERNAL_CONTENT_URI, values);
+			String dir = RhodesService.getBlobPath();
+			
+			//OutputStream osCommon = getContentResolver().openOutputStream(uri);
+	
+			
+			String filePath = dir + "/" + filename + "." + file_ext;
+			OutputStream osOwn = new FileOutputStream(filePath);
+			
+			Bitmap bitmap = surfaceView.makeBitmap();
+	
+			//bitmap.compress(compress_format, 100, osCommon);		
+			//osCommon.flush();
+			//osCommon.close();
+		
+			bitmap.compress(compress_format, 100, osOwn);		
+			osOwn.flush();
+			osOwn.close();
+			
+			Signature.doCallback(callbackUrl, filePath);
+		} catch (Exception ex) {
+			Logger.E(TAG, ex.getMessage());
+		}
+	
+	}
+
+
+}

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

@@ -0,0 +1,89 @@
+/*
+ ============================================================================
+ Author	    : Dmitry Soldatenkov
+ Version	: 1.5
+ Copyright  : Copyright (C) 2010 Rhomobile. All rights reserved.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ============================================================================
+ */
+package com.rhomobile.rhodes.signature;
+
+import java.io.File;
+
+import android.content.Intent;
+
+import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.RhodesService;
+import com.rhomobile.rhodes.util.PerformOnUiThread;
+
+public class Signature {
+
+	private static final String TAG = "Signature";
+	
+	public static final String INTENT_EXTRA_PREFIX = RhodesService.INTENT_EXTRA_PREFIX + "signature.";
+	
+	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(RhodesService.getBlobPath());
+		if (!f.exists())
+			f.mkdirs();
+	}
+	
+	private static class Picture implements Runnable {
+		private String url;
+		private Class<?> klass;
+		private String format;
+		
+		public Picture(String u, Class<?> c, String form) {
+			url = u;
+			klass = c;
+			format = form;
+		}
+		
+		public void run() {
+			init();
+			RhodesService r = RhodesService.getInstance();
+			Intent intent = new Intent(r.getContext(), klass);
+			intent.putExtra(INTENT_EXTRA_PREFIX + "callback", url);
+			intent.putExtra(INTENT_EXTRA_PREFIX + "format", format);
+			r.startActivity(intent);
+		}
+	};
+	
+	public static void takeSignature(String url, String format) {
+		try {
+			Runnable runnable = new Picture(url, ImageCapture.class, format);
+			PerformOnUiThread.exec(runnable, false);
+		}
+		catch (Exception e) {
+			reportFail("takeSignature", e);
+		}
+	}
+
+	
+	public static void doCallback(String callbackUrl, String filePath) {
+		String fp = filePath == null ? "" : filePath;
+		int idx = fp.lastIndexOf('/');
+		if (idx != -1)
+			fp = fp.substring(idx + 1);
+		callback(callbackUrl, fp, "", fp.length() == 0);
+	}
+
+	public static native void callback(String callbackUrl, String filePath, String error, boolean cancelled);
+
+}