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

Fix issue with lost location in other activities

Browse source
This commit is contained in:
Victor Shcherb 2018-06-14 12:58:28 +02:00
parent 1e3f6a576e
commit be734c297d
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -203,6 +203,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
private boolean permissionGranted;
private boolean mIsDestroyed = false;
private boolean pendingPause = false;
private Timer splashScreenTimer;
private ExecutorService singleThreadExecutor = Executors.newSingleThreadExecutor();
@ -1210,15 +1211,11 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
@Override
protected void onStop() {
// if (app.getRoutingHelper().isFollowingMode()) {
// mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
// if (mNotificationManager != null) {
// mNotificationManager.notify(APP_NOTIFICATION_ID, getNotification());
// }
// }
wakeLockHelper.onStop(this);
getMyApplication().getNotificationHelper().removeNotifications();
onPauseActivity();
if(pendingPause) {
onPauseActivity();
}
super.onStop();
}
@ -1262,10 +1259,8 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
@Override
protected void onPause() {
super.onPause();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
if (!isInMultiWindowMode()) {
onPauseActivity();
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && isInMultiWindowMode()) {
pendingPause = true;
} else {
onPauseActivity();
}
@ -1273,6 +1268,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
}
private void onPauseActivity() {
pendingPause = false;
mapView.setOnDrawMapListener(null);
cancelSplashScreenTimer();
app.getMapMarkersHelper().removeListener(this);