Merge branch 'fix_500' into develop (14127fd2) · Commits · Android-smartphones / Fedilab

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

+10 −6

Original line number	Diff line number	Diff line
		@@ -1642,10 +1642,12 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
		lenght += ("#" + tag + " ").length();
		}
		holder.binding.content.setText(statusDraft.text);
		if (statusDraft.text.length() - lenght - 3 >= 0) {
		statusDraft.cursorPosition = statusDraft.text.length() - lenght - 3;
		statusDraft.setCursorToEnd = false;
		holder.binding.content.setSelection(statusDraft.text.length() - lenght - 3);
		}
		}
		} 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;
		if (status.text == null && status.content != null) {
		@@ -1672,11 +1674,13 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
		for (String tag : camelCaseTags) {
		lenght += ("#" + tag + " ").length();
		}
		if (statusDraft.text.length() - lenght - 3 >= 0) {
		statusDraft.cursorPosition = statusDraft.text.length() - lenght - 3;
		statusDraft.setCursorToEnd = false;
		holder.binding.content.setSelection(statusDraft.text.length() - lenght - 3);
		}
		}
		}

		if (statusDraft.spoiler_text != null) {
		holder.binding.contentSpoiler.setText(statusDraft.spoiler_text);