Louvorg/ReaderforSelfoss
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes #6

Browse Source
This commit is contained in:
Amine
2017-06-07 07:28:17 +02:00
parent 0ef4fc67fa
commit 2df5e52de0
1 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
View File

@@ -463,7 +463,6 @@ class HomeActivity : AppCompatActivity() {
}
private fun getElementsAccordingToTab(maybeTagFilter: Tag? = null, maybeSourceFilter: Sources? = null) {
items = ArrayList()
when (elementsShown) {
UNREAD_SHOWN -> getUnRead(maybeTagFilter, maybeSourceFilter)
@@ -477,13 +476,7 @@ class HomeActivity : AppCompatActivity() {
elementsShown = UNREAD_SHOWN
api!!.unreadItems(maybeTagFilter?.tag, maybeSourceFilter?.id?.toLong()).enqueue(object : Callback<List<Item>> {
override fun onResponse(call: Call<List<Item>>, response: Response<List<Item>>) {
if (response.body() != null && response.body()!!.isNotEmpty()) {
items = response.body() as ArrayList<Item>
} else {
items = ArrayList()
}
handleListResult()
mSwipeRefreshLayout!!.isRefreshing = false
handleItemsResponse(response)
}
override fun onFailure(call: Call<List<Item>>, t: Throwable) {
@@ -493,17 +486,26 @@ class HomeActivity : AppCompatActivity() {
})
}
private fun handleItemsResponse(response: Response<List<Item>>) {
val didUpdate = (response.body() != items)
if (response.body() != null) {
if (response.body() != items) {
items = response.body() as ArrayList<Item>
}
} else {
items = ArrayList()
}
if (didUpdate)
handleListResult()
if (items.isEmpty()) Toast.makeText(this@HomeActivity, R.string.nothing_here, Toast.LENGTH_SHORT).show()
mSwipeRefreshLayout!!.isRefreshing = false
}
private fun getRead(maybeTagFilter: Tag? = null, maybeSourceFilter: Sources? = null) {
elementsShown = READ_SHOWN
api!!.readItems(maybeTagFilter?.tag, maybeSourceFilter?.id?.toLong()).enqueue(object : Callback<List<Item>> {
override fun onResponse(call: Call<List<Item>>, response: Response<List<Item>>) {
if (response.body() != null && response.body()!!.isNotEmpty()) {
items = response.body() as ArrayList<Item>
} else {
items = ArrayList()
}
handleListResult()
mSwipeRefreshLayout!!.isRefreshing = false
handleItemsResponse(response)
}
override fun onFailure(call: Call<List<Item>>, t: Throwable) {
@@ -517,13 +519,7 @@ class HomeActivity : AppCompatActivity() {
elementsShown = FAV_SHOWN
api!!.starredItems(maybeTagFilter?.tag, maybeSourceFilter?.id?.toLong()).enqueue(object : Callback<List<Item>> {
override fun onResponse(call: Call<List<Item>>, response: Response<List<Item>>) {
if (response.body() != null && response.body()!!.isNotEmpty()) {
items = response.body() as ArrayList<Item>
} else {
items = ArrayList()
}
handleListResult()
mSwipeRefreshLayout!!.isRefreshing = false
handleItemsResponse(response)
}
override fun onFailure(call: Call<List<Item>>, t: Throwable) {
@@ -545,8 +541,6 @@ class HomeActivity : AppCompatActivity() {
mRecyclerView!!.adapter = mAdapter
mAdapter.notifyDataSetChanged()
if (items.isEmpty()) Toast.makeText(this@HomeActivity, R.string.nothing_here, Toast.LENGTH_SHORT).show()
reloadBadges()
}
@@ -604,6 +598,7 @@ class HomeActivity : AppCompatActivity() {
}
})
items = ArrayList()
if (items.isEmpty()) Toast.makeText(this@HomeActivity, R.string.nothing_here, Toast.LENGTH_SHORT).show()
handleListResult()
}
return true