github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-26 20:33:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixing CB-1462, there's a difference betwene Global and Local listeners:

Browse Source
This commit is contained in:
Joe Bowser 2012-09-18 14:24:48 -07:00
parent 73abb20b3d
commit 772aedc263
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
framework/src/org/apache/cordova/CordovaLocationListener.java
View File

@ -55,6 +55,11 @@ public class CordovaLocationListener implements LocationListener {
{ {
this.owner.fail(code, message, callbackId); this.owner.fail(code, message, callbackId);
} }
if(this.owner.isGlobalListener(this))
{
Log.d(TAG, "Stopping global listener");
this.stop();
}
this.callbacks.clear(); this.callbacks.clear();
Iterator it = this.watches.entrySet().iterator(); Iterator it = this.watches.entrySet().iterator();
@ -69,6 +74,11 @@ public class CordovaLocationListener implements LocationListener {
{ {
this.owner.win(loc, callbackId); this.owner.win(loc, callbackId);
} }
if(this.owner.isGlobalListener(this))
{
Log.d(TAG, "Stopping global listener");
this.stop();
}
this.callbacks.clear(); this.callbacks.clear();
Iterator it = this.watches.entrySet().iterator(); Iterator it = this.watches.entrySet().iterator();

10
framework/src/org/apache/cordova/GeoBroker.java
View File

@ -191,4 +191,14 @@ public class GeoBroker extends Plugin {
this.error(result, callbackId); this.error(result, callbackId);
} }
public boolean isGlobalListener(CordovaLocationListener listener)
{
if (gpsListener != null && networkListener != null)
{
return gpsListener.equals(listener) || networkListener.equals(listener);
}
else
return false;
}
} }