diff --git a/app/src/main/java/ani/dantotsu/MainActivity.kt b/app/src/main/java/ani/dantotsu/MainActivity.kt index 8f5dd79f..1e19ca8a 100644 --- a/app/src/main/java/ani/dantotsu/MainActivity.kt +++ b/app/src/main/java/ani/dantotsu/MainActivity.kt @@ -326,21 +326,12 @@ class MainActivity : AppCompatActivity() { } } } - //TODO: Remove this - GlobalScope.launch(Dispatchers.IO) { + lifecycleScope.launch(Dispatchers.IO) { //simple cleanup val index = Helper.downloadManager(this@MainActivity).downloadIndex val downloadCursor = index.getDownloads() while (downloadCursor.moveToNext()) { val download = downloadCursor.download - Log.e("Downloader", download.request.uri.toString()) - Log.e("Downloader", download.request.id) - Log.e("Downloader", download.request.mimeType.toString()) - Log.e("Downloader", download.request.data.size.toString()) - Log.e("Downloader", download.bytesDownloaded.toString()) - Log.e("Downloader", download.state.toString()) - Log.e("Downloader", download.failureReason.toString()) - - if (download.state == Download.STATE_FAILED) { //simple cleanup + if (download.state == Download.STATE_FAILED) { Helper.downloadManager(this@MainActivity).removeDownload(download.request.id) } } diff --git a/app/src/main/java/ani/dantotsu/media/comments/CommentItem.kt b/app/src/main/java/ani/dantotsu/media/comments/CommentItem.kt index faedf583..859a586c 100644 --- a/app/src/main/java/ani/dantotsu/media/comments/CommentItem.kt +++ b/app/src/main/java/ani/dantotsu/media/comments/CommentItem.kt @@ -54,10 +54,13 @@ class CommentItem(val comment: Comment, viewBinding.commentDelete.visibility = if (isUserComment || CommentsAPI.isAdmin || CommentsAPI.isMod) View.VISIBLE else View.GONE viewBinding.commentBanUser.visibility = if ((CommentsAPI.isAdmin || CommentsAPI.isMod) && !isUserComment) View.VISIBLE else View.GONE viewBinding.commentEdit.visibility = if (isUserComment) View.VISIBLE else View.GONE + replying(isReplying) //sets default text + editing(isEditing) if ((comment.replyCount ?: 0) > 0) { viewBinding.commentTotalReplies.visibility = View.VISIBLE viewBinding.commentRepliesDivider.visibility = View.VISIBLE - viewBinding.commentTotalReplies.text = "View ${comment.replyCount} repl${if (comment.replyCount == 1) "y" else "ies"}" + viewBinding.commentTotalReplies.text = if(repliesVisible) "Hide Replies" else + "View ${comment.replyCount} repl${if (comment.replyCount == 1) "y" else "ies"}" } else { viewBinding.commentTotalReplies.visibility = View.GONE viewBinding.commentRepliesDivider.visibility = View.GONE