Skip to content

Store two contexts to query later and earlier trips at any time #964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Store two contexts to query later and earlier trips at any time #964

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 19 additions & 17 deletions app/src/main/java/de/grobox/transportr/trips/search/TripsRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ class TripsRepository(
val isFavTrip = MutableLiveData<Boolean>()

private var uid: Long = 0L
private var queryTripsContext: QueryTripsContext? = null
private var queryTripsLaterContext: QueryTripsContext? = null
private var queryTripsEarlierContext: QueryTripsContext? = null
private var queryTripsTask = Thread()

init {
Expand All @@ -80,7 +81,8 @@ class TripsRepository(
private fun clearState() {
trips.value = null
queryMoreState.value = QueryMoreState.NONE
queryTripsContext = null
queryTripsLaterContext = null
queryTripsEarlierContext = null
isFavTrip.value = null
uid = 0L
}
Expand Down Expand Up @@ -114,7 +116,7 @@ class TripsRepository(
)
if (queryTripsResult.status == OK && queryTripsResult.trips.size > 0) {
// deliver result first, so UI can get updated
onQueryTripsResultReceived(queryTripsResult)
onQueryTripsResultReceived(queryTripsResult, null)
// store locations (needed for references in stored search)
val from = locationRepository.addFavoriteLocation(query.from, FROM)
val via = query.via?.let { locationRepository.addFavoriteLocation(it, VIA) }
Expand Down Expand Up @@ -143,19 +145,19 @@ class TripsRepository(
}

fun searchMore(later: Boolean) {
if (queryTripsContext == null) throw IllegalStateException("No query context")
if (later && !queryTripsLaterContext!!.canQueryLater()) throw IllegalStateException("Can not query later")
if (!later && !queryTripsEarlierContext!!.canQueryEarlier()) throw IllegalStateException("Can not query earlier")

Log.i(TAG, "QueryTripsContext: " + queryTripsContext!!.toString())
Log.i(TAG, "Later: $later")
val queryTripsContext = if (later) queryTripsLaterContext!! else queryTripsEarlierContext!!

if (later && !queryTripsContext!!.canQueryLater()) throw IllegalStateException("Can not query later")
if (!later && !queryTripsContext!!.canQueryEarlier()) throw IllegalStateException("Can not query earlier")
Log.i(TAG, "QueryTripsContext: " + queryTripsContext.toString())
Log.i(TAG, "Later: $later")

thread(true) {
try {
val queryTripsResult = networkProvider.queryMoreTrips(queryTripsContext, later)
if (queryTripsResult.status == OK && queryTripsResult.trips.size > 0) {
onQueryTripsResultReceived(queryTripsResult)
onQueryTripsResultReceived(queryTripsResult, later)
} else {
queryMoreError.postValue(queryTripsResult.getError())
}
Expand All @@ -165,28 +167,28 @@ class TripsRepository(
}
}

private fun onQueryTripsResultReceived(queryTripsResult: QueryTripsResult) {
private fun onQueryTripsResultReceived(queryTripsResult: QueryTripsResult, later: Boolean?) {
Handler(Looper.getMainLooper()).post {
queryTripsContext = queryTripsResult.context
queryMoreState.value = getQueryMoreStateFromContext(queryTripsContext)
if (later == null || !later) queryTripsEarlierContext = queryTripsResult.context
if (later == null || later) queryTripsLaterContext = queryTripsResult.context
queryMoreState.value = getQueryMoreStateFromContext()

val oldTrips = trips.value?.let { HashSet(it) } ?: HashSet()
oldTrips.addAll(queryTripsResult.trips)
trips.value = oldTrips
}
}

private fun getQueryMoreStateFromContext(context: QueryTripsContext?): QueryMoreState = context?.let {
return if (it.canQueryEarlier() && it.canQueryLater()) {
private fun getQueryMoreStateFromContext() =
if (queryTripsEarlierContext?.canQueryEarlier() == true && queryTripsLaterContext?.canQueryLater() == true) {
QueryMoreState.BOTH
} else if (it.canQueryEarlier()) {
} else if (queryTripsEarlierContext?.canQueryEarlier() == true) {
QueryMoreState.EARLIER
} else if (it.canQueryLater()) {
} else if (queryTripsLaterContext?.canQueryLater() == true) {
QueryMoreState.LATER
} else {
QueryMoreState.NONE
}
} ?: QueryMoreState.NONE

private fun QueryTripsResult.getError(): String = when (status) {
AMBIGUOUS -> ctx.getString(R.string.trip_error_ambiguous)
Expand Down