Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix crash in AccountMediaFragment (again)

This commit is contained in:
Conny Duck 2018-07-09 08:59:06 +02:00
parent fbafdf8dc3
commit 4df93c49cb
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/keylesspalace/tusky/fragment/AccountMediaFragment.kt
View File

@ -36,6 +36,7 @@ import com.keylesspalace.tusky.entity.Attachment
import com.keylesspalace.tusky.entity.Status import com.keylesspalace.tusky.entity.Status
import com.keylesspalace.tusky.network.MastodonApi import com.keylesspalace.tusky.network.MastodonApi
import com.keylesspalace.tusky.util.ThemeUtils import com.keylesspalace.tusky.util.ThemeUtils
import com.keylesspalace.tusky.util.visible
import com.keylesspalace.tusky.view.SquareImageView import com.keylesspalace.tusky.view.SquareImageView
import com.keylesspalace.tusky.viewdata.AttachmentViewData import com.keylesspalace.tusky.viewdata.AttachmentViewData
import com.squareup.picasso.Picasso import com.squareup.picasso.Picasso
@ -92,17 +93,18 @@ class AccountMediaFragment : BaseFragment(), Injectable {
if(isAdded) { if(isAdded) {
swipe_refresh_layout.isRefreshing = false swipe_refresh_layout.isRefreshing = false
progress_bar.visibility = View.GONE progress_bar.visibility = View.GONE
}
val body = response.body() val body = response.body()
body?.let { fetched -> body?.let { fetched ->
statuses.addAll(0, fetched) statuses.addAll(0, fetched)
// flatMap requires iterable but I don't want to box each array into list // flatMap requires iterable but I don't want to box each array into list
val result = mutableListOf<AttachmentViewData>() val result = mutableListOf<AttachmentViewData>()
for (status in fetched) { for (status in fetched) {
result.addAll(AttachmentViewData.list(status)) result.addAll(AttachmentViewData.list(status))
}
adapter.addTop(result)
nothing_message.visible(statuses.isEmpty())
} }
adapter.addTop(result)
nothing_message.visibility = if (statuses.isEmpty()) View.VISIBLE else View.GONE
} }
} }
} }