Fixing issues in review

Author: ShinLiX

onebusaway-android/build.gradle

@@ -255,7 +255,7 @@ dependencies {
     implementation 'com.github.OneBusAway:pelias-client-library:v1.1.0'
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'com.google.firebase:firebase-messaging:24.1.0'
-    implementation 'androidx.test.ext:junit:1.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.3.0'
     // Google Play Services Maps (only for Google flavor)
     googleImplementation 'com.google.android.gms:play-services-maps:19.0.0'
     // MapLibre GL Native (only for MapLibre flavor)

onebusaway-android/src/androidTest/java/org/onebusaway/android/util/test/ArrivalInfoUtilsTest.java

@@ -63,7 +63,7 @@ public void tearDown() {
      * @throws Exception
      */
     @Test
-    public void TestShowAllByDefault() throws Exception {
+    public void testShowAllByDefault() throws Exception {
         long now = System.currentTimeMillis();
 
         ObaArrivalInfo scheduledOnly = createArrival(
@@ -96,7 +96,7 @@ public void TestShowAllByDefault() throws Exception {
      * @throws Exception
      */
     @Test
-    public void TestHideScheduledWithBothKinds() throws Exception {
+    public void testHideScheduledWithBothKinds() throws Exception {
         prefs.edit().putBoolean(hideScheduledKey, true).commit();
 
         long now = System.currentTimeMillis();
@@ -133,7 +133,7 @@ public void TestHideScheduledWithBothKinds() throws Exception {
      * @throws Exception
      */
     @Test
-    public void TestHideScheduleWithAllSchedule() throws Exception {
+    public void testHideScheduledWithAllScheduled() throws Exception {
         prefs.edit().putBoolean(hideScheduledKey, true).commit();
 
         long now = System.currentTimeMillis();
@@ -162,6 +162,47 @@ public void TestHideScheduleWithAllSchedule() throws Exception {
     }
 
 
+    /**
+     * Verifies that when a route filter is applied and the "hide scheduled arrivals"
+     * preference is enabled, scheduled-only arrivals within the filtered set are
+     * excluded from the result.
+     */
+    @Test
+    public void testHideScheduledWithRouteFilter() throws Exception {
+        prefs.edit().putBoolean(hideScheduledKey, true).commit();
+
+        long now = System.currentTimeMillis();
+
+        ObaArrivalInfo scheduledRoute8 = createArrival(
+                "1_100", "8", "Downtown", "STOP_1",
+                now + 10 * 60_000L, 0L,
+                now + 10 * 60_000L, 0L,
+                false
+        );
+
+        ObaArrivalInfo realtimeRoute49 = createArrival(
+                "1_200", "49", "Uptown", "STOP_1",
+                now + 12 * 60_000L, now + 13 * 60_000L,
+                now + 12 * 60_000L, now + 13 * 60_000L,
+                true
+        );
+
+        ObaArrivalInfo[] arrivals = new ObaArrivalInfo[]{scheduledRoute8, realtimeRoute49};
+
+        ArrayList<String> filter = new ArrayList<>();
+        filter.add("1_100");
+        filter.add("1_200");
+
+        ArrayList<ArrivalInfo> result = ArrivalInfoUtils.convertObaArrivalInfo(
+                context, arrivals, filter, now, false
+        );
+
+        assertEquals(1, result.size());
+        assertEquals("49", result.get(0).getInfo().getShortName());
+        assertTrue(result.get(0).getPredicted());
+    }
+
+
     private ObaArrivalInfo createArrival(String routeId,
                                          String shortName,
                                          String headsign,

onebusaway-android/src/main/java/org/onebusaway/android/ui/ArrivalsListFragment.java

@@ -616,13 +616,15 @@ public void onPrepareOptionsMenu(Menu menu) {
         }
 
         MenuItem menuItemScheduledArrivals = menu.findItem(R.id.toggle_scheduled_arrivals);
-        boolean hideScheduled = Application.getPrefs()
-                .getBoolean(getString(R.string.preference_key_hide_scheduled_arrivals), false);
-        title = hideScheduled ?
-                getString(R.string.stop_info_option_show_scheduled_arrivals) :
-                getString(R.string.stop_info_option_hide_scheduled_arrivals);
-        menuItemScheduledArrivals.setTitle(title);
-        menuItemScheduledArrivals.setTitleCondensed(title);
+        if (menuItemScheduledArrivals != null) {
+            boolean hideScheduled = Application.getPrefs()
+                    .getBoolean(getString(R.string.preference_key_hide_scheduled_arrivals), false);
+            title = hideScheduled ?
+                    getString(R.string.stop_info_option_show_scheduled_arrivals) :
+                    getString(R.string.stop_info_option_hide_scheduled_arrivals);
+            menuItemScheduledArrivals.setTitle(title);
+            menuItemScheduledArrivals.setTitleCondensed(title);
+        }
 
         if (mExternalHeader) {
             // If we're using an external header, it means that this fragment is being shown

onebusaway-android/src/main/res/menu-v14/arrivals_list.xml

@@ -54,7 +54,6 @@
               android:title="@string/stop_info_option_night_light"/>
         <item android:id="@+id/hide_alerts"
               android:title="@string/stop_info_option_hide_alerts"/>
-              android:title="@string/stop_info_option_hide_alerts"/>
         <item android:id="@+id/toggle_scheduled_arrivals"
               android:title="@string/stop_info_option_hide_scheduled_arrivals"/>
     </group>

onebusaway-android/src/main/res/values/donottranslate.xml

@@ -73,6 +73,7 @@
     <string name="preferences_key_user_denied_location_permissions">preferences_key_user_denied_location_permissions</string>
     <string name="preference_key_push_firebase_data">preference_key_push_firebase_data</string>
     <string name="preferences_display_test_alerts">preferences_display_test_alerts</string>
+    <string name="preference_key_hide_scheduled_arrivals">preference_key_hide_scheduled_arrivals</string>
     <!-- Regions API URL -->
     <string name="regions_api_url">https://regions.onebusaway.org/regions-v3.json</string>
 

onebusaway-android/src/main/res/values/strings.xml

@@ -434,7 +434,6 @@
     <!-- Hide/Show scheduled arrivals/departures  -->
     <string name="stop_info_option_hide_scheduled_arrivals">Hide scheduled arrivals/departures</string>
     <string name="stop_info_option_show_scheduled_arrivals">Show scheduled arrivals/departures</string>
-    <string name="preference_key_hide_scheduled_arrivals">preference_key_hide_scheduled_arrivals</string>
 
     <!-- Find -->
     <string name="find_hint_nofavoritestops">Find a stop by entering its stop number in the search