Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request 'Reinstanciate linebreaks in shared content' (#849) from Augier/Fedilab:reinstanciate-linebreaks-in-share into develop 

Reviewed-on: https://codeberg.org/tom79/Fedilab/pulls/849
This commit is contained in:
Thomas 2023-06-01 14:51:56 +00:00
parent 7e86d9377f 0fcc2e5898
commit f6483c0ccb
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
View File

@ -976,26 +976,36 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
if (description == null && content == null) { if (description == null && content == null) {
return; return;
} }
int position = statusList.size() - 1;
statusList.get(position).text = ""; StringBuilder contentBuilder = new StringBuilder();
if (title != null && title.trim().length() > 0) { if (title != null && title.trim().length() > 0) {
statusList.get(position).text += title + " "; contentBuilder.append(title);
} else if (subject != null && subject.trim().length() > 0) { } else if (subject != null && subject.trim().length() > 0) {
statusList.get(position).text += subject + " "; contentBuilder.append(subject);
} }
if(contentBuilder.length() > 0) {
contentBuilder.append("\n\n");
}
if (description != null && description.trim().length() > 0) { if (description != null && description.trim().length() > 0) {
if (url != null && !description.contains(url)) { if (url != null && !description.contains(url)) {
statusList.get(position).text += url + "\n>"; contentBuilder.append(url).append("\n\n");
} }
statusList.get(position).text += description + "\n\n"; contentBuilder.append("> ").append(description);
} else if (content != null && content.trim().length() > 0) { } else if (content != null && content.trim().length() > 0) {
if (!content.contains(url)) { if (!content.contains(url)) {
statusList.get(position).text += url + "\n>"; contentBuilder.append(url).append("\n\n");
} }
statusList.get(position).text += content + "\n\n"; contentBuilder.append("> ").append(content);
} else { } else {
statusList.get(position).text += url + "\n\n"; contentBuilder.append(url);
} }
int position = statusList.size() - 1;
statusList.get(position).text = contentBuilder.toString();
if (saveFilePath != null) { if (saveFilePath != null) {
Attachment attachment = new Attachment(); Attachment attachment = new Attachment();
attachment.mimeType = "image/*"; attachment.mimeType = "image/*";