rhodes 3.3.3.beta.4 → 3.3.3

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

@@ -0,0 +1,9 @@
+// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!
+package com.rhomobile.rhodes.extmanager;
+
+class RhodesStartupListeners {
+
+	public static final String[] ourRunnableList = { ""
+	};
+
+}

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

@@ -0,0 +1,53 @@
+package com.rhomobile.rhodes.extmanager;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.view.inputmethod.InputMethodManager;
+
+import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.util.ContextFactory;
+
+public class WebkitExtension extends AbstractRhoExtension implements IRhoExtension {
+    public static final String EXTNAME = "MotorolaWebkit";
+    private static final String TAG = WebkitExtension.class.getSimpleName();
+    
+    private static WebkitExtension mInstance;
+    
+    private Config mConfig;
+    
+    public static WebkitExtension getInstance() {
+        return mInstance;
+    }
+
+    private WebkitExtension(Config config) {
+        mConfig = config;
+    }
+    
+    public Config getConfig() {
+        return mConfig;
+    }
+    
+    @Override
+    public void onInputMethod(IRhoExtManager extManager, boolean enabled, String type, Rect rect, IRhoExtData ext) {
+        InputMethodManager imm = (InputMethodManager) ContextFactory.getUiContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        if (enabled) {
+            imm.showSoftInput(ext.getWebView(), 0);
+        } else {
+            imm.hideSoftInputFromWindow(ext.getWebView().getApplicationWindowToken(), 0);
+        }
+    }
+
+    @Override
+    public void startLocationUpdates(IRhoExtManager extManager, boolean highAccuracy, IRhoExtData ext) {
+    }
+
+    @Override
+    public void stopLocationUpdates(IRhoExtManager extManager, IRhoExtData ext) {
+    }
+
+    public static void registerWebkitExtension(Config config) {
+        mInstance = new WebkitExtension(config);
+        RhoExtManager.getInstance().registerExtension(EXTNAME, mInstance);
+    }
+
+}

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

@@ -60,7 +60,8 @@ public class RhoFileApi {
     private static final String DB_FILES_FOLDER = "db/db-files";
     private static final String TMP_FOLDER = "tmp";
 
-	private static native void nativeInitPath(String rootPath, String sqliteJournalsPath, String apkPath);
+	private static native void nativeInitPath(String rootPath, String sqliteJournalsPath, String apkPath, String sharedPath);
+	private static native void nativeInitLogPath(String path);
 	private static native void nativeInit();
 	private static native void updateStatTable(String path, String type, long size, long mtime);
 	
@@ -69,6 +70,9 @@ public class RhoFileApi {
 	
 	private static native boolean needEmulate(String path);
 	private static native String makeRelativePath(String path);
+	
+    public static native void setFsModeTransparrent(boolean transparrent);
+	public static native void removeBundleUpgrade();
 
     private static void fillStatTable() throws IOException {
         InputStream is = null;
@@ -127,12 +131,10 @@ public class RhoFileApi {
 		}
 	}
 
-	public static String initRootPath(String dataDir, String sourceDir) {
+	public static String initRootPath(String dataDir, String sourceDir, String sharedDir) {
 		
 		root = dataDir + "/rhodata/";
 		String sqliteJournals = dataDir + "/sqlite_stmt_journals/";
-		Log.d(TAG, "App root path: " + root);
-		Log.d(TAG, "Sqlite journals path: " + sqliteJournals);
 		
 		File f = new File(getRootPath());
 		f.mkdirs();
@@ -145,9 +147,21 @@ public class RhoFileApi {
 		
 		String apkPath = sourceDir;
 		
-		nativeInitPath(root, sqliteJournals, apkPath);
-		return root;
-	}
+		if (sharedDir == null || sharedDir.length() == 0) {
+		    sharedDir = root;
+		}
+		
+        Log.d(TAG, "App root path: " + root);
+        Log.d(TAG, "Sqlite journals path: " + sqliteJournals);
+        Log.d(TAG, "Shared path: " + sharedDir);
+
+        nativeInitPath(root, sqliteJournals, apkPath, sharedDir);
+        return root;
+    }
+
+    public static void initLogPath(String path) {
+        nativeInitLogPath(path);
+    }
 
     public static String getRootPath() { return root; }
     public static String getDbFilesUriPath() { return DB_FILES_FOLDER; }
@@ -163,10 +177,13 @@ public class RhoFileApi {
 		fillStatTable();
 	}
 	
-	public static void initCopy(Context ctx, String assets[])
+	public static void initialCopy(Context ctx, String assets[])
 	{
 		am = ctx.getAssets();
-		copyAssets(assets);
+        for(String asset: assets)
+        {
+            forceFile(getRootPath() + asset);
+        }
 	}
 	
 	public static boolean copy(String path)
@@ -175,8 +192,6 @@ public class RhoFileApi {
 		InputStream is = null;
 		OutputStream os = null;
 		try {
-			//RhodesService r = RhodesService.getInstance();
-			
 			is = am.open(path);
 			
 			File dst = new File(root, path);
@@ -272,7 +287,7 @@ public class RhoFileApi {
 			return is;
 		}
 		catch (IOException e) {
-			//Log.e(TAG, "Can not open " + path);
+			Log.e(TAG, e.getMessage());
 			return null;
 		}
 	}

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

@@ -25,6 +25,8 @@
 *------------------------------------------------------------------------*/
 package com.rhomobile.rhodes.geolocation;
 
+import android.location.Location;
+
 import com.rhomobile.rhodes.Capabilities;
 import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.RhoConf;
@@ -33,75 +35,89 @@ import com.rhomobile.rhodes.util.PerformOnUiThread;
 public class GeoLocation {
 
 	private static final String TAG = "GeoLocation";
-	private static final String inactivityTimeoutName = "geo_location_inactivity_timeout"; 
-	private static final String updatePeriodName = "gps_ping_timeout_sec"; 
 	private static volatile GeoLocationImpl locImpl = null;
-	private static volatile int inactivityTimerId = 0;
-	private static long updatePeriod = -1;
 	
-	static long getInactivityTimeout() {
-		long upd = getUpdatePeriod();
-		long ret = 0;
-		if (RhoConf.isExist(inactivityTimeoutName))
-			ret = RhoConf.getInt(inactivityTimeoutName) * 1000;
-
-		if (ret <= upd) {
-			ret = upd*10;
-			Logger.W(TAG, "Inactivity time out less then position update period, override configured value: " + ret);
+	private static final String CALLBACK_UPDATE_INTERVAL = "gps_ping_timeout_sec";
+	
+	private static double ourLatitude = 0;
+	private static double ourLongitude = 0;
+	private static double ourAccuracy = 0;
+	private static boolean ourIsKnownPosition = false;
+	private static boolean ourIsEnable = true;
+	private static boolean ourIsErrorState = false;
+	
+	public static native void geoCallback();
+	public static native void geoCallbackError();
+	
+	
+	public static void onUpdateLocation() {
+		Location loc = getImpl().getLocation();
+		synchronized (GeoLocation.class) {
+			if (loc != null) {
+				ourLatitude = loc.getLatitude();
+				ourLongitude = loc.getLongitude();
+				ourAccuracy = loc.getAccuracy();
+				ourIsKnownPosition = true;
+			}
+			else {
+				ourLatitude = 0;
+				ourLongitude = 0;
+				ourAccuracy = 0;
+				ourIsKnownPosition = false;
+			}
 		}
-		
-		return ret;
 	}
 	
-	static long getUpdatePeriod() {
-		if (updatePeriod != -1) {
-			return updatePeriod; 
-		}
-		if (RhoConf.isExist(updatePeriodName)) {
-			long ret = RhoConf.getInt(updatePeriodName) * 1000;
-			return ret;
-		} else
-			return 30000; // 30 sec
+	public static void onGeoCallback() {
+		Logger.T(TAG, "onGeoCallback()");
+		if (ourIsEnable && !ourIsErrorState) {
+			Logger.T(TAG, "onGeoCallback() run native Callback");
+			geoCallback();
+		}
+		else {
+			Logger.T(TAG, "onGeoCallback() SKIP");
+		}
+	}
+	
+	public static void onGeoCallbackError() {
+		if (ourIsEnable && !ourIsErrorState) {
+			Logger.T(TAG, "onGeoCallbackError() run native Callback");
+			ourIsErrorState = true;
+			geoCallbackError();
+			ourIsErrorState = false;
+		}
+		else {
+			Logger.T(TAG, "onGeoCallbackError() SKIP");
+		}
 	}
 	
+	private static Thread ourCallbackThread = null;
+	
 	private static void checkState() throws IllegalAccessException {
 		if (!Capabilities.GPS_ENABLED)
 			throw new IllegalAccessException("Capability GPS disabled");
 	}
 	
-	private static void updateInactivityTimer() {
-		final long inactivityTimeout = getInactivityTimeout();
-		Logger.T(TAG, "Updating inactivity timer: " + inactivityTimeout + "ms");
-		PerformOnUiThread.exec(new Runnable() {
-			int lastId = ++inactivityTimerId;
-			public void run() {
-				if ((inactivityTimerId != lastId) || (locImpl == null))
-					return;
-
-				Logger.T(TAG, "Stop geolocation by inactivity timeout: " + inactivityTimeout + "ms");
-				stop();
-			}
-		}, inactivityTimeout);
-	}
-
 	private static GeoLocationImpl getImpl() {
 		if (locImpl == null) {
 			synchronized (GeoLocation.class) {
 				if (locImpl == null) {
 					Logger.T(TAG, "Creating GeoLocationImpl instance.");
-					locImpl = new GeoLocationImpl(getUpdatePeriod());
+					locImpl = new GeoLocationImpl();
 					Logger.T(TAG, "GeoLocationImpl instance has created.");
+					//ourIsFirstUpdate = true;
 					locImpl.start();
 					Logger.T(TAG, "GeoLocation has started.");
 				}
 			}
 		}
-		updateInactivityTimer();
 		return locImpl;
 	}
 	
 	public static void stop() {
 		Logger.T(TAG, "stop");
+		ourIsEnable = false;
+		resetCallbackThread(0);
 		try {
 			if (locImpl == null)
 				return;
@@ -117,18 +133,6 @@ public class GeoLocation {
 		}
 	}
 
-    public static void restart() {
-        try {
-            checkState();
-            Logger.T(TAG, "restart");
-            if (updatePeriod != -1)
-                getImpl().setTimeout(getUpdatePeriod());
-        }
-        catch (Exception e) {
-            Logger.E(TAG, e);
-        }
-    }
-
 	public static boolean isAvailable() {
 		Logger.T(TAG, "isAvailable...");
 		try {
@@ -147,10 +151,11 @@ public class GeoLocation {
 	}
 	
 	public static double getLatitude() {
+		onUpdateLocation();
 		try {
 			checkState();
 			Logger.T(TAG, "getLatitude");
-			return getImpl().getLatitude();
+			return ourLatitude;
 		}
 		catch (Exception e) {
             Logger.E(TAG, e);
@@ -159,10 +164,11 @@ public class GeoLocation {
 	}
 
 	public static double getLongitude() {
+		onUpdateLocation();
 		try {
 			checkState();
 			Logger.T(TAG, "getLongitude");
-			return getImpl().getLongitude();
+			return ourLongitude;
 		}
 		catch (Exception e) {
             Logger.E(TAG, e);
@@ -171,10 +177,11 @@ public class GeoLocation {
 	}
 	
 	public static float getAccuracy() {
+		onUpdateLocation();
 		try {
 			checkState();
 			Logger.T(TAG, "getAccuracy");
-			return getImpl().getAccuracy();
+			return (float)ourAccuracy;
 		}
 		catch (Exception e) {
             Logger.E(TAG, e);
@@ -183,10 +190,11 @@ public class GeoLocation {
 	}
 
 	public static boolean isKnownPosition() {
+		onUpdateLocation();
 		try {
 			checkState();
 			Logger.T(TAG, "isKnownPosition");
-			return getImpl().isKnownPosition();
+			return ourIsKnownPosition;
 		}
 		catch (Exception e) {
             Logger.E(TAG, e);
@@ -194,17 +202,71 @@ public class GeoLocation {
 		return false;
 	}
 	
+	private static void resetCallbackThread(int period) {
+		Logger.T(TAG, "resetCallbackThread: " + period + "s");
+		if (ourCallbackThread != null) {
+			ourCallbackThread.interrupt();
+			ourCallbackThread = null;
+		}
+		if (period > 0) {
+			final int sleep_period = period;
+			ourCallbackThread = new Thread(new Runnable() {
+				private boolean ourLastCommandProcessed = true;
+				public void run() {
+					Logger.I(TAG, "\"callback\" thread started");
+					for (;;) {
+						if (!ourIsEnable) {
+							break;
+						}
+						try {
+							if (ourLastCommandProcessed) {
+								ourLastCommandProcessed = false;
+								Logger.T(TAG, "callback thread: perform callback in UI thread");
+								PerformOnUiThread.exec(new Runnable() {
+									public void run() {
+										Logger.T(TAG, "callback thread: callback in UI thread START");
+										onGeoCallback();
+										Logger.T(TAG, "callback thread: callback in UI thread FINISH");
+										ourLastCommandProcessed = true;
+									}
+								});
+							}
+							else {
+								Logger.T(TAG, "callback thread: previous command not processed - skip current callback");
+							}
+							Thread.sleep(sleep_period);
+						}
+						catch (InterruptedException e) {
+							Logger.T(TAG, "\"callback\" thread interrupted");
+							break;
+						}
+					}
+				}
+			});	
+			ourCallbackThread.start();
+		}
+		else {
+			Logger.T(TAG, "resetCallbackThread: zero period - not make any thread");
+		}
+		
+	}
+	
 	public static void setTimeout(int nsec) {
 		try {
-			if (nsec < 0) {
-				Logger.E(TAG, "setTimeout: wrong parameter: " + nsec);
-				return;
+			int p = nsec*1000;
+			if (p < 0) {
+				p = RhoConf.getInt(CALLBACK_UPDATE_INTERVAL) * 1000;
 			}
 			
 			checkState();
 			Logger.T(TAG, "setTimeout: " + nsec + "s");
-			updatePeriod = nsec * 1000;
-			getImpl().setTimeout(getUpdatePeriod());
+		
+			ourIsEnable = true;
+			if (p <= 0) {
+				p = 250;
+			}
+			resetCallbackThread(p);
+		
 		}
 		catch (Exception e) {
             Logger.E(TAG, e);

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

@@ -44,14 +44,11 @@ import android.os.Looper;
 public class GeoLocationImpl {
 
 	private static final String TAG = "GeoLocationImpl";
-	private static final long TIMEOUT_STOP = -1;
 	
-	private LocationManager locationManager = null;
-	private volatile Location lastLocation;
+	private static final int UPDATE_PERIOD_IN_MILLISECONDS = 250;
 	
-	// These two values should be equal in most cases but explicit request to GeoLocation without call to setTimeout
-	private long invalidateLocationPeriod;
-	private volatile long pingTimeout = Long.MAX_VALUE;
+	private LocationManager locationManager = null;
+	private volatile Location lastLocation = null;
 	
 	private List<RhoLocationListener> mListeners = new LinkedList<RhoLocationListener>();
     private List<RhoLocationListener> mSwitchedOffListeners = new LinkedList<RhoLocationListener>();
@@ -60,7 +57,6 @@ public class GeoLocationImpl {
 		private String providerName;
 		private LocationManager manager;
 		private LocationProvider provider;
-		private long updatePeriod = 0;
 		private boolean available = false;
 		
 		boolean isAvailable() { return available; }
@@ -72,7 +68,7 @@ public class GeoLocationImpl {
 		
 		String getProviderName() { return this.providerName; }
 		
-		synchronized boolean register(long updatePeriod) {
+		synchronized boolean register() {
 			Logger.T(TAG, "Registering location listener for '" + this.providerName + "'.");
 			if (this.provider != null) {
 				this.manager.removeUpdates(this);
@@ -80,8 +76,7 @@ public class GeoLocationImpl {
 				this.provider = this.manager.getProvider(this.providerName);
 			}
 			if(this.provider != null) {
-				this.updatePeriod = updatePeriod;
-				this.manager.requestLocationUpdates(providerName, this.updatePeriod, 0, this, Looper.getMainLooper());
+				this.manager.requestLocationUpdates(providerName, UPDATE_PERIOD_IN_MILLISECONDS, 0, this, Looper.getMainLooper());
 				available = this.manager.isProviderEnabled(this.providerName);
 			}
 			return available;
@@ -102,28 +97,14 @@ public class GeoLocationImpl {
 		void requestLastLocation() {
 			if (this.provider != null && this.manager != null) {
 				Location location = this.manager.getLastKnownLocation(this.providerName);
-				if (location != null) {
-					long time = location.getTime();
-					StringBuilder message = new StringBuilder();
-					message.append("Last known location from ").append(location.getProvider());
-					if((System.currentTimeMillis() - time) > invalidateLocationPeriod) {
-						message.append(" time is very old: ").append(location.getTime());
-						message.append(". Current time: ").append(System.currentTimeMillis());
-						message.append(". Invalitate period: ").append(invalidateLocationPeriod).append(".");
-					} else {
-						message.append(" time os ok: ").append(location.getTime());
-						message.append(". Current time: ").append(System.currentTimeMillis());
-						message.append(". Invalidate period: ").append(invalidateLocationPeriod).append(".");
-						onLocationChanged(location);
-					}
-					Logger.T(TAG,  message.toString());
-				}
+				onLocationChanged(location);
 			}
 		}
 		
 		@Override
 		public void onStatusChanged(String provider, int status, Bundle extras) {
 			Logger.T(TAG, "onStatusChanged: provider=" + provider + ", status=" + status);
+			requestLastLocation();
 		}
 		
 		@Override
@@ -147,62 +128,21 @@ public class GeoLocationImpl {
 		}
 	};
 	
-	private Thread thWatchdog = new Thread(new Runnable() {
-		public void run() {
-			Logger.I(TAG, "\"watchdog\" thread started");
-			for (;;) {
-				if (pingTimeout < 0)
-					break;
-				try {
-					final long curTimeout = errorTimeout(pingTimeout);
-					Logger.T(TAG, "\"watchdog\" thread waits (" + curTimeout + "ms)...");
-					Thread.sleep(curTimeout);
-				}
-				catch (InterruptedException e) {
-					Logger.T(TAG, "\"watchdog\" thread interrupted");
-					continue;
-				}
-				Logger.I(TAG, "Watchdog timed out.");
-				if (isKnownPosition()) {
-					if (System.currentTimeMillis() - getTime() > invalidateLocationPeriod) {
-						Logger.T(TAG, "Position became very old. Invalidate and call back to inform.");
-						clearLocation();
-					} else {
-						Logger.I(TAG, "Lost signal but position still up to date. Call back with error to inform.");
-					}
-				} else {
-					Logger.T(TAG, "Position is still unknown. Call back to inform.");
-				}
-				
-				PerformOnUiThread.exec(new Runnable() {
-					public void run() {
-						geoCallbackError();
-					}
-				});
-			}
-			PerformOnUiThread.exec(new Runnable() { public void run() { geoCallbackStop();} });
-			Logger.I(TAG, "\"watchdog\" thread stopped");
-		}
-	});
-	
-	// Sleep greater then ping time to do not interfere with real location updates
-	private static long errorTimeout(long time) { return (time == Long.MAX_VALUE) ? time : (time * 5); 	} 
-	
-	private static native void geoCallback();
-	private static native void geoCallbackError();
-	private static native void geoCallbackStop();
-	
-	GeoLocationImpl(long invalidateLocationPeriod) {
-		this.invalidateLocationPeriod = invalidateLocationPeriod; 
+	GeoLocationImpl() {
 		Logger.T(TAG, "GeoLocationImpl instance created");
 		Context ctx = ContextFactory.getContext();
 		locationManager = (LocationManager)ctx.getSystemService(Context.LOCATION_SERVICE);
 		createListeners();
-		thWatchdog.start();
 	}
 	
 	private void createListeners() {
-		List<String> providers = locationManager.getAllProviders();
+		LocationManager man = locationManager;
+		if (man == null) {
+			Logger.E(TAG, "createListeners() : Location Manager is NULL !");
+			return;
+		}
+
+		List<String> providers = man.getAllProviders();
 		Iterator<String> it = providers.iterator();
 		
 		synchronized (mListeners) {
@@ -211,7 +151,7 @@ public class GeoLocationImpl {
 				if (provider.equals(LocationManager.PASSIVE_PROVIDER))
 					continue;
 				
-				RhoLocationListener listener = new RhoLocationListener(provider, locationManager);
+				RhoLocationListener listener = new RhoLocationListener(provider, man);
 				mSwitchedOffListeners.add(listener);
 			}
 		}
@@ -226,7 +166,7 @@ public class GeoLocationImpl {
                 
                 Logger.T(TAG, "Registering location listener: " + listener.getProviderName());
                 
-				listener.register(pingTimeout);
+				listener.register();
 				mListeners.add(listener);
 			}
 			mSwitchedOffListeners.removeAll(mListeners);
@@ -259,6 +199,11 @@ public class GeoLocationImpl {
 		}
 	}
 	
+
+	public void doUpdate() {
+		
+	}
+	
 	private void checkProviderEnabled(RhoLocationListener listener) {
 	}
 	
@@ -273,29 +218,11 @@ public class GeoLocationImpl {
 		}
 	}
 	
-	private static boolean isLocationsEqual(Location prev, Location current) {
-		if (prev == null && current != null)
-			return false;
-		if (prev != null && current == null)
-			return true;
-
-		do {
-			if (prev.getLatitude() != current.getLatitude() ||
-				prev.getLongitude() == current.getLongitude())
-				break;
-			
-			if(current.hasAccuracy()) {
-				if(!prev.hasAccuracy())
-					break;
-				if (prev.getAccuracy() != current.getAccuracy())
-					break;
-			}
-			return true;
-		} while(false);
-		return false;
-	}
-	
 	private synchronized void setLocation(Location location) {
+		if (location == null) {
+			Logger.T(TAG, "setCurrentGpsLocation: location = null");
+			return;
+		}
 		Logger.T(TAG, "setCurrentGpsLocation: location=" + location);
 		try {
 			// We've received location update
@@ -307,21 +234,25 @@ public class GeoLocationImpl {
 					unregisterListeners(LocationManager.GPS_PROVIDER);
 			}
 			
-			dumpStatus(locationManager.getAllProviders());
-
-			if (!isLocationsEqual(lastLocation, location)) {
-				Logger.T(TAG, "Geo location information changed, notify about that");
-				lastLocation = location;
-				PerformOnUiThread.exec(new Runnable() { public void run() { geoCallback();} }, 10);
+			LocationManager man = locationManager;
+			if (man != null) {
+				dumpStatus(man.getAllProviders());
 			}
-			
+
+			lastLocation = location;
 		} catch (Exception e) {
 			lastLocation = null;
+			GeoLocation.onGeoCallbackError();
 			Logger.E(TAG, e);
 		}
 	}
 	
 	private void dumpStatus(List<String> providers) {
+		LocationManager man = locationManager;
+		if (man == null) {
+			Logger.E(TAG, "dumpStatus() : Location Manager is NULL !");
+			return;
+		}
 		StringBuffer log = new StringBuffer();
 		log.append("Status of location providers: ");
 		Iterator<String> it = providers.iterator();
@@ -335,7 +266,7 @@ public class GeoLocationImpl {
 			log.append("\"");
 			log.append(provider);
 			log.append("\" - ");
-			if (locationManager.isProviderEnabled(provider))
+			if (man.isProviderEnabled(provider))
 				log.append("enabled");
 			else
 				log.append("disabled");
@@ -343,18 +274,19 @@ public class GeoLocationImpl {
 		Logger.T(TAG, log.toString());
 		log = new StringBuffer();
 		log.append("location is");
-		if (lastLocation == null) {
+		Location ll = lastLocation;
+		if (ll == null) {
 			log.append(" not determined");
 		} else {
 			log.append(" determined");
-			log.append(": longitude=").append(Double.toString(lastLocation.getLongitude()));
-			log.append(", latitude=").append(Double.toString(lastLocation.getLatitude()));
+			log.append(": longitude=").append(Double.toString(ll.getLongitude()));
+			log.append(", latitude=").append(Double.toString(ll.getLatitude()));
 			if (lastLocation.hasAccuracy())
-				log.append(", accuracy=").append(Float.toString(lastLocation.getAccuracy()));
+				log.append(", accuracy=").append(Float.toString(ll.getAccuracy()));
 			if (lastLocation.hasSpeed())
-				log.append(", speed=").append(Float.toString(lastLocation.getSpeed()));
+				log.append(", speed=").append(Float.toString(ll.getSpeed()));
 			if (lastLocation.hasAltitude())
-				log.append(", altitude=").append(Double.toString(lastLocation.getAltitude()));
+				log.append(", altitude=").append(Double.toString(ll.getAltitude()));
 		}
 		Logger.T(TAG, log.toString());
 	}
@@ -365,16 +297,7 @@ public class GeoLocationImpl {
 	
 	
 	synchronized void stop() {
-		// Stop thCancel thread
-		pingTimeout = TIMEOUT_STOP;
-		thWatchdog.interrupt();
-		
-		if (locationManager == null)
-			return;
-
 		unregisterListeners(null);
-		
-		locationManager = null;
 	}
 
 	synchronized boolean isAvailable() {
@@ -390,6 +313,10 @@ public class GeoLocationImpl {
 		return available > 0;
 	}
 	
+	synchronized Location getLocation() {
+		return lastLocation;
+	}
+	
 	synchronized double getLatitude() {
 		return lastLocation != null ? lastLocation.getLatitude() : 0;
 	}
@@ -418,20 +345,5 @@ public class GeoLocationImpl {
 		return lastLocation != null;
 	}
 	
-	synchronized void clearLocation() {
-		lastLocation = null;
-	}
 
-	synchronized void setTimeout(long msec) {
-        if (pingTimeout != msec) {
-            pingTimeout = msec;
-            thWatchdog.interrupt();
-            registerListeners();// do reregister for new timeout
-            Logger.T(TAG, "Set new ping timeout: " + pingTimeout + "ms");
-        } else {
-            // Just renew timer in case same value
-            thWatchdog.interrupt();
-        }
-		
-	}
 }