diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/PostDetailFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/PostDetailFragment.kt index 2af009eebebf246b4ac786b1c4a127e8d7f0bcca..e5bdfebc98c29ff44a50fcbfca316591a99d3119 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/PostDetailFragment.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/PostDetailFragment.kt @@ -315,7 +315,7 @@ class PostDetailFragment : MainFragment { _rating.visibility = View.GONE; val ref = Models.referenceFromBuffer((_post?.url ?: _postOverview?.url)?.toByteArray() ?: return) - val extraBytesRef = (_post?.id?.value ?: _postOverview?.id?.value)?.toByteArray() + val extraBytesRef = (_post?.id?.value ?: _postOverview?.id?.value)?.let { if (it.isNotEmpty()) it.toByteArray() else null } val version = _version; _rating.onLikeDislikeUpdated.remove(this); @@ -663,7 +663,7 @@ class PostDetailFragment : MainFragment { Logger.i(TAG, "fetchPolycentricComments") val post = _post; val ref = (_post?.url ?: _postOverview?.url)?.toByteArray()?.let { Models.referenceFromBuffer(it) } - val extraBytesRef = (_post?.id?.value ?: _postOverview?.id?.value)?.toByteArray() + val extraBytesRef = (_post?.id?.value ?: _postOverview?.id?.value)?.let { if (it.isNotEmpty()) it.toByteArray() else null } if (ref == null) { Logger.w(TAG, "Failed to fetch polycentric comments because url was not set null") diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt index 78f14b56b0a4e73937a0e35e45576128175f9c0f..a9f5bf6715e54bc01998982a303ac9c7861e5377 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt @@ -1228,7 +1228,7 @@ class VideoDetailView : ConstraintLayout { } val ref = Models.referenceFromBuffer(video.url.toByteArray()) - val extraBytesRef = video.id.value?.toByteArray() + val extraBytesRef = video.id.value?.let { if (it.isNotEmpty()) it.toByteArray() else null } _addCommentView.setContext(video.url, ref) _player.setMetadata(video.name, video.author.name); @@ -1978,14 +1978,14 @@ class VideoDetailView : ConstraintLayout { Logger.i(TAG, "fetchPolycentricComments") val video = video; val idValue = video?.id?.value - if (idValue == null) { - Logger.w(TAG, "Failed to fetch polycentric comments because id was null") + if (video?.url?.isEmpty() != false) { + Logger.w(TAG, "Failed to fetch polycentric comments because url was null") _commentsList.clear() return } val ref = Models.referenceFromBuffer(video.url.toByteArray()) - val extraBytesRef = video.id.value?.toByteArray() + val extraBytesRef = idValue?.let { if (it.isNotEmpty()) it.toByteArray() else null } _commentsList.load(false) { StatePolycentric.instance.getCommentPager(video.url, ref, listOfNotNull(extraBytesRef)); }; } private fun fetchVideo() {