commit 2a4c7398a2c4f4fb41acb4eba6922aa9a411ba6f Author: Fabio Mazza Date: Thu Apr 30 16:05:23 2026 +0200 Use lower minutes check, less logcat output diff --git a/app/src/main/java/it/reyboz/bustorino/backend/mato/MQTTMatoClient.kt b/app/src/main/java/it/reyboz/bustorino/backend/mato/MQTTMatoClient.kt index de6a912..826683c 100644 --- a/app/src/main/java/it/reyboz/bustorino/backend/mato/MQTTMatoClient.kt +++ b/app/src/main/java/it/reyboz/bustorino/backend/mato/MQTTMatoClient.kt @@ -353,7 +353,7 @@ class MQTTMatoClient(){ } //Log.d(DEBUG_TAG, "We have update on line $lineId, vehicle $vehicleId") } catch (e: JSONException){ - Log.w(DEBUG_TAG,"Cannot decipher message on topic $topic, line $lineId, veh $vehicleId (bad JSON)") + Log.e(DEBUG_TAG,"Cannot decipher message on topic $topic, line $lineId, veh $vehicleId (bad JSON)",e) sendStatusToResponders(LivePositionsServiceStatus.ERROR_PARSING_RESPONSE) diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/LinesDetailFragment.kt b/app/src/main/java/it/reyboz/bustorino/fragments/LinesDetailFragment.kt index 5bbdb53..8fa6f6d 100644 --- a/app/src/main/java/it/reyboz/bustorino/fragments/LinesDetailFragment.kt +++ b/app/src/main/java/it/reyboz/bustorino/fragments/LinesDetailFragment.kt @@ -380,7 +380,7 @@ class LinesDetailFragment() : GeneralMapLibreFragment() { if(list.isNotEmpty()){ lineInfoButton.visibility = View.VISIBLE - Log.d(DEBUG_TAG, "First alert is:\n ${list[0].longPrint()}") + //Log.d(DEBUG_TAG, "First alert is:\n ${list[0].longPrint()}") } else lineInfoButton.visibility = View.GONE } diff --git a/app/src/main/java/it/reyboz/bustorino/viewmodels/LivePositionsViewModel.kt b/app/src/main/java/it/reyboz/bustorino/viewmodels/LivePositionsViewModel.kt index 22f8afe..239c92e 100644 --- a/app/src/main/java/it/reyboz/bustorino/viewmodels/LivePositionsViewModel.kt +++ b/app/src/main/java/it/reyboz/bustorino/viewmodels/LivePositionsViewModel.kt @@ -309,7 +309,7 @@ class LivePositionsViewModel(application: Application): AndroidViewModel(applica val numUpds = updates.entries.size Log.d( DEBUG_TI, - "Got $numUpds updates, current pattern is: ${pattern?.name}, directionID: ${pattern?.directionId}" + "Got $numUpds updates, using MQTT: ${useMQTTPositionsLiveData.value}, pattern ${pattern?.name}" ) // cannot understand where this is used //val patternsDirections = HashMap() @@ -326,7 +326,7 @@ class LivePositionsViewModel(application: Application): AndroidViewModel(applica if (dir == directionId) { //add the trip updsForTripId[tripId] = pair - Log.d(DEBUG_TI, "Add vehicle ${pair.first.vehicle}, route ${pair.first.routeID}") + //Log.d(DEBUG_TI, "Add vehicle ${pair.first.vehicle}, route ${pair.first.routeID}") } else { vehicleOnWrongDirection.add(vehicle) } @@ -479,6 +479,6 @@ class LivePositionsViewModel(application: Application): AndroidViewModel(applica private const val MAX_MINUTES_RETRY = 3 private const val MAX_TIME_RETRY = MAX_MINUTES_RETRY*60*1000 //3 minutes (in milliseconds) - public const val MAX_MINUTES_CLEAR_POSITIONS = 8 + public const val MAX_MINUTES_CLEAR_POSITIONS = 10 } } \ No newline at end of file diff --git a/app/src/main/java/it/reyboz/bustorino/viewmodels/ServiceAlertsViewModel.kt b/app/src/main/java/it/reyboz/bustorino/viewmodels/ServiceAlertsViewModel.kt index 277b167..4812de7 100644 --- a/app/src/main/java/it/reyboz/bustorino/viewmodels/ServiceAlertsViewModel.kt +++ b/app/src/main/java/it/reyboz/bustorino/viewmodels/ServiceAlertsViewModel.kt @@ -38,6 +38,7 @@ class ServiceAlertsViewModel(app: Application) : AndroidViewModel(app) { private val keepRunning = AtomicBoolean(false) private val waitingToRerun = AtomicBoolean(false) fun setRunningDownloadRequests(value: Boolean) { + Log.d(DEBUG_TAG, "setRunningDownloadRequests: $value") keepRunning.set(value) } @@ -86,8 +87,11 @@ class ServiceAlertsViewModel(app: Application) : AndroidViewModel(app) { private fun downloadWorkIfTimePassed(){ val currentTime = System.currentTimeMillis() waitingToRerun.set(false) + val diff = currentTime - lastTimeRunningDownload.value!! + Log.d(DEBUG_TAG, "diff : ${diff/1000} s") + val MINUTES_CHECK = 3 if (lastTimeRunningDownload.value == 0L || - currentTime > lastTimeRunningDownload.value!! + 5L*60*1000){ + currentTime > lastTimeRunningDownload.value!! + MINUTES_CHECK*60*1000){ //actually enqueue request Log.d(DEBUG_TAG, "Launching request to download alerts") val req = GtfsAlertDBDownloadWorker.makeOneTimeRequest("alertsrn") @@ -96,7 +100,7 @@ class ServiceAlertsViewModel(app: Application) : AndroidViewModel(app) { } viewModelScope.launch(Dispatchers.IO) { waitingToRerun.set(true) - delay((5L*60 +1).seconds) + delay((61).seconds) if(keepRunning.get()) downloadWorkIfTimePassed() }