RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Force NavigationService to stop when a route finishes

Browse source 
RoutingController::cancel() calls MwmActivity::onNavigationCancelled()
only if MwmActivity is attached to RoutingController.

Add explicit Service::stopSelf() to NavigationService to dismiss
notification when route is finished.

Fixes #6084

Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
This commit is contained in:
Roman Tsisyk 2023-09-22 10:22:38 +03:00 • committed by Alexander Borsuk
parent 705f801979
commit 4d83f0204d
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
android/app/src/main/java/app/organicmaps/routing/NavigationService.java
View file

@ -210,16 +210,21 @@ public class NavigationService extends Service implements LocationListener
if (!routingController.isNavigating())
return;
final String[] turnNotifications = Framework.nativeGenerateNotifications();
if (turnNotifications != null)
TtsPlayer.INSTANCE.playTurnNotifications(getApplicationContext(), turnNotifications);
// TODO: consider to create callback mechanism to transfer 'ROUTE_IS_FINISHED' event from
// the core to the platform code (https://github.com/organicmaps/organicmaps/issues/3589),
// because calling the native method 'nativeIsRouteFinished'
// too often can result in poor UI performance.
// This check should be done after playTurnNotifications() to play the last turn notification.
if (Framework.nativeIsRouteFinished())
{
routingController.cancel();
final String[] turnNotifications = Framework.nativeGenerateNotifications();
if (turnNotifications != null)
TtsPlayer.INSTANCE.playTurnNotifications(getApplicationContext(), turnNotifications);
stopSelf();
return;
}
final RoutingInfo routingInfo = Framework.nativeGetRouteFollowingInfo();
if (routingInfo == null)