diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/ArrivalsFragment.kt b/app/src/main/java/it/reyboz/bustorino/fragments/ArrivalsFragment.kt --- a/app/src/main/java/it/reyboz/bustorino/fragments/ArrivalsFragment.kt +++ b/app/src/main/java/it/reyboz/bustorino/fragments/ArrivalsFragment.kt @@ -267,7 +267,11 @@ updateFragmentData(it) } else{ progressBar.visibility=View.INVISIBLE - loadingMessageTextView.text = getString(R.string.no_bus_stop_have_this_name) + // Avoid showing this ugly message if we have found the stop, clearly it exists but GTT doesn't provide arrival times + if (stopName==null) + loadingMessageTextView.text = getString(R.string.no_bus_stop_have_this_name) + else + loadingMessageTextView.text = getString(R.string.no_arrivals_stop) } } diff --git a/app/src/main/java/it/reyboz/bustorino/viewmodels/ArrivalsViewModel.kt b/app/src/main/java/it/reyboz/bustorino/viewmodels/ArrivalsViewModel.kt --- a/app/src/main/java/it/reyboz/bustorino/viewmodels/ArrivalsViewModel.kt +++ b/app/src/main/java/it/reyboz/bustorino/viewmodels/ArrivalsViewModel.kt @@ -51,7 +51,7 @@ // Equivalente del doInBackground nell'AsyncTask val recursionHelper = RecursionHelper(fetchers.toTypedArray()) - var resultPalina = Palina(stopId) + var resultPalina : Palina? = null val stringBuilder = StringBuilder() for (f in fetchers) {