commit b8483c902cc23f0cac2bbd6b091b27120c9468ef Author: Fabio Mazza Date: Thu Apr 16 11:37:40 2026 +0200 Fix crash when another service is active (gtt:F one), resolve T1400 diff --git a/app/src/main/java/it/reyboz/bustorino/backend/Palina.java b/app/src/main/java/it/reyboz/bustorino/backend/Palina.java index afc8965..8b5c807 100644 --- a/app/src/main/java/it/reyboz/bustorino/backend/Palina.java +++ b/app/src/main/java/it/reyboz/bustorino/backend/Palina.java @@ -1,6 +1,7 @@ /* BusTO (backend components) Copyright (C) 2016 Ludovico Pavesi + Copyright (c) 2026 Fabio Mazza This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/LinesGridShowingFragment.kt b/app/src/main/java/it/reyboz/bustorino/fragments/LinesGridShowingFragment.kt index ed2ba30..8799cc4 100644 --- a/app/src/main/java/it/reyboz/bustorino/fragments/LinesGridShowingFragment.kt +++ b/app/src/main/java/it/reyboz/bustorino/fragments/LinesGridShowingFragment.kt @@ -138,10 +138,10 @@ class LinesGridShowingFragment : ScreenBaseFragment() { val route = p.first val agency = route.agencyID if(agency !in routesByAgency.keys){ - Log.e(DEBUG_TAG, "The agency $agency is not present in the predefined agencies (${routesByAgency.keys})") + Log.e(DEBUG_TAG, "The agency $agency for route ${p.first.gtfsId} is not in the predefined agencies (${routesByAgency.keys})") } routesByAgency[agency]?.add(route) - routesPrioByAg[agency]!!.add(p) + routesPrioByAg[agency]?.add(p) // I would print a debug here, but it's the same as above } diff --git a/app/src/main/java/it/reyboz/bustorino/viewmodels/LinesGridShowingViewModel.kt b/app/src/main/java/it/reyboz/bustorino/viewmodels/LinesGridShowingViewModel.kt index 8b86975..150dd9f 100644 --- a/app/src/main/java/it/reyboz/bustorino/viewmodels/LinesGridShowingViewModel.kt +++ b/app/src/main/java/it/reyboz/bustorino/viewmodels/LinesGridShowingViewModel.kt @@ -43,12 +43,15 @@ class LinesGridShowingViewModel(application: Application) : AndroidViewModel(app fun getLinesLiveData() = filteredLinesLiveData private fun filterLinesForQuery(lines: List, query: String): ArrayList>{ - val result= lines.filter { r-> query.lowercase() in r.shortName.lowercase() } - //val filterDescr = lines.filter { r -> query.lowercase() in r.description.lowercase() } + var result= lines.filter { r-> query.lowercase() in r.shortName.lowercase() } + //EXCLUDE gtt:F - ferrovie (luckily, gtt does not run rail service anymore) + result = result.filter { r -> r.agencyID != "gtt:F" } + val out = ArrayList>() for (r in result){ out.add(Pair(r,1)) } + // add those matching the query in the description for (r: GtfsRoute in lines) { if (query.lowercase() in r.description.lowercase()) { if (r !in result){