Skip to content

Commit 777edb1

Browse files
anhanh11001iamareebjamal
authored andcommitted
fix: Enable reloading when pulling in EventsFragment (#1660)
Details: - Clear last search variable so that events are fetched again in EventsViewModel Fixes #1657
1 parent ffee61c commit 777edb1

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

app/src/main/java/org/fossasia/openevent/general/event/EventsFragment.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ class EventsFragment : Fragment(), ScrollToTop {
151151
rootView.swiperefresh.setOnRefreshListener {
152152
showNoInternetScreen(!eventsViewModel.isConnected())
153153
eventsViewModel.clearEvents()
154+
eventsViewModel.clearLastSearch()
154155
if (!eventsViewModel.isConnected()) {
155156
rootView.swiperefresh.isRefreshing = false
156157
} else {

app/src/main/java/org/fossasia/openevent/general/event/EventsViewModel.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ class EventsViewModel(
5959
mutableError.value = resource.getString(R.string.error_fetching_events_message)
6060
})
6161
)
62+
} else {
63+
mutableProgress.value = false
6264
}
6365
}
6466

@@ -68,6 +70,10 @@ class EventsViewModel(
6870
mutableEvents.value = null
6971
}
7072

73+
fun clearLastSearch() {
74+
lastSearch = ""
75+
}
76+
7177
fun loadEvents() {
7278
compositeDisposable.add(eventService.getEvents()
7379
.subscribeOn(Schedulers.io())

0 commit comments

Comments
 (0)