rhodes 2.2.6 → 2.3.0.beta.1

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

@@ -0,0 +1,111 @@
+package com.rhomobile.rhodes.mapview;
+
+import android.util.Log;
+import android.view.MotionEvent;
+
+import com.rhomobile.rhodes.mapview.MapTouch.Touch;
+
+public class MultiTouchHandler implements TouchHandler {
+	
+	private static final String TAG = MultiTouchHandler.class.getSimpleName();
+	
+	private static final boolean DEBUG = false;
+
+	private MapTouch mMapTouch;
+	
+	public void setMapTouch(MapTouch mapTouch) {
+		mMapTouch = mapTouch;
+	}
+	
+	private static final float CLICK_TOLERANCE = 8;
+	private float mFirstTouchX;
+	private float mFirstTouchY;
+	private boolean mIsClickPossible;
+	
+	
+	private void dumpEvent(MotionEvent event) {
+		String names[] = { "DOWN", "UP", "MOVE", "CANCEL", "OUTSIDE",
+				"POINTER_DOWN", "POINTER_UP", "7?", "8?", "9?" };
+		StringBuilder sb = new StringBuilder();
+		int action = event.getAction();
+		int actionCode = action & MotionEvent.ACTION_MASK;
+		sb.append("event ACTION_").append(names[actionCode]);
+		if (actionCode == MotionEvent.ACTION_POINTER_DOWN
+				|| actionCode == MotionEvent.ACTION_POINTER_UP) {
+			sb.append("(pid ").append(
+					action >> MotionEvent.ACTION_POINTER_ID_SHIFT);
+			sb.append(")");
+		}
+		sb.append("[");
+		for (int i = 0; i < event.getPointerCount(); i++) {
+			sb.append("#").append(i);
+			sb.append("(pid ").append(event.getPointerId(i));
+			sb.append(")=").append((int) event.getX(i));
+			sb.append(",").append((int) event.getY(i));
+			if (i + 1 < event.getPointerCount())
+				sb.append(";");
+		}
+		sb.append("]");
+		Log.d(TAG, sb.toString());
+	}
+	
+	@Override
+	public boolean handleTouch(MotionEvent event) {
+		if (DEBUG)
+			dumpEvent(event);
+		
+		int action = event.getAction();
+		int actionCode = action & MotionEvent.ACTION_MASK;
+		
+		Touch[] data = new Touch[Math.max(2, event.getPointerCount())];
+		int i, lim;
+		for (i = 0, lim = Math.min(data.length, event.getPointerCount()); i < lim; ++i)
+			data[i] = new Touch(event.getX(i), event.getY(i));
+		for (; i < data.length; ++i)
+			data[i] = null;
+		
+		boolean isSingleTouch = (event.getPointerCount() < 2);
+		
+		switch (actionCode) {
+		case MotionEvent.ACTION_DOWN:
+		case MotionEvent.ACTION_POINTER_DOWN:
+			mIsClickPossible = isSingleTouch;
+			mFirstTouchX = data[0].x;
+			mFirstTouchY = data[0].y;
+			mMapTouch.touchDown(data[0], data[1]);
+			break;
+		case MotionEvent.ACTION_UP:
+		case MotionEvent.ACTION_POINTER_UP:
+			mMapTouch.touchUp(data[0], data[1]);
+			if (isSingleTouch) {
+				if (checkDistance(data[0].x, data[0].y, mFirstTouchX, mFirstTouchY, CLICK_TOLERANCE)) {
+					mMapTouch.touchClick(data[0]);
+				}
+			}
+			break;
+		case MotionEvent.ACTION_MOVE:
+			if (isSingleTouch) {
+				if (!checkDistance(data[0].x, data[0].y, mFirstTouchX, mFirstTouchY, CLICK_TOLERANCE)) {
+					mIsClickPossible = false;
+				}
+			}
+			else {
+				mIsClickPossible = false;
+			}
+			mMapTouch.touchMove(data[0], data[1]);
+			break;
+		}
+		
+		return true;
+	}
+
+	private boolean checkDistance(float x1, float y1, float x2, float y2, float delta) {
+		float dx = x1 - x2;
+		if (dx < 0) dx = -dx;
+		float dy = y1 - y2;
+		if (dy < 0) dy = -dy;
+		return ((dx <= delta) && (dy <= delta));
+	}
+	
+	
+}

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

@@ -0,0 +1,77 @@
+package com.rhomobile.rhodes.mapview;
+
+import android.util.Log;
+import android.view.MotionEvent;
+
+import com.rhomobile.rhodes.mapview.MapTouch.Touch;
+
+public class OneTouchHandler implements TouchHandler {
+	
+	private static final String TAG = OneTouchHandler.class.getSimpleName();
+	
+	private static final boolean DEBUG = false;
+	
+	private MapTouch mMapTouch;
+	
+	public void setMapTouch(MapTouch mapTouch) {
+		mMapTouch = mapTouch;
+	}
+	
+	private static final float CLICK_TOLERANCE = 8;
+	private float mFirstTouchX;
+	private float mFirstTouchY;
+	private boolean mIsClickPossible;
+	
+	private void dumpEvent(MotionEvent event) {
+		String names[] = { "DOWN", "UP", "MOVE", "CANCEL", "OUTSIDE",
+				"5?", "6?", "7?", "8?", "9?" };
+		StringBuilder sb = new StringBuilder();
+		int action = event.getAction();
+		sb.append("event ACTION_").append(names[action]);
+		sb.append("[");
+		sb.append((int)event.getX());
+		sb.append((int)event.getY());
+		sb.append("]");
+		Log.d(TAG, sb.toString());
+	}
+
+	@Override
+	public boolean handleTouch(MotionEvent event) {
+		if (DEBUG)
+			dumpEvent(event);
+		
+		int action = event.getAction();
+		switch (action) {
+		case MotionEvent.ACTION_DOWN:
+			mIsClickPossible = true;
+			mFirstTouchX = event.getX();
+			mFirstTouchY = event.getY();
+			mMapTouch.touchDown(new Touch(event.getX(), event.getY()), null);
+			break;
+		case MotionEvent.ACTION_UP:
+			mMapTouch.touchUp(new Touch(event.getX(), event.getY()), null);
+			// check for click
+			if (checkDistance(event.getX(), event.getY(), mFirstTouchX, mFirstTouchY, CLICK_TOLERANCE) && mIsClickPossible) {
+				mMapTouch.touchClick(new Touch(event.getX(), event.getY()));
+			}
+			break;
+		case MotionEvent.ACTION_MOVE:
+			if (!checkDistance(event.getX(), event.getY(), mFirstTouchX, mFirstTouchY, CLICK_TOLERANCE)) {
+				mIsClickPossible = false;
+			}
+			mMapTouch.touchMove(new Touch(event.getX(), event.getY()), null);
+			break;
+		}
+		
+		return true;
+	}
+	
+	private boolean checkDistance(float x1, float y1, float x2, float y2, float delta) {
+		float dx = x1 - x2;
+		if (dx < 0) dx = -dx;
+		float dy = y1 - y2;
+		if (dy < 0) dy = -dy;
+		return ((dx <= delta) && (dy <= delta));
+	}
+
+}

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

@@ -0,0 +1,10 @@
+package com.rhomobile.rhodes.mapview;
+
+import android.view.MotionEvent;
+
+public interface TouchHandler {
+
+	public void setMapTouch(MapTouch mapTouch);
+	public boolean handleTouch(MotionEvent event);
+	
+}

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

@@ -1,6 +1,5 @@
 package com.rhomobile.rhodes.nativeview;
 
-
 import android.view.View;
 import android.webkit.WebView;
 import com.rhomobile.rhodes.RhodesService;

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

@@ -26,7 +26,7 @@ import com.rhomobile.rhodes.Logger;
 public class Contact {
 	
 	private static final String TAG = "Contact";	
-	private static final boolean logging_enable = false;
+	//private static final boolean logging_enable = false;
 	
 	private String id = null;
 	
@@ -57,9 +57,11 @@ public class Contact {
 		mIsCompanyFilled = true;
 	}
 	
+	/*
 	private boolean isFullFilled() {
 		return (mIsNameFilled && mIsPhoneFilled && mIsEmailsFilled && mIsCompanyFilled);
 	}
+	*/
 
 	
 	public void setFieldInner(int key, String value) {
@@ -137,6 +139,7 @@ public class Contact {
 		return id;
 	}
 
+	/*
 	private void fillAll() {
 		if (!isFullFilled()) {
 			int i;
@@ -145,6 +148,7 @@ public class Contact {
 			}
 		}
 	}
+	*/
 	
 
 	/*

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

@@ -44,7 +44,7 @@ public class ContactAccessorNew implements ContactAccessor {
 	
 	
 	public ContactAccessorNew() throws Exception {
-		Context ctx = RhodesService.getInstance().getContext();
+		Context ctx = RhodesService.getContext();
 		
 		Account[] accounts = AccountManager.get(ctx).getAccounts();
 		if (accounts.length == 0) {

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

@@ -33,7 +33,7 @@ public class ContactAccessorOld implements ContactAccessor {
 	private ContentResolver cr;
 	
 	public ContactAccessorOld() {
-		cr = RhodesService.getInstance().getContext().getContentResolver();
+		cr = RhodesService.getInstance().getContentResolver();
 	}
 	
 	private void fillPhones(String id, Contact contact) {

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

@@ -27,14 +27,12 @@ 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 com.rhomobile.rhodes.BaseActivity;
+import com.rhomobile.rhodes.RhodesAppOptions;
 
 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;
@@ -44,15 +42,13 @@ import android.view.Window;
 import android.view.View.OnClickListener;
 import android.widget.ImageButton;
 
-public class ImageCapture extends RhoActivity implements OnClickListener
+public class ImageCapture extends BaseActivity 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;
@@ -151,12 +147,11 @@ public class ImageCapture extends RhoActivity implements OnClickListener
 			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();
+
+			String dir = RhodesAppOptions.getBlobPath();
 			
+			//Uri uri = getContentResolver().insert(Media.EXTERNAL_CONTENT_URI, values);
 			//OutputStream osCommon = getContentResolver().openOutputStream(uri);
-	
 			
 			String filePath = dir + "/" + filename + "." + file_ext;
 			OutputStream osOwn = new FileOutputStream(filePath);

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

@@ -25,6 +25,8 @@ import java.io.File;
 import android.content.Intent;
 
 import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.RhodesActivity;
+import com.rhomobile.rhodes.RhodesAppOptions;
 import com.rhomobile.rhodes.RhodesService;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
 
@@ -39,7 +41,7 @@ public class Signature {
 	}
 	
 	private static void init() {
-		File f = new File(RhodesService.getBlobPath());
+		File f = new File(RhodesAppOptions.getBlobPath());
 		if (!f.exists())
 			f.mkdirs();
 	}
@@ -57,11 +59,11 @@ public class Signature {
 		
 		public void run() {
 			init();
-			RhodesService r = RhodesService.getInstance();
-			Intent intent = new Intent(r.getContext(), klass);
+			RhodesActivity ra = RhodesActivity.getInstance();
+			Intent intent = new Intent(ra, klass);
 			intent.putExtra(INTENT_EXTRA_PREFIX + "callback", url);
 			intent.putExtra(INTENT_EXTRA_PREFIX + "format", format);
-			r.startActivity(intent);
+			ra.startActivity(intent);
 		}
 	};
 	

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

@@ -90,13 +90,6 @@ class SignatureView extends SurfaceView implements SurfaceHolder.Callback {
 	
 	private static final String TAG = "SignatureView";
 	
-	
-    /** Handle to the application context, used to e.g. fetch Drawables. */
-    private Context mContext;
-	
-    private int mCanvasHeight = 1;
-    private int mCanvasWidth = 1;
-    
     Bitmap mBitmap;
     Canvas mCanvas;
     

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

@@ -21,6 +21,7 @@
 package com.rhomobile.rhodes.ui;
 
 import com.rhomobile.rhodes.AndroidR;
+import com.rhomobile.rhodes.RhoLogConf;
 import com.rhomobile.rhodes.RhodesService;
 
 import android.app.Dialog;
@@ -66,6 +67,10 @@ public class LogViewDialog extends Dialog implements OnClickListener {
 		
 		loadLogText();
 	}
+	
+	private RhoLogConf getLogConf() {
+		return RhodesService.getInstance().getLogConf();
+	}
 
 	public void onClick(View view) {
 		switch (view.getId()) {
@@ -73,11 +78,11 @@ public class LogViewDialog extends Dialog implements OnClickListener {
 			loadLogText();
 			break;
 		case AndroidR.id.logviewClearButton:
-			RhodesService.getInstance().getLogConf().clearLog();
+			getLogConf().clearLog();
 			loadLogText();
 			break;
 		case AndroidR.id.logviewSendButton:
-			RhodesService.getInstance().getLogConf().sendLog();
+			getLogConf().sendLog();
 			break;
 		case AndroidR.id.logviewCloseButton:
 			cancel();
@@ -86,14 +91,14 @@ public class LogViewDialog extends Dialog implements OnClickListener {
 	}
 
 	private void loadLogText(){
-        String strLog = RhodesService.getInstance().getLogConf().getLogText();
+        String strLog = getLogConf().getLogText();
         findCurLine(strLog);
         
         logContent.setText(strLog);
 	}
 	
 	void findCurLine(String strLog){
-        int nPos = RhodesService.getInstance().getLogConf().getLogTextPos();
+        int nPos = getLogConf().getLogTextPos();
         curLine = 0;
         
         for ( int nEndLine = strLog.indexOf('\n'); nEndLine >= 0 && nEndLine<nPos; 

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

@@ -1,11 +1,11 @@
 package com.rhomobile.rhodes.util;
 
 import com.rhomobile.rhodes.Logger;
-import com.rhomobile.rhodes.RhodesService;
+import com.rhomobile.rhodes.RhodesActivity;
 
 public class PerformOnUiThread implements Runnable {
 	
-	private static final String TAG = "PerformOnUiThread";
+	private static final String TAG = PerformOnUiThread.class.getSimpleName();
 	
 	private Runnable runnable;
 	
@@ -29,8 +29,8 @@ public class PerformOnUiThread implements Runnable {
 	
 	public static void exec(Runnable r, int delay) {
 		try {
-			RhodesService rhodes = RhodesService.getInstance();
-			rhodes.post(r, delay);
+			RhodesActivity ra = RhodesActivity.getInstance();
+			ra.post(r, delay);
 		}
 		catch (Exception e) {
 			Logger.E(TAG, "exec failed: " + e.getMessage());
@@ -39,20 +39,20 @@ public class PerformOnUiThread implements Runnable {
 	
 	public static void exec(Runnable r, boolean wait) {
 		try {
-			RhodesService rhodes = RhodesService.getInstance();
+			RhodesActivity ra = RhodesActivity.getInstance();
 			if (!wait) {
-				rhodes.post(r);
+				ra.post(r);
 			}
 			else {
 				long thrId = Thread.currentThread().getId();
-				if (rhodes.getUiThreadId() == thrId) {
+				if (ra.getUiThreadId() == thrId) {
 					// We are already in UI thread
 					r.run();
 				}
 				else {
 					// Post request to UI thread and wait when it would be done
 					synchronized (r) {
-						rhodes.post(new PerformOnUiThread(r));
+						ra.post(new PerformOnUiThread(r));
 						r.wait();
 					}
 				}

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

@@ -1,15 +1,19 @@
 package com.rhomobile.rhodes.webview;
 
-import android.webkit.WebChromeClient;
 import android.webkit.WebStorage;
 
 import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.RhodesActivity;
 
 
 public class ChromeClientNew extends ChromeClientOld {
 
 	private static final String TAG = "ChromeClientNew";
 	
+	public ChromeClientNew(RhodesActivity rhodesActivity) {
+		super(rhodesActivity);
+	}
+
 	@Override
 	public void onConsoleMessage(String message, int lineNumber, String sourceID) {
 		Logger.D(TAG, message + " -- From line " + lineNumber + " of " + sourceID);

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

@@ -1,7 +1,6 @@
 package com.rhomobile.rhodes.webview;
 
-import com.rhomobile.rhodes.Rhodes;
-import com.rhomobile.rhodes.RhodesService;
+import com.rhomobile.rhodes.RhodesActivity;
 
 import android.view.Window;
 import android.webkit.JsResult;
@@ -10,16 +9,21 @@ import android.webkit.WebView;
 
 public class ChromeClientOld extends WebChromeClient {
 	
+	private RhodesActivity mRhodesActivity;
+	
+	public ChromeClientOld(RhodesActivity rhodesActivity) {
+		mRhodesActivity = rhodesActivity;
+	}
+	
 	@Override
 	public void onProgressChanged(WebView view, int newProgress) {
-		if (RhodesService.ENABLE_LOADING_INDICATION) {
+		if (RhodesActivity.ENABLE_LOADING_INDICATION) {
 			newProgress *= 100;
 			if (newProgress < 0)
 				newProgress = 0;
-			if (newProgress > RhodesService.MAX_PROGRESS)
-				newProgress = RhodesService.MAX_PROGRESS;
-			Rhodes r = Rhodes.getInstance();
-			r.getWindow().setFeatureInt(Window.FEATURE_PROGRESS, newProgress);
+			if (newProgress > RhodesActivity.MAX_PROGRESS)
+				newProgress = RhodesActivity.MAX_PROGRESS;
+			mRhodesActivity.getWindow().setFeatureInt(Window.FEATURE_PROGRESS, newProgress);
 		}
 		super.onProgressChanged(view, newProgress);
 	}

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

@@ -1,7 +1,5 @@
 package com.rhomobile.rhodes.webview;
 
-import com.rhomobile.rhodes.RhodesService;
-
 import android.content.Context;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
@@ -14,11 +12,11 @@ public class RhoWebSettingsNew implements RhoWebSettings {
 		
 		webSettings.setAppCacheEnabled(true);
 		
-		
 		webSettings.setDatabaseEnabled(true);
-		webSettings.setJavaScriptEnabled(true); 
+		webSettings.setJavaScriptEnabled(true);
 		
-		String databasePath = RhodesService.getInstance().getContext().getDir("database", Context.MODE_PRIVATE).getPath();
+		Context context = w.getContext();
+		String databasePath = context.getDir("database", Context.MODE_PRIVATE).getPath();
 		webSettings.setDatabasePath(databasePath);
 		 
 		return webSettings;

data/platform/android/build/RhodesSRC_build.files

@@ -1,23 +1,7 @@
-platform/android/Rhodes/src/com/rhomobile/rhodes/AndroidR.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/HttpLog.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/Logger.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/NavBar.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkConnectivityListener.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkStateTracker.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/PushReceiver.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/PushService.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhoActivity.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhoConf.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhoLogConf.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/Utils.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/AndroidR.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/Base64.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/BaseActivity.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/IRhoBluetoothManager.java 
 platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothDeviceListActivity.java 
 platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManager.java 
@@ -27,35 +11,58 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothSession.j
 platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/UUIDHelper.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/camera/FileList.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCaptureCallback.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePicker.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePickerScreen.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/event/Event.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/event/EventStore.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/file/RhoFileApi.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/HttpLog.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/Logger.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/MainView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/Annotation.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/AnnotationsOverlay.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/GoogleMapView.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapTouch.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MultiTouchHandler.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/OneTouchHandler.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/TouchHandler.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoNativeViewManager.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/NavBar.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkConnectivityListener.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkStateTracker.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessor.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorNew.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorOld.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactField.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Phonebook.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/PushReceiver.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/PushService.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoConf.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoCryptImpl.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesApplication.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesAppOptions.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoLogConf.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/signature/ImageCapture.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/signature/Signature.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/signature/SignatureView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSockAddr.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocket.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocketImpl.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocket.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/socket/SSLImpl.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/ui/AboutDialog.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogOptionsDialog.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogViewDialog.java
@@ -66,8 +73,10 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/uri/TelUriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/UriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/VideoUriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/util/PerformOnUiThread.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/Utils.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientNew.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientOld.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettings.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsNew.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsOld.java