fix notification and banner etas not in sync

Author: Guardiola31337

libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationNotification.java

@@ -64,6 +64,14 @@ public void onReceive(final Context applicationContext, final Intent intent) {
     initialize(applicationContext, mapboxNavigation);
   }
 
+  // For testing only
+  MapboxNavigationNotification(Context applicationContext, MapboxNavigation mapboxNavigation,
+                               Notification notification) {
+    this.applicationContext = applicationContext;
+    this.notification = notification;
+    initialize(applicationContext, mapboxNavigation);
+  }
+
   @Override
   public Notification getNotification() {
     return notification;
@@ -77,13 +85,24 @@ public int getNotificationId() {
   @Override
   public void updateNotification(RouteProgress routeProgress) {
     updateNotificationViews(routeProgress);
+    rebuildNotification();
   }
 
   @Override
   public void onNavigationStopped(Context applicationContext) {
     unregisterReceiver(applicationContext);
   }
 
+  // Package private (no modifier) for testing purposes
+  String generateArrivalTime(RouteProgress routeProgress, Calendar time) {
+    MapboxNavigationOptions options = mapboxNavigation.options();
+    double legDurationRemaining = routeProgress.currentLegProgress().durationRemaining();
+    int timeFormatType = options.timeFormatType();
+    String arrivalTime = formatTime(time, legDurationRemaining, timeFormatType, isTwentyFourHourFormat);
+    String formattedArrivalTime = String.format(etaFormat, arrivalTime);
+    return formattedArrivalTime;
+  }
+
   private void initialize(Context applicationContext, MapboxNavigation mapboxNavigation) {
     this.mapboxNavigation = mapboxNavigation;
     etaFormat = applicationContext.getString(R.string.eta_format);
@@ -96,7 +115,9 @@ private void initialize(Context applicationContext, MapboxNavigation mapboxNavig
 
     registerReceiver(applicationContext);
     createNotificationChannel(applicationContext);
-    notification = buildNotification(applicationContext);
+    if (notification == null) {
+      notification = buildNotification(applicationContext);
+    }
   }
 
   private void initializeDistanceFormatter(Context applicationContext, MapboxNavigation mapboxNavigation) {
@@ -172,12 +193,16 @@ private void updateNotificationViews(RouteProgress routeProgress) {
     buildRemoteViews();
     updateInstructionText(routeProgress.currentLegProgress().currentStep());
     updateDistanceText(routeProgress);
-    updateArrivalTime(routeProgress);
+    Calendar time = Calendar.getInstance();
+    String formattedArrivalTime = generateArrivalTime(routeProgress, time);
+    updateViewsWith(formattedArrivalTime);
     LegStep step = routeProgress.currentLegProgress().upComingStep() != null
       ? routeProgress.currentLegProgress().upComingStep()
       : routeProgress.currentLegProgress().currentStep();
     updateManeuverImage(step);
+  }
 
+  private void rebuildNotification() {
     notification = buildNotification(applicationContext);
     notificationManager.notify(NAVIGATION_NOTIFICATION_ID, notification);
   }
@@ -222,13 +247,7 @@ private boolean newDistanceText(RouteProgress routeProgress) {
       routeProgress.currentLegProgress().currentStepProgress().distanceRemaining()).toString());
   }
 
-  private void updateArrivalTime(RouteProgress routeProgress) {
-    MapboxNavigationOptions options = mapboxNavigation.options();
-    Calendar time = Calendar.getInstance();
-    double durationRemaining = routeProgress.durationRemaining();
-    int timeFormatType = options.timeFormatType();
-    String arrivalTime = formatTime(time, durationRemaining, timeFormatType, isTwentyFourHourFormat);
-    String formattedArrivalTime = String.format(etaFormat, arrivalTime);
+  private void updateViewsWith(String formattedArrivalTime) {
     collapsedNotificationRemoteViews.setTextViewText(R.id.notificationArrivalText, formattedArrivalTime);
     expandedNotificationRemoteViews.setTextViewText(R.id.notificationArrivalText, formattedArrivalTime);
   }

libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/navigation/MapboxNavigationNotificationTest.java

@@ -1,7 +1,10 @@
 package com.mapbox.services.android.navigation.v5.navigation;
 
-import android.app.NotificationManager;
+import android.app.Notification;
 import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -11,21 +14,21 @@
 import com.mapbox.services.android.navigation.v5.BaseTest;
 import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress;
 
-import junit.framework.Assert;
-
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
-import org.mockito.Mock;
-import org.mockito.Mockito;
 
-public class MapboxNavigationNotificationTest extends BaseTest {
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
 
-  private static final String DIRECTIONS_ROUTE_FIXTURE = "directions_v5_precision_6.json";
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
-  @Mock
-  NotificationManager notificationManager;
+public class MapboxNavigationNotificationTest extends BaseTest {
 
+  private static final String DIRECTIONS_ROUTE_FIXTURE = "directions_v5_precision_6.json";
   private DirectionsRoute route;
 
   @Before
@@ -37,28 +40,42 @@ public void setUp() throws Exception {
     route = response.routes().get(0);
   }
 
-  @Ignore
   @Test
-  public void sanity() throws Exception {
-    MapboxNavigationNotification mapboxNavigationNotification = new MapboxNavigationNotification(
-      Mockito.mock(Context.class), Mockito.mock(MapboxNavigation.class));
-    Assert.assertNotNull(mapboxNavigationNotification);
-  }
+  public void checksArrivalTime() throws Exception {
+    MapboxNavigation mockedMapboxNavigation = createMapboxNavigation();
+    Context mockedContext = createContext();
+    Notification mockedNotification = mock(Notification.class);
+    MapboxNavigationNotification mapboxNavigationNotification = new MapboxNavigationNotification(mockedContext,
+      mockedMapboxNavigation, mockedNotification);
+    RouteProgress routeProgress = buildDefaultTestRouteProgress();
+    Calendar mockedTime = Calendar.getInstance();
+    long aprilFifteenThreeFourtyFourFiftyThreePmTwoThousandNineteen = 1555357493308L;
+    mockedTime.setTime(new Date(aprilFifteenThreeFourtyFourFiftyThreePmTwoThousandNineteen));
 
-  @Ignore
-  @Test
-  public void updateDefaultNotification_onlyUpdatesNameWhenNew() throws Exception {
-    RouteProgress routeProgress = RouteProgress.builder()
-      .directionsRoute(route)
-      .stepIndex(0)
-      .legIndex(0)
-      .build();
+    String formattedArrivalTime = mapboxNavigationNotification.generateArrivalTime(routeProgress, mockedTime);
 
-    MapboxNavigationNotification mapboxNavigationNotification = new MapboxNavigationNotification(
-      Mockito.mock(Context.class), Mockito.mock(MapboxNavigation.class));
+    assertEquals("4:46 pm ETA", formattedArrivalTime);
+  }
+
+  private MapboxNavigation createMapboxNavigation() {
+    MapboxNavigation mockedMapboxNavigation = mock(MapboxNavigation.class);
+    when(mockedMapboxNavigation.getRoute()).thenReturn(route);
+    MapboxNavigationOptions mockedMapboxNavigationOptions = mock(MapboxNavigationOptions.class);
+    when(mockedMapboxNavigation.options()).thenReturn(mockedMapboxNavigationOptions);
+    when(mockedMapboxNavigationOptions.roundingIncrement()).thenReturn(NavigationConstants.ROUNDING_INCREMENT_FIVE);
+    return mockedMapboxNavigation;
+  }
 
-    mapboxNavigationNotification.updateNotification(routeProgress);
-    //    notificationManager.getActiveNotifications()[0].getNotification().contentView;
-    //    verify(notificationManager, times(1)).getActiveNotifications()[0];
+  private Context createContext() {
+    Context mockedContext = mock(Context.class);
+    Configuration mockedConfiguration = new Configuration();
+    mockedConfiguration.locale = new Locale("en");
+    Resources mockedResources = mock(Resources.class);
+    when(mockedContext.getResources()).thenReturn(mockedResources);
+    when(mockedResources.getConfiguration()).thenReturn(mockedConfiguration);
+    PackageManager mockedPackageManager = mock(PackageManager.class);
+    when(mockedContext.getPackageManager()).thenReturn(mockedPackageManager);
+    when(mockedContext.getString(anyInt())).thenReturn("%s ETA");
+    return mockedContext;
   }
 }