Fix a crash

1 files changed, 10 insertions, 6 deletions

diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
index 9117e71c5..09e5bebc7 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
@@ -1647,9 +1647,11 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                         lenght += ("#" + tag + " ").length();
                     }
                     holder.binding.content.setText(statusDraft.text);
-                    statusDraft.cursorPosition = statusDraft.text.length() - lenght - 3;
-                    statusDraft.setCursorToEnd = false;
-                    holder.binding.content.setSelection(statusDraft.text.length() - lenght - 3);
+                    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;
@@ -1677,9 +1679,11 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                     for (String tag : camelCaseTags) {
                         lenght += ("#" + tag + " ").length();
                     }
-                    statusDraft.cursorPosition = statusDraft.text.length() - lenght - 3;
-                    statusDraft.setCursorToEnd = false;
-                    holder.binding.content.setSelection(statusDraft.text.length() - lenght - 3);
+                    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);
+                    }
                 }
             }