Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix empty hashtag as search result for '@' query for Pleroma #277

Merged
merged 3 commits into from
Oct 6, 2023

Conversation

Xen4n
Copy link

@Xen4n Xen4n commented Oct 6, 2023

For unknown reasons Pleroma server responses with empty hashtag SearchResult. Therefore, the client crashes when try to set an empty title resource (because of empty title) to a TextView during ListItem bind.
So we just filter empty hashtag before it comes to the ViewModel.

Screenshot

image

@LucasGGamerM
Copy link
Owner

Don't mix the PR's. Make a separate one for the other fix

@Xen4n
Copy link
Author

Xen4n commented Oct 6, 2023

I didn't know that my commit would automatically go into the PR. How to remove second commit?

@LucasGGamerM
Copy link
Owner

You should drop the second commit and then force push it to your repo

@Xen4n
Copy link
Author

Xen4n commented Oct 6, 2023

Should I do "Reset Current Branch to previous commit"? Or another way?

@LucasGGamerM
Copy link
Owner

No, you should right click on the commits you wanna remove, and click 'Drop commits'

@Xen4n
Copy link
Author

Xen4n commented Oct 6, 2023

Drop commits is unavailable for me in Android Studio. So 'Revert commits' done. Is it ok?

@LucasGGamerM
Copy link
Owner

Drop commits is unavailable for me in Android Studio. So 'Revert commits' done. Is it ok?

Mkay, so just reset the branch to the hashtag fix commit, and then force push

@LucasGGamerM LucasGGamerM merged commit 872760d into LucasGGamerM:master Oct 6, 2023
1 check passed
@Xen4n
Copy link
Author

Xen4n commented Oct 6, 2023

I found why I couldn't drop commit. Because of protection on master branch.

@LucasGGamerM
Copy link
Owner

I did it successfully on my end. No need to worry now

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants