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 2015-09-27 22:55:05 +02:00
commit ec6c03e909
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
OsmAnd/src/net/osmand/plus/NotificationHelper.java
View file

@ -158,13 +158,10 @@ public class NotificationHelper {
if(newNotification != null) { if(newNotification != null) {
mNotificationManager.notify(NOTIFICATION_SERVICE_ID, newNotification.build()); mNotificationManager.notify(NOTIFICATION_SERVICE_ID, newNotification.build());
} }
// if (stopBroadcastReceiver != null) { }
// app.unregisterReceiver(stopBroadcastReceiver);
// stopBroadcastReceiver = null; public void removeServiceNotificationCompletely() {
// } NotificationManager mNotificationManager = (NotificationManager) app.getSystemService(Context.NOTIFICATION_SERVICE);
// if (saveBroadcastReceiver != null) { mNotificationManager.cancel( NOTIFICATION_SERVICE_ID);
// app.unregisterReceiver(saveBroadcastReceiver);
// saveBroadcastReceiver = null;
// }
} }
} }

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

@ -672,7 +672,7 @@ public class MapActivity extends AccessibleActivity {
mapViewTrackingUtilities.setMapView(null); mapViewTrackingUtilities.setMapView(null);
cancelNotification(); cancelNotification();
if(getMyApplication().getNavigationService() == null) { if(getMyApplication().getNavigationService() == null) {
getMyApplication().getNotificationHelper().removeServiceNotification(); getMyApplication().getNotificationHelper().removeServiceNotificationCompletely();
} }
app.getResourceManager().getMapTileDownloader().removeDownloaderCallback(mapView); app.getResourceManager().getMapTileDownloader().removeDownloaderCallback(mapView);
if (atlasMapRendererView != null) { if (atlasMapRendererView != null) {