Fix issue #955 - Focus the clicked messages and allow selections for remote conversations

2 files changed, 16 insertions, 0 deletions

diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
index fae192c7c..6eff3cf51 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
@@ -2041,6 +2041,18 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
                                             Toasty.info(context, context.getString(R.string.toast_error_search), Toasty.LENGTH_SHORT).show();
                                         }
                                     });
+                        } else if (context instanceof ContextActivity) {
+                            int position = 0;
+                            for (Status _status : statusList) {
+                                if (_status.isFocused) {
+                                    _status.isFocused = false;
+                                    adapter.notifyItemChanged(position);
+                                } else if (statusToDeal.equals(_status)) {
+                                    _status.isFocused = true;
+                                    adapter.notifyItemChanged(position);
+                                }
+                                position++;
+                            }
                         }
                     } else {
                         Intent intent = new Intent(context, ContextActivity.class);
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonContext.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonContext.java
index b41cd8136..3e317b52c 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonContext.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonContext.java
@@ -280,6 +280,10 @@ public class FragmentMastodonContext extends Fragment {
             }
             if (found) {
                 binding.recyclerView.scrollToPosition(position);
+                statuses.get(0).isFocused = false;
+                statuses.get(position).isFocused = true;
+                statusAdapter.notifyItemChanged(0);
+                statusAdapter.notifyItemChanged(position);
             }
         }
     }