From 4df93c49cb00f254a8c369a828912b110113dc63 Mon Sep 17 00:00:00 2001 From: Conny Duck Date: Mon, 9 Jul 2018 08:59:06 +0200 Subject: [PATCH] fix crash in AccountMediaFragment (again) --- .../tusky/fragment/AccountMediaFragment.kt | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/AccountMediaFragment.kt b/app/src/main/java/com/keylesspalace/tusky/fragment/AccountMediaFragment.kt index 66b3035e..949a3f98 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/AccountMediaFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/AccountMediaFragment.kt @@ -36,6 +36,7 @@ import com.keylesspalace.tusky.entity.Attachment import com.keylesspalace.tusky.entity.Status import com.keylesspalace.tusky.network.MastodonApi import com.keylesspalace.tusky.util.ThemeUtils +import com.keylesspalace.tusky.util.visible import com.keylesspalace.tusky.view.SquareImageView import com.keylesspalace.tusky.viewdata.AttachmentViewData import com.squareup.picasso.Picasso @@ -92,17 +93,18 @@ class AccountMediaFragment : BaseFragment(), Injectable { if(isAdded) { swipe_refresh_layout.isRefreshing = false progress_bar.visibility = View.GONE - } - val body = response.body() - body?.let { fetched -> - statuses.addAll(0, fetched) - // flatMap requires iterable but I don't want to box each array into list - val result = mutableListOf() - for (status in fetched) { - result.addAll(AttachmentViewData.list(status)) + + val body = response.body() + body?.let { fetched -> + statuses.addAll(0, fetched) + // flatMap requires iterable but I don't want to box each array into list + val result = mutableListOf() + for (status in fetched) { + 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 } } }