Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
a9ad98ea67
1 changed files with 7 additions and 7 deletions
|
@ -67,14 +67,14 @@ public class DashFavoritesFragment extends DashBaseFragment {
|
|||
@Override
|
||||
public void onResume() {
|
||||
super.onResume();
|
||||
if (getMyApplication().getFavorites().getFavouritePoints().size() > 0) {
|
||||
if(!getMyApplication().getSettings().isLastKnownMapLocation()) {
|
||||
//if (getMyApplication().getFavorites().getFavouritePoints().size() > 0) {
|
||||
// if(!getMyApplication().getSettings().isLastKnownMapLocation()) {
|
||||
// show first time when application ran
|
||||
location = getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation();
|
||||
} else {
|
||||
location = getLocationProvider().getLastKnownLocation();
|
||||
}
|
||||
updateLocation(location);
|
||||
// location = getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation();
|
||||
// } else {
|
||||
// location = getLocationProvider().getLastKnownLocation();
|
||||
// }
|
||||
// updateLocation(location);
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue