Commit 2b2a3dbc authored by Thomas's avatar Thomas
Browse files

Fix issue #788 - Forwarded are added back when deleted

parent eb861cda

app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Status.java

+2 −0
Original line number Diff line number Diff line
@@ -116,6 +116,8 @@ public class Status implements Serializable, Cloneable { 
    public transient boolean isFetchMore = false;

    public transient PositionFetchMore positionFetchMore = PositionFetchMore.BOTTOM;

    public boolean isChecked = false;

    //When forwarding tags

    public boolean tagAdded = false;

    public String translationContent;

    public boolean translationShown;

    public boolean mathsShown = false;

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

+4 −2
Original line number Diff line number Diff line
@@ -1612,7 +1612,8 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder 
                statusDraft.setCursorToEnd = false;

                holder.binding.content.setSelection(holder.binding.content.getText().length());

            }

            if (forwardTag && position > 0 && statusDraft.text != null && !statusDraft.text.contains("#")) {

            if (forwardTag && position > 0 && statusDraft.text != null && !statusDraft.text.contains("#") && !statusList.get(position).tagAdded) {

                statusList.get(position).tagAdded = true;

                Status status = statusList.get(position - 1).reblog == null ? statusList.get(position - 1) : statusList.get(position - 1).reblog;

                if (status.tags != null && status.tags.size() > 0) {

                    statusDraft.text += "\n\n";
@@ -1626,8 +1627,9 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder 
                    statusDraft.setCursorToEnd = false;

                    holder.binding.content.setSelection(statusDraft.text.length() - lenght - 3);

                }

            } else if (forwardTag && position > 0 && statusDraft.text != null && statusDraft.text.contains("#")) {

            } else if (forwardTag && position > 0 && statusDraft.text != null && statusDraft.text.contains("#") && !statusList.get(position).tagAdded) {

                Status status = statusList.get(position - 1).reblog == null ? statusList.get(position - 1) : statusList.get(position - 1).reblog;

                statusList.get(position).tagAdded = true;

                int lenght = 0;

                for (Tag tag : status.tags) {

                    lenght += ("#" + tag.name + " ").length();