From 8aaf5bfb2556ce0a534e8f4a58f191d657e85a4b Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Sat, 2 Jul 2022 10:01:46 +0200
Subject: [PATCH] some fixes

---
 .../app/fedilab/android/activities/ComposeActivity.java     | 6 ++++--
 .../java/app/fedilab/android/ui/drawer/ComposeAdapter.java  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/activities/ComposeActivity.java b/app/src/main/java/app/fedilab/android/activities/ComposeActivity.java
index 0da10f9e..7de436a7 100644
--- a/app/src/main/java/app/fedilab/android/activities/ComposeActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ComposeActivity.java
@@ -243,6 +243,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
                 if (statusDraft.statusReplyList != null) {
                     statusDraft.statusReplyList = SpannableHelper.convertStatus(getApplication().getApplicationContext(), statusDraft.statusReplyList);
                 }
+                Handler mainHandler = new Handler(Looper.getMainLooper());
                 Runnable myRunnable = () -> {
                     if (statusDraft.statusReplyList != null) {
                         statusList.addAll(statusDraft.statusReplyList);
@@ -257,12 +258,13 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
                     binding.recyclerView.setAdapter(composeAdapter);
                     binding.recyclerView.scrollToPosition(composeAdapter.getItemCount() - 1);
                 };
-                myRunnable.run();
+                mainHandler.post(myRunnable);
             }).start();
 
         } else if (statusReply != null) {
             new Thread(() -> {
                 statusReply = SpannableHelper.convertStatus(getApplication().getApplicationContext(), statusReply);
+                Handler mainHandler = new Handler(Looper.getMainLooper());
                 Runnable myRunnable = () -> {
                     statusList.add(statusReply);
                     int statusCount = statusList.size();
@@ -315,7 +317,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
                     statusesVM.getContext(currentInstance, BaseMainActivity.currentToken, statusReply.id)
                             .observe(ComposeActivity.this, this::initializeContextView);
                 };
-                myRunnable.run();
+                mainHandler.post(myRunnable);
             }).start();
         } else {
             //Compose without replying
diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
index f96ac0cc..8b21eec6 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
@@ -1153,7 +1153,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                     addAttachment(position, uris);
                 }
             });
-            if (statusDraft.cursorPosition < holder.binding.content.length()) {
+            if (statusDraft.cursorPosition <= holder.binding.content.length()) {
                 holder.binding.content.setSelection(statusDraft.cursorPosition);
             }
             if (statusDraft.setCursorToEnd) {