tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-04-01 Sergio Martin <sergio.martin@artica.es> 

* src/pandroid/agent/PandroidAgentListener.java: Fixed 
	a crash bug in some devices when try to retrieve the 
	coordinates provider. Close unclosed cursor and change some
	error logs to normal logs



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7905 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-04-01 07:27:56 +00:00
parent 1006e59d07
commit 7942bf37e5
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_agents/android/ChangeLog
View File

@ -1,3 +1,10 @@
2013-04-01 Sergio Martin <sergio.martin@artica.es>
* src/pandroid/agent/PandroidAgentListener.java: Fixed
a crash bug in some devices when try to retrieve the
coordinates provider. Close unclosed cursor and change some
error logs to normal logs
2012-09-24 Mark Holland <mark@mark-holland.me.uk> 2012-09-24 Mark Holland <mark@mark-holland.me.uk>
* src/pandroid/agent/PandroidAgentListener.java: * src/pandroid/agent/PandroidAgentListener.java:

18
pandora_agents/android/src/pandroid/agent/PandroidAgentListener.java
View File

@ -484,19 +484,19 @@ try { // catches IOException below
LocationManager lm = (LocationManager) getSystemService(Context.LOCATION_SERVICE); LocationManager lm = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
List<String> providers = lm.getProviders(true); List<String> providers = lm.getProviders(true);
Log.e("PANDROID providers count", "" + providers.size()); Log.d("PANDROID providers count", "" + providers.size());
/* Loop over the array backwards, and if you get an accurate location, then break out the loop*/ /* Loop over the array backwards, and if you get an accurate location, then break out the loop*/
Location loc = null; Location loc = null;
for (int i=providers.size()-1; i>=0; i--) { for (int i=providers.size()-1; i>=0; i--) {
Log.e("PANDROID providers", providers.get(i)); Log.d("PANDROID providers", providers.get(i));
loc = lm.getLastKnownLocation(providers.get(i)); loc = lm.getLastKnownLocation(providers.get(i));
if (loc != null) break; if (loc != null) break;
} }
if (loc != null) { if (loc != null) {
Log.e("PANDROID", "loc != null"); Log.d("PANDROID", "loc != null");
//if(latitude != loc.getLatitude() || longitude != loc.getLongitude()) { //if(latitude != loc.getLatitude() || longitude != loc.getLongitude()) {
lastGpsContactDateTime = getHumanDateTime(-1); lastGpsContactDateTime = getHumanDateTime(-1);
//} //}
@ -512,6 +512,12 @@ try { // catches IOException below
criteria.setCostAllowed(true); criteria.setCostAllowed(true);
String bestProvider = lm.getBestProvider(criteria, true); String bestProvider = lm.getBestProvider(criteria, true);
// If not provider found, abort GPS retrieving
if (bestProvider == null) {
Log.e("LOCATION", "No location provider found!");
return;
}
lm.requestLocationUpdates(bestProvider, Core.defaultInterval, 1000, lm.requestLocationUpdates(bestProvider, Core.defaultInterval, 1000,
new LocationListener() { new LocationListener() {
public void onLocationChanged(Location location) { public void onLocationChanged(Location location) {
@ -612,11 +618,11 @@ try { // catches IOException below
String gpsStatus = getSharedData("PANDROID_DATA", "gpsStatus", Core.defaultGpsStatus, "string"); String gpsStatus = getSharedData("PANDROID_DATA", "gpsStatus", Core.defaultGpsStatus, "string");
if(gpsStatus.equals("enabled")) { if(gpsStatus.equals("enabled")) {
Log.e("PANDROID AGENT", "ENABLED"); Log.d("PANDROID AGENT", "ENABLED");
gpsLocation(); gpsLocation();
} }
else { else {
Log.e("PANDROID AGENT", "DISABLED"); Log.d("PANDROID AGENT", "DISABLED");
putSharedData("PANDROID_DATA", "latitude", "181.0", "float"); putSharedData("PANDROID_DATA", "latitude", "181.0", "float");
putSharedData("PANDROID_DATA", "longitude", "181.0", "float"); putSharedData("PANDROID_DATA", "longitude", "181.0", "float");
} }
@ -886,6 +892,8 @@ try { // catches IOException below
putSharedData("PANDROID_DATA", "missedCalls", ""+missed, "integer"); putSharedData("PANDROID_DATA", "missedCalls", ""+missed, "integer");
putSharedData("PANDROID_DATA", "outgoingCalls", ""+outgoing, "integer"); putSharedData("PANDROID_DATA", "outgoingCalls", ""+outgoing, "integer");
} }
c.close();
}// end getCalls }// end getCalls
/** /**
* Retrieves the current cell signal strength in dB * Retrieves the current cell signal strength in dB