Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2017-05-25 11:41:25 +02:00
commit 3d54f7126a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -574,7 +574,6 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
.objectEquals(targets.getIntermediatePointsLatLonNavigation(), routingHelper.getIntermediatePoints()))) { .objectEquals(targets.getIntermediatePointsLatLonNavigation(), routingHelper.getIntermediatePoints()))) {
targets.updateRouteAndRefresh(true); targets.updateRouteAndRefresh(true);
} }
app.getLocationProvider().resumeAllUpdates();
if (settings != null && settings.isLastKnownMapLocation() && !intentLocation) { if (settings != null && settings.isLastKnownMapLocation() && !intentLocation) {
LatLon l = settings.getLastKnownMapLocation(); LatLon l = settings.getLastKnownMapLocation();
@ -939,6 +938,8 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
super.onStart(); super.onStart();
wakeLockHelper.onStart(this); wakeLockHelper.onStart(this);
getMyApplication().getNotificationHelper().showNotifications(); getMyApplication().getNotificationHelper().showNotifications();
app.getLocationProvider().resumeAllUpdates();
} }
protected void setProgressDlg(Dialog progressDlg) { protected void setProgressDlg(Dialog progressDlg) {
@ -957,6 +958,8 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
// mNotificationManager.notify(APP_NOTIFICATION_ID, getNotification()); // mNotificationManager.notify(APP_NOTIFICATION_ID, getNotification());
// } // }
// } // }
app.getLocationProvider().pauseAllUpdates();
wakeLockHelper.onStop(this); wakeLockHelper.onStop(this);
getMyApplication().getNotificationHelper().removeNotifications(); getMyApplication().getNotificationHelper().removeNotifications();
super.onStop(); super.onStop();
@ -1013,7 +1016,6 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
atlasMapRendererView.handleOnPause(); atlasMapRendererView.handleOnPause();
} }
super.onPause(); super.onPause();
app.getLocationProvider().pauseAllUpdates();
app.getDaynightHelper().stopSensorIfNeeded(); app.getDaynightHelper().stopSensorIfNeeded();
settings.APPLICATION_MODE.removeListener(applicationModeListener); settings.APPLICATION_MODE.removeListener(applicationModeListener);