diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 18f5c72996..8e77b7865e 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -42,7 +42,7 @@ - + - + + + + + + + + + + + diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index 7f23a1e134..7feb4ea4bc 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -1011,7 +1011,7 @@ public class MwmActivity extends BaseMwmFragmentActivity fragment.saveRoutingPanelState(outState); } - mNavigationController.onSaveState(outState); + mNavigationController.onActivitySaveInstanceState(this, outState); RoutingController.get().onSaveState(); outState.putBoolean(EXTRA_LOCATION_DIALOG_IS_ANNOYING, mLocationErrorDialogAnnoying); @@ -1052,7 +1052,7 @@ public class MwmActivity extends BaseMwmFragmentActivity if (!mIsTabletLayout && RoutingController.get().isPlanning()) mRoutingPlanInplaceController.restoreState(savedInstanceState); - mNavigationController.onRestoreState(savedInstanceState); + mNavigationController.onRestoreState(savedInstanceState, this); if (mFilterController != null) mFilterController.onRestoreState(savedInstanceState); @@ -1459,7 +1459,7 @@ public class MwmActivity extends BaseMwmFragmentActivity if (mOnmapDownloader != null) mOnmapDownloader.onResume(); - mNavigationController.onResume(); + mNavigationController.onActivityResumed(this); if (mNavAnimationController != null) mNavAnimationController.onResume(); @@ -1498,11 +1498,13 @@ public class MwmActivity extends BaseMwmFragmentActivity @Override protected void onPause() { - TtsPlayer.INSTANCE.stop(); + if (!RoutingController.get().isNavigating()) + TtsPlayer.INSTANCE.stop(); LikesManager.INSTANCE.cancelDialogs(); if (mOnmapDownloader != null) mOnmapDownloader.onPause(); mPlacePageController.onActivityPaused(this); + mNavigationController.onActivityPaused(this); super.onPause(); } @@ -2315,19 +2317,20 @@ public class MwmActivity extends BaseMwmFragmentActivity @Override public void onNavigationCancelled() { - mNavigationController.stop(this); updateSearchBar(); ThemeSwitcher.INSTANCE.restart(isMapRendererActive()); if (mRoutingPlanInplaceController == null) return; mRoutingPlanInplaceController.hideDrivingOptionsView(); + mNavigationController.stop(this); } @Override public void onNavigationStarted() { ThemeSwitcher.INSTANCE.restart(isMapRendererActive()); + mNavigationController.start(this); } @Override @@ -2478,22 +2481,8 @@ public class MwmActivity extends BaseMwmFragmentActivity mLocationErrorDialogAnnoying = true; } }) - .setOnCancelListener(new DialogInterface.OnCancelListener() - { - @Override - public void onCancel(DialogInterface dialog) - { - mLocationErrorDialogAnnoying = true; - } - }) - .setPositiveButton(R.string.connection_settings, new DialogInterface.OnClickListener() - { - @Override - public void onClick(DialogInterface dialog, int which) - { - startActivity(intent); - } - }).show(); + .setOnCancelListener(dialog -> mLocationErrorDialogAnnoying = true) + .setPositiveButton(R.string.connection_settings, (dialog, which) -> startActivity(intent)).show(); } @Override diff --git a/android/src/com/mapswithme/maps/location/LocationHelper.java b/android/src/com/mapswithme/maps/location/LocationHelper.java index 9fb85c834e..c10d321752 100644 --- a/android/src/com/mapswithme/maps/location/LocationHelper.java +++ b/android/src/com/mapswithme/maps/location/LocationHelper.java @@ -15,6 +15,7 @@ import com.mapswithme.maps.base.Initializable; import com.mapswithme.maps.bookmarks.data.FeatureId; import com.mapswithme.maps.bookmarks.data.MapObject; import com.mapswithme.maps.routing.RoutingController; +import com.mapswithme.maps.routing.RoutingInfo; import com.mapswithme.util.Config; import com.mapswithme.util.Listeners; import com.mapswithme.util.LocationUtils; @@ -314,7 +315,7 @@ public enum LocationHelper implements Initializable private void notifyMyPositionModeChanged(int newMode) { - mLogger.d(TAG, "notifyMyPositionModeChanged(): " + LocationState.nameOf(newMode) , new Throwable()); + mLogger.d(TAG, "notifyMyPositionModeChanged(): " + LocationState.nameOf(newMode), new Throwable()); if (mUiCallback != null) mUiCallback.onMyPositionModeChanged(newMode); @@ -596,7 +597,6 @@ public enum LocationHelper implements Initializable Utils.keepScreenOn(false, mUiCallback.getActivity().getWindow()); mUiCallback = null; - stop(); } @UiThread diff --git a/android/src/com/mapswithme/maps/routing/NavigationController.java b/android/src/com/mapswithme/maps/routing/NavigationController.java index 12b01b9074..02e8bd9843 100644 --- a/android/src/com/mapswithme/maps/routing/NavigationController.java +++ b/android/src/com/mapswithme/maps/routing/NavigationController.java @@ -2,11 +2,14 @@ package com.mapswithme.maps.routing; import android.app.Activity; import android.app.Application; +import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.content.ServiceConnection; import android.location.Location; import android.media.MediaPlayer; import android.os.Bundle; +import android.os.IBinder; import android.text.SpannableStringBuilder; import android.text.TextUtils; import android.util.Pair; @@ -42,9 +45,11 @@ import java.util.concurrent.TimeUnit; import static com.mapswithme.util.statistics.Statistics.EventName.ROUTING_BOOKMARKS_CLICK; -public class NavigationController implements TrafficManager.TrafficCallback, View.OnClickListener +public class NavigationController implements Application.ActivityLifecycleCallbacks, + TrafficManager.TrafficCallback, View.OnClickListener { private static final String STATE_SHOW_TIME_LEFT = "ShowTimeLeft"; + private static final String STATE_BOUND = "Bound"; private final View mFrame; private final View mBottomFrame; @@ -86,6 +91,30 @@ public class NavigationController implements TrafficManager.TrafficCallback, Vie @NonNull private final MediaPlayer.OnCompletionListener mSpeedCamSignalCompletionListener; + @Nullable + private NavigationService mService = null; + private boolean mBound = false; + @NonNull + private final ServiceConnection mServiceConnection = new ServiceConnection() + { + @Override + public void onServiceConnected(ComponentName name, IBinder service) + { + NavigationService.LocalBinder binder = (NavigationService.LocalBinder) service; + mService = binder.getService(); + mBound = true; + doBackground(); + } + + @Override + public void onServiceDisconnected(ComponentName name) + { + mService = null; + mBound = false; + } + }; + + // TODO (@velichkomarija) remove unnecessary casts. public NavigationController(Activity activity) { mFrame = activity.findViewById(R.id.navigation_frame); @@ -107,7 +136,7 @@ public class NavigationController implements TrafficManager.TrafficCallback, Vie mStreetFrame = topFrame.findViewById(R.id.street_frame); mNextStreet = (TextView) mStreetFrame.findViewById(R.id.street); View shadow = topFrame.findViewById(R.id.shadow_top); - UiUtils.show(shadow); + UiUtils.hide(shadow); UiUtils.extendViewWithStatusBar(mStreetFrame); UiUtils.extendViewMarginWithStatusBar(turnFrame); @@ -138,12 +167,6 @@ public class NavigationController implements TrafficManager.TrafficCallback, Vie mSpeedCamSignalCompletionListener = new CameraWarningSignalCompletionListener(app); } - public void onResume() - { - mNavMenu.onResume(null); - mSearchWheel.onResume(); - } - private NavMenu createNavMenu() { return new NavMenu(mBottomFrame, this::onMenuItemClicked); @@ -160,6 +183,7 @@ public class NavigationController implements TrafficManager.TrafficCallback, Vie RoutingController.get().getLastRouterType(), TrafficManager.INSTANCE.isEnabled()); RoutingController.get().cancel(); + stop(parent); break; case SETTINGS: Statistics.INSTANCE.trackEvent(Statistics.EventName.ROUTING_SETTINGS); @@ -185,6 +209,35 @@ public class NavigationController implements TrafficManager.TrafficCallback, Vie { parent.refreshFade(); mSearchWheel.reset(); + + if (mBound) + { + parent.unbindService(mServiceConnection); + mBound = false; + if (mService != null) + mService.stopSelf(); + } + } + + public void start(@NonNull MwmActivity parent) + { + parent.bindService(new Intent(parent, NavigationService.class), + mServiceConnection, + Context.BIND_AUTO_CREATE); + mBound = true; + parent.startService(new Intent(parent, NavigationService.class)); + } + + public void doForeground() + { + if (mService != null) + mService.doForeground(); + } + + public void doBackground() + { + if (mService != null) + mService.stopForeground(true); } private void updateVehicle(RoutingInfo info) @@ -369,18 +422,62 @@ public class NavigationController implements TrafficManager.TrafficCallback, Vie return mNavMenu; } - public void onSaveState(@NonNull Bundle outState) + @Override + public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle savedInstanceState) + { + // no op + } + + @Override + public void onActivityStarted(@NonNull Activity activity) + { + // no op + } + + @Override + public void onActivityResumed(@NonNull Activity activity) + { + mNavMenu.onResume(null); + mSearchWheel.onResume(); + if (mBound) + doBackground(); + } + + @Override + public void onActivityPaused(Activity activity) + { + doForeground(); + } + + @Override + public void onActivityStopped(@NonNull Activity activity) + { + // no op + } + + @Override + public void onActivitySaveInstanceState(@NonNull Activity activity, @NonNull Bundle outState) { outState.putBoolean(STATE_SHOW_TIME_LEFT, mShowTimeLeft); + outState.putBoolean(STATE_BOUND, mBound); mSearchWheel.saveState(outState); } - public void onRestoreState(@NonNull Bundle savedInstanceState) + public void onRestoreState(@NonNull Bundle savedInstanceState, @NonNull MwmActivity parent) { mShowTimeLeft = savedInstanceState.getBoolean(STATE_SHOW_TIME_LEFT); + mBound = savedInstanceState.getBoolean(STATE_BOUND); + if (mBound) + start(parent); mSearchWheel.restoreState(savedInstanceState); } + @Override + public void onActivityDestroyed(@NonNull Activity activity) + { + // no op + } + @Override public void onEnabled() { diff --git a/android/src/com/mapswithme/maps/routing/NavigationService.java b/android/src/com/mapswithme/maps/routing/NavigationService.java new file mode 100644 index 0000000000..04817a4fc1 --- /dev/null +++ b/android/src/com/mapswithme/maps/routing/NavigationService.java @@ -0,0 +1,270 @@ +package com.mapswithme.maps.routing; + +import android.app.ActivityManager; +import android.app.Notification; +import android.app.NotificationChannel; +import android.app.NotificationManager; +import android.app.PendingIntent; +import android.app.Service; +import android.content.Context; +import android.content.Intent; +import android.content.res.Configuration; +import android.location.Location; +import android.os.Binder; +import android.os.IBinder; +import android.widget.RemoteViews; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; +import com.mapswithme.maps.Framework; +import com.mapswithme.maps.MwmActivity; +import com.mapswithme.maps.R; +import com.mapswithme.maps.location.LocationHelper; +import com.mapswithme.maps.location.LocationListener; +import com.mapswithme.maps.sound.TtsPlayer; +import com.mapswithme.util.Utils; +import com.mapswithme.util.log.Logger; +import com.mapswithme.util.log.LoggerFactory; + +import static androidx.core.app.NotificationCompat.*; + +public class NavigationService extends Service +{ + private static final String TAG = NavigationService.class.getSimpleName(); + public static final String PACKAGE_NAME = NavigationService.class.getPackage().getName(); + public static final String PACKAGE_NAME_WITH_SERVICE_NAME = PACKAGE_NAME.concat(".") + .concat(TAG.toLowerCase()); + private static final String EXTRA_STOP_SERVICE = PACKAGE_NAME_WITH_SERVICE_NAME + "finish"; + + private static final String CHANNEL_ID = "LOCATION_CHANNEL"; + private static final int NOTIFICATION_ID = 12345678; + + @NonNull + private final Logger mLogger = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.LOCATION); + @NonNull + private final IBinder mBinder = new LocalBinder(); + @SuppressWarnings("NotNullFieldNotInitialized") + @NonNull + private String mNavigationText = ""; + @SuppressWarnings("NotNullFieldNotInitialized") + @NonNull + private RemoteViews mRemoteViews; + + @SuppressWarnings("NotNullFieldNotInitialized") + @NonNull + private NotificationManager mNotificationManager; + + private boolean mChangingConfiguration = false; + + @NonNull + private final LocationListener mLocationListener = new LocationListener.Simple() + { + @Override + public void onLocationUpdated(Location location) + { + mLogger.d(TAG, "onLocationUpdated()"); + RoutingInfo routingInfo = Framework.nativeGetRouteFollowingInfo(); + if (serviceIsRunningInForeground(getApplicationContext())) + { + mNotificationManager.notify(NOTIFICATION_ID, getNotification()); + updateNotification(routingInfo); + } + } + + @Override + public void onLocationError(int errorCode) + { + mLogger.e(TAG, "onLocationError() errorCode: " + errorCode); + } + }; + + public class LocalBinder extends Binder + { + NavigationService getService() + { + return NavigationService.this; + } + } + + @Override + public void onCreate() + { + mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); + mRemoteViews = new RemoteViews(getPackageName(), R.layout.navigation_notification); + + // Android O requires a Notification Channel. + if (Utils.isOreoOrLater()) + { + CharSequence name = getString(R.string.app_name); + // Create the channel for the notification + NotificationChannel mChannel = + new NotificationChannel(CHANNEL_ID, name, NotificationManager.IMPORTANCE_DEFAULT); + + mNotificationManager.createNotificationChannel(mChannel); + } + } + + @Override + public void onDestroy() + { + super.onDestroy(); + removeLocationUpdates(); + } + + @Override + public void onLowMemory() + { + super.onLowMemory(); + mLogger.d(TAG, "onLowMemory()"); + } + + @Override + public int onStartCommand(Intent intent, int flags, int startId) + { + mLogger.i(TAG, "Service started"); + LocationHelper.INSTANCE.addListener(mLocationListener); + boolean finishedFromNotification = intent.getBooleanExtra(EXTRA_STOP_SERVICE, + false); + // We got here because the user decided to remove location updates from the notification. + if (finishedFromNotification) + { + stopForeground(true); + removeLocationUpdates(); + } + return START_NOT_STICKY; + } + + @Override + public void onConfigurationChanged(Configuration newConfig) + { + super.onConfigurationChanged(newConfig); + mChangingConfiguration = true; + } + + @Override + public IBinder onBind(Intent intent) + { + mLogger.i(TAG, "in onBind()"); + stopForeground(true); + mChangingConfiguration = false; + return mBinder; + } + + @Override + public void onRebind(Intent intent) + { + mLogger.i(TAG, "in onRebind()"); + stopForeground(true); + mChangingConfiguration = false; + super.onRebind(intent); + } + + @Override + public boolean onUnbind(Intent intent) + { + mLogger.i(TAG, "Last client unbound from service"); + + // Called when the last client unbinds from this + // service. If this method is called due to a configuration change in activity, we + // do nothing. Otherwise, we make this service a foreground service. + removeLocationUpdates(); + if (!mChangingConfiguration) + { + mLogger.i(TAG, "Starting foreground service"); + startForeground(NOTIFICATION_ID, getNotification()); + } + return true; + } + + public void doForeground() + { + if(!serviceIsRunningInForeground(this)) + { + mLogger.i(TAG, "Starting foreground service"); + startForeground(NOTIFICATION_ID, getNotification()); + } + } + + @NonNull + private Notification getNotification() + { + Intent stopSelf = new Intent(this, NavigationService.class); + stopSelf.putExtra(EXTRA_STOP_SERVICE, true); + PendingIntent pStopSelf = PendingIntent.getService(this, 0, + stopSelf, PendingIntent.FLAG_CANCEL_CURRENT); + + // TODO (@velichkomarija): restore navigation from notification. + PendingIntent activityPendingIntent = PendingIntent + .getActivity(this, 0, + new Intent(this, MwmActivity.class), 0); + + Builder builder = new Builder(this, CHANNEL_ID) + .addAction(R.drawable.ic_cancel, getString(R.string.button_exit), + pStopSelf) + .setContentIntent(activityPendingIntent) + .setOngoing(true) + .setStyle(new NotificationCompat.DecoratedCustomViewStyle()) + .setCustomContentView(mRemoteViews) + .setCustomHeadsUpContentView(mRemoteViews) + .setPriority(Notification.PRIORITY_HIGH) + .setSmallIcon(R.drawable.pw_notification) + .setShowWhen(true); + + if (Utils.isOreoOrLater()) + builder.setChannelId(CHANNEL_ID); + + return builder.build(); + } + + private void updateNotification(@Nullable RoutingInfo routingInfo) + { + final String[] turnNotifications = Framework.nativeGenerateNotifications(); + if (turnNotifications != null) + { + mNavigationText = Utils.fixCaseInString(turnNotifications[0]); + TtsPlayer.INSTANCE.playTurnNotifications(getApplicationContext(), turnNotifications); + } + mRemoteViews.setTextViewText(R.id.navigation_text, mNavigationText); + + StringBuilder stringBuilderNavigationSecondaryText = new StringBuilder(); + final RoutingController routingController = RoutingController.get(); + String routingArriveString = getString(R.string.routing_arrive); + stringBuilderNavigationSecondaryText + .append(String.format(routingArriveString, routingController.getEndPoint().getName())); + if (routingInfo != null) + { + stringBuilderNavigationSecondaryText + .append(": ") + .append(Utils.calculateFinishTime(routingInfo.totalTimeInSeconds)); + mRemoteViews.setImageViewResource(R.id.navigation_icon, routingInfo.carDirection.getTurnRes()); + mRemoteViews.setTextViewText(R.id.navigation_distance_text, routingInfo.distToTurn + " " + routingInfo.turnUnits); + } + mRemoteViews.setTextViewText(R.id.navigation_secondary_text, stringBuilderNavigationSecondaryText + .toString()); + } + + private void removeLocationUpdates() + { + mLogger.i(TAG, "Removing location updates"); + LocationHelper.INSTANCE.removeListener(mLocationListener); + stopSelf(); + } + + private boolean serviceIsRunningInForeground(@NonNull Context context) + { + ActivityManager manager = (ActivityManager) context.getSystemService( + Context.ACTIVITY_SERVICE); + // TODO(@velichkomarija): replace getRunningServices(). + // See issue https://github.com/android/location-samples/pull/243 + for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) + { + if (getClass().getName().equals(service.service.getClassName())) + { + if (service.foreground) + return true; + } + } + return false; + } +} diff --git a/android/src/com/mapswithme/maps/routing/RoutingInfo.java b/android/src/com/mapswithme/maps/routing/RoutingInfo.java index 2189279066..46c66c24bf 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingInfo.java +++ b/android/src/com/mapswithme/maps/routing/RoutingInfo.java @@ -70,6 +70,11 @@ public class RoutingInfo mNextTurnRes = nextResId; } + public int getTurnRes() + { + return mTurnRes; + } + public void setTurnDrawable(@NonNull ImageView imageView) { imageView.setImageResource(mTurnRes); diff --git a/android/src/com/mapswithme/maps/sound/TtsPlayer.java b/android/src/com/mapswithme/maps/sound/TtsPlayer.java index 60dfab4196..ed9400735b 100644 --- a/android/src/com/mapswithme/maps/sound/TtsPlayer.java +++ b/android/src/com/mapswithme/maps/sound/TtsPlayer.java @@ -208,6 +208,16 @@ public enum TtsPlayer implements Initializable speak(textToSpeak); } + public void playTurnNotifications(@NonNull Context context, @NonNull String[] turnNotifications) + { + if (MediaPlayerWrapper.from(context).isPlaying()) + return; + + if (isReady()) + for (String textToSpeak : turnNotifications) + speak(textToSpeak); + } + public void stop() { if (isReady()) diff --git a/android/src/com/mapswithme/util/Utils.java b/android/src/com/mapswithme/util/Utils.java index 94ecc47c57..6e3ff1790b 100644 --- a/android/src/com/mapswithme/util/Utils.java +++ b/android/src/com/mapswithme/util/Utils.java @@ -47,7 +47,9 @@ import java.io.IOException; import java.lang.ref.WeakReference; import java.net.NetworkInterface; import java.security.MessageDigest; +import java.text.DateFormat; import java.text.NumberFormat; +import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Calendar; import java.util.Collections; @@ -848,6 +850,22 @@ public class Utils return Calendar.getInstance(TimeZone.getTimeZone("UTC")); } + @NonNull + public static String calculateFinishTime(int seconds) + { + Calendar calendar = getCalendarInstance(); + calendar.add(Calendar.SECOND, seconds); + DateFormat dateFormat = new SimpleDateFormat("HH:mm", Locale.getDefault()); + return dateFormat.format(calendar.getTime()); + } + + @NonNull + public static String fixCaseInString(@NonNull String string) + { + char firstChar = string.charAt(0); + return firstChar + string.substring(1).toLowerCase(); + } + private static class SupportInfoWithLogsCallback implements LoggerFactory.OnZipCompletedListener { @NonNull