mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2024-11-10 12:47:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix see removed comment edit wrong comment (#1192)

Browse Source 
* Fix removed comment shown in the wrong position.

* Handle index out of bounds.
This commit is contained in:
Blahaj-Samoyed 2022-11-02 22:46:18 +11:00 committed by GitHub
parent fe9e0bd5d7
commit 9b4ee0018e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/ml/docilealligator/infinityforreddit/adapters/CommentsRecyclerViewAdapter.java
View File

@ -963,15 +963,11 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
} }
public void editComment(String commentAuthor, String commentContentMarkdown, int position) { public void editComment(String commentAuthor, String commentContentMarkdown, int position) {
editComment(commentAuthor, mVisibleComments.get(position).isSubmitter(), commentContentMarkdown, position);
}
public void editComment(String commentAuthor, boolean isSubmitter, String commentContentMarkdown, int position) {
if (commentAuthor != null) { if (commentAuthor != null) {
mVisibleComments.get(position).setAuthor(commentAuthor); mVisibleComments.get(position).setAuthor(commentAuthor);
} }
mVisibleComments.get(position).setSubmittedByAuthor(isSubmitter); mVisibleComments.get(position).setSubmittedByAuthor(mVisibleComments.get(position).isSubmitter());
mVisibleComments.get(position).setCommentMarkdown(commentContentMarkdown); mVisibleComments.get(position).setCommentMarkdown(commentContentMarkdown);
if (mIsSingleCommentThreadMode) { if (mIsSingleCommentThreadMode) {
@ -981,6 +977,24 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
} }
} }
public void editComment(Comment fetchedComment, Comment originalComment, int position) {
if (position >= mVisibleComments.size() || !mVisibleComments.get(position).equals(originalComment)) {
position = mVisibleComments.indexOf(originalComment);
if (position < 0) {
Toast.makeText(mActivity, R.string.show_removed_comment_failed, Toast.LENGTH_SHORT).show();
return;
}
}
mVisibleComments.get(position).setSubmittedByAuthor(originalComment.isSubmitter());
mVisibleComments.get(position).setCommentMarkdown(fetchedComment.getCommentMarkdown());
if (mIsSingleCommentThreadMode) {
notifyItemChanged(position + 1);
} else {
notifyItemChanged(position);
}
}
public void deleteComment(int position) { public void deleteComment(int position) {
if (mVisibleComments != null && position >= 0 && position < mVisibleComments.size()) { if (mVisibleComments != null && position >= 0 && position < mVisibleComments.size()) {
if (mVisibleComments.get(position).hasReply()) { if (mVisibleComments.get(position).hasReply()) {

6
app/src/main/java/ml/docilealligator/infinityforreddit/comment/FetchRemovedComment.java
View File

@ -29,7 +29,7 @@ public class FetchRemovedComment {
Comment removedComment = parseComment(response.body(), comment); Comment removedComment = parseComment(response.body(), comment);
handler.post(() -> { handler.post(() -> {
if (removedComment != null) { if (removedComment != null) {
listener.fetchSuccess(removedComment); listener.fetchSuccess(removedComment, comment);
} else { } else {
listener.fetchFailed(); listener.fetchFailed();
} }
@ -64,7 +64,7 @@ public class FetchRemovedComment {
Comment removedComment = parseComment(response.body(), comment); Comment removedComment = parseComment(response.body(), comment);
handler.post(() -> { handler.post(() -> {
if (removedComment != null) { if (removedComment != null) {
listener.fetchSuccess(removedComment); listener.fetchSuccess(removedComment, comment);
} else { } else {
listener.fetchFailed(); listener.fetchFailed();
} }
@ -124,7 +124,7 @@ public class FetchRemovedComment {
} }
public interface FetchRemovedCommentListener { public interface FetchRemovedCommentListener {
void fetchSuccess(Comment comment); void fetchSuccess(Comment fetchedComment, Comment originalComment);
void fetchFailed(); void fetchFailed();
} }

4
app/src/main/java/ml/docilealligator/infinityforreddit/comment/FetchRemovedCommentReveddit.java
View File

@ -36,7 +36,7 @@ public class FetchRemovedCommentReveddit {
Comment removedComment = parseRemovedComment(new JSONObject(response.body()).getJSONObject(comment.getId()), comment); Comment removedComment = parseRemovedComment(new JSONObject(response.body()).getJSONObject(comment.getId()), comment);
handler.post(() -> { handler.post(() -> {
if (removedComment != null) { if (removedComment != null) {
listener.fetchSuccess(removedComment); listener.fetchSuccess(removedComment, comment);
} else { } else {
listener.fetchFailed(); listener.fetchFailed();
} }
@ -69,7 +69,7 @@ public class FetchRemovedCommentReveddit {
} }
public interface FetchRemovedCommentListener { public interface FetchRemovedCommentListener {
void fetchSuccess(Comment comment); void fetchSuccess(Comment fetchedComment, Comment originalComment);
void fetchFailed(); void fetchFailed();
} }

8
app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewPostDetailFragment.java
View File

@ -1811,8 +1811,8 @@ public class ViewPostDetailFragment extends Fragment implements FragmentCommunic
mExecutor, new Handler(), pushshiftRetrofit, comment, mExecutor, new Handler(), pushshiftRetrofit, comment,
new FetchRemovedComment.FetchRemovedCommentListener() { new FetchRemovedComment.FetchRemovedCommentListener() {
@Override @Override
public void fetchSuccess(Comment comment) { public void fetchSuccess(Comment fetchedComment, Comment originalComment) {
mCommentsAdapter.editComment(comment.getAuthor(), comment.getCommentMarkdown(), position); mCommentsAdapter.editComment(fetchedComment, originalComment, position);
} }
@Override @Override
@ -1822,8 +1822,8 @@ public class ViewPostDetailFragment extends Fragment implements FragmentCommunic
comment, mPost.getPostTimeMillis(), mPost.getNComments(), comment, mPost.getPostTimeMillis(), mPost.getNComments(),
new FetchRemovedCommentReveddit.FetchRemovedCommentListener() { new FetchRemovedCommentReveddit.FetchRemovedCommentListener() {
@Override @Override
public void fetchSuccess(Comment comment) { public void fetchSuccess(Comment fetchedComment, Comment originalComment) {
mCommentsAdapter.editComment(comment.getAuthor(), comment.getCommentMarkdown(), position); mCommentsAdapter.editComment(fetchedComment, originalComment, position);
} }
@Override @Override