BUG: service update provider > cached list need to be mutable

Author: mmathieum

src/main/java/org/mtransit/android/commons/provider/StmInfoSubwayProvider.java

@@ -189,11 +189,11 @@ public void cacheServiceUpdates(@NonNull List<ServiceUpdate> newServiceUpdates)
 	@Nullable
 	@Override
 	public List<ServiceUpdate> getCachedServiceUpdates(@NonNull Filter serviceUpdateFilter) {
-		if ((serviceUpdateFilter.getPoi() instanceof RouteDirectionStop)) {
+		if (serviceUpdateFilter.getPoi() instanceof RouteDirectionStop) {
 			return getCachedServiceUpdates((RouteDirectionStop) serviceUpdateFilter.getPoi());
-		} else if ((serviceUpdateFilter.getRouteDirection() != null)) {
+		} else if (serviceUpdateFilter.getRouteDirection() != null) {
 			return getCachedServiceUpdates(serviceUpdateFilter.getRouteDirection());
-		} else if ((serviceUpdateFilter.getRoute() != null)) {
+		} else if (serviceUpdateFilter.getRoute() != null) {
 			return getCachedServiceUpdates(serviceUpdateFilter.getRoute());
 		} else {
 			MTLog.w(this, "getCachedServiceUpdates() > no service update (poi null or not RDS or no route)");
@@ -314,11 +314,11 @@ private int deleteAllAgencyServiceUpdateData() {
 	@Nullable
 	@Override
 	public List<ServiceUpdate> getNewServiceUpdates(@NonNull Filter serviceUpdateFilter) {
-		if ((serviceUpdateFilter.getPoi() instanceof RouteDirectionStop)) {
+		if (serviceUpdateFilter.getPoi() instanceof RouteDirectionStop) {
 			return getNewServiceUpdates((RouteDirectionStop) serviceUpdateFilter.getPoi(), serviceUpdateFilter.isInFocusOrDefault());
-		} else if ((serviceUpdateFilter.getRouteDirection() != null)) {
+		} else if (serviceUpdateFilter.getRouteDirection() != null) {
 			return getNewServiceUpdates(serviceUpdateFilter.getRouteDirection(), serviceUpdateFilter.isInFocusOrDefault());
-		} else if ((serviceUpdateFilter.getRoute() != null)) {
+		} else if (serviceUpdateFilter.getRoute() != null) {
 			return getNewServiceUpdates(serviceUpdateFilter.getRoute(), serviceUpdateFilter.isInFocusOrDefault());
 		} else {
 			MTLog.w(this, "getNewServiceUpdates() > no service update (poi null or not RDS or no route)");

src/main/java/org/mtransit/android/commons/provider/serviceupdate/ServiceUpdateProviderExt.kt

@@ -7,7 +7,7 @@ import org.mtransit.android.commons.SqlUtils
 import org.mtransit.android.commons.data.ServiceUpdate
 import org.mtransit.commons.FeatureFlags
 
-private val LOG_TAG: String = ServiceUpdateProvider::class.java.simpleName
+private const val LOG_TAG: String = "ServiceUpdateProviderExt"
 
 @JvmOverloads
 fun <P : ServiceUpdateProviderContract> P.getCachedServiceUpdatesS(
@@ -19,7 +19,7 @@ fun <P : ServiceUpdateProviderContract> P.getCachedServiceUpdatesS(
 fun <P : ServiceUpdateProviderContract> P.getCachedServiceUpdatesS(
     targetUUIDs: Collection<String>,
     tripIds: List<String>? = null
-): List<ServiceUpdate>? {
+): MutableList<ServiceUpdate>? {
     return getCachedServiceUpdatesS(
         this.contentUri,
         buildString {
@@ -45,8 +45,8 @@ fun <P : ServiceUpdateProviderContract> P.getCachedServiceUpdatesS(
 private fun <P : ServiceUpdateProviderContract> P.getCachedServiceUpdatesS(
     @Suppress("unused") uri: Uri?,
     selection: String?,
-): List<ServiceUpdate>? =
-    try {
+): MutableList<ServiceUpdate>? {
+    return try {
         SQLiteQueryBuilder()
             .apply {
                 tables = dbTableName
@@ -62,12 +62,13 @@ private fun <P : ServiceUpdateProviderContract> P.getCachedServiceUpdatesS(
                             } while (cursor.moveToNext())
                         }
                     }
-                }
+                }.toMutableList() // need to be mutable to call "iterator().remove()"
             }
     } catch (e: Exception) {
         MTLog.w(LOG_TAG, e, "Error!")
         null
     }
+}
 
 private val ServiceUpdateProviderContract.contentUri: Uri
     get() = Uri.withAppendedPath(this.authorityUri, ServiceUpdateProviderContract.SERVICE_UPDATE_PATH)