nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix NPE in settings when last known position is null 

This is not a proper fix, we would have to request a location first.
I just had a last known position when testing before. :/

Issue #346
This commit is contained in:
Andreas Shimokawa 2016-07-03 21:29:02 +02:00
parent 8b24e098ea
commit a2c2e48719
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java
View File

@ -142,6 +142,7 @@ public class SettingsActivity extends AbstractSettingsActivity {
String provider = locationManager.getBestProvider(criteria, false); String provider = locationManager.getBestProvider(criteria, false);
if (provider != null) { if (provider != null) {
Location location = locationManager.getLastKnownLocation(provider); Location location = locationManager.getLastKnownLocation(provider);
if (location != null) {
String latitude = String.format(Locale.US, "%.6g", location.getLatitude()); String latitude = String.format(Locale.US, "%.6g", location.getLatitude());
String longitude = String.format(Locale.US, "%.6g", location.getLongitude()); String longitude = String.format(Locale.US, "%.6g", location.getLongitude());
LOG.info("got location. Lat: " + latitude + " Lng: " + longitude); LOG.info("got location. Lat: " + latitude + " Lng: " + longitude);
@ -151,6 +152,9 @@ public class SettingsActivity extends AbstractSettingsActivity {
pref_longitude.setText(longitude); pref_longitude.setText(longitude);
pref_latitude.setSummary(latitude); pref_latitude.setSummary(latitude);
pref_longitude.setSummary(longitude); pref_longitude.setSummary(longitude);
} else {
GB.toast(SettingsActivity.this, "no last known position", 3000, 0);
}
} else { } else {
LOG.warn("No location provider found, did you deny location permission?"); LOG.warn("No location provider found, did you deny location permission?");
} }