From e870fcb3858c71d28ae443686c7896db4d33e48a Mon Sep 17 00:00:00 2001 From: kimhyein Date: Tue, 6 Aug 2024 22:54:39 +0900 Subject: [PATCH] =?UTF-8?q?[FIX]=20=EC=BB=A4=EB=AE=A4=EB=8B=88=ED=8B=B0=20?= =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EA=B8=80=EC=9D=B4=20=EC=97=86=EC=9D=84=20?= =?UTF-8?q?=EB=95=8C=20null=20=EC=B2=98=EB=A6=AC=20(#954)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommunityByCommunityPagingSource.kt | 17 +++++++++++------ .../remote/community/CommunityPagingSource.kt | 17 +++++++++++------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/org/sopt/havit/data/source/remote/community/CommunityByCommunityPagingSource.kt b/app/src/main/java/org/sopt/havit/data/source/remote/community/CommunityByCommunityPagingSource.kt index acf27469..79b1ca7d 100644 --- a/app/src/main/java/org/sopt/havit/data/source/remote/community/CommunityByCommunityPagingSource.kt +++ b/app/src/main/java/org/sopt/havit/data/source/remote/community/CommunityByCommunityPagingSource.kt @@ -20,12 +20,17 @@ class CommunityByCommunityPagingSource @Inject constructor( limit = PAGE_LIMIT ).data - val items = response?.posts - - LoadResult.Page( - data = items!!, - prevKey = if (page <= 1) null else (page - 1), - nextKey = if (response.isLastPage) null else (page + 1) + response?.let { + val items = it.posts + LoadResult.Page( + data = items, + prevKey = if (page <= 1) null else (page - 1), + nextKey = if (it.isLastPage) null else (page + 1) + ) + } ?: LoadResult.Page( + data = emptyList(), + prevKey = null, + nextKey = null ) } catch (e: Exception) { Log.e("CommunityByCommunityPagingSource", "error : $e") diff --git a/app/src/main/java/org/sopt/havit/data/source/remote/community/CommunityPagingSource.kt b/app/src/main/java/org/sopt/havit/data/source/remote/community/CommunityPagingSource.kt index 49ae876b..b7678c29 100644 --- a/app/src/main/java/org/sopt/havit/data/source/remote/community/CommunityPagingSource.kt +++ b/app/src/main/java/org/sopt/havit/data/source/remote/community/CommunityPagingSource.kt @@ -18,12 +18,17 @@ class CommunityPagingSource @Inject constructor( limit = PAGE_LIMIT ).data - val items = response?.posts - - LoadResult.Page( - data = items!!, - prevKey = if (page <= 1) null else (page - 1), - nextKey = if (response.isLastPage) null else (page + 1) + response?.let { + val items = it.posts + LoadResult.Page( + data = items, + prevKey = if (page <= 1) null else (page - 1), + nextKey = if (response.isLastPage) null else (page + 1) + ) + } ?: LoadResult.Page( + data = emptyList(), + prevKey = null, + nextKey = null ) } catch (e: Exception) { Log.e("CommunityPagingSource", "error : $e")